This commit is contained in:
Christoph Witzany 2016-04-06 17:04:53 +02:00
parent 823b8be4b7
commit 8f0e47fae8

View File

@ -107,10 +107,6 @@ class LoginRestServlet(ClientV1RestServlet):
"uri": "%s%s" % (self.idp_redirect_url, relay_state) "uri": "%s%s" % (self.idp_redirect_url, relay_state)
} }
defer.returnValue((200, result)) defer.returnValue((200, result))
elif self.ldap_enabled and (login_submission["type"] ==
LoginRestServlet.JWT_TYPE):
result = yield self.do_ldap_login(login_submission)
defer.returnValue(result)
elif self.jwt_enabled and (login_submission["type"] == elif self.jwt_enabled and (login_submission["type"] ==
LoginRestServlet.JWT_TYPE): LoginRestServlet.JWT_TYPE):
result = yield self.do_jwt_login(login_submission) result = yield self.do_jwt_login(login_submission)
@ -164,7 +160,6 @@ class LoginRestServlet(ClientV1RestServlet):
defer.returnValue((200, result)) defer.returnValue((200, result))
@defer.inlineCallbacks @defer.inlineCallbacks
def do_token_login(self, login_submission): def do_token_login(self, login_submission):
token = login_submission['token'] token = login_submission['token']