|
@@ -58,6 +58,7 @@ class LoginRestServlet(ClientV1RestServlet):
|
|
|
self.cas_required_attributes = hs.config.cas_required_attributes
|
|
|
self.servername = hs.config.server_name
|
|
|
self.http_client = hs.get_simple_http_client()
|
|
|
+ self.auth_handler = self.hs.get_auth_handler()
|
|
|
|
|
|
def on_GET(self, request):
|
|
|
flows = []
|
|
@@ -143,7 +144,7 @@ class LoginRestServlet(ClientV1RestServlet):
|
|
|
user_id, self.hs.hostname
|
|
|
).to_string()
|
|
|
|
|
|
- auth_handler = self.handlers.auth_handler
|
|
|
+ auth_handler = self.auth_handler
|
|
|
user_id, access_token, refresh_token = yield auth_handler.login_with_password(
|
|
|
user_id=user_id,
|
|
|
password=login_submission["password"])
|
|
@@ -160,7 +161,7 @@ class LoginRestServlet(ClientV1RestServlet):
|
|
|
@defer.inlineCallbacks
|
|
|
def do_token_login(self, login_submission):
|
|
|
token = login_submission['token']
|
|
|
- auth_handler = self.handlers.auth_handler
|
|
|
+ auth_handler = self.auth_handler
|
|
|
user_id = (
|
|
|
yield auth_handler.validate_short_term_login_token_and_get_user_id(token)
|
|
|
)
|
|
@@ -194,7 +195,7 @@ class LoginRestServlet(ClientV1RestServlet):
|
|
|
raise LoginError(401, "Unauthorized", errcode=Codes.UNAUTHORIZED)
|
|
|
|
|
|
user_id = UserID.create(user, self.hs.hostname).to_string()
|
|
|
- auth_handler = self.handlers.auth_handler
|
|
|
+ auth_handler = self.auth_handler
|
|
|
user_exists = yield auth_handler.does_user_exist(user_id)
|
|
|
if user_exists:
|
|
|
user_id, access_token, refresh_token = (
|
|
@@ -243,7 +244,7 @@ class LoginRestServlet(ClientV1RestServlet):
|
|
|
raise LoginError(401, "Invalid JWT", errcode=Codes.UNAUTHORIZED)
|
|
|
|
|
|
user_id = UserID.create(user, self.hs.hostname).to_string()
|
|
|
- auth_handler = self.handlers.auth_handler
|
|
|
+ auth_handler = self.auth_handler
|
|
|
user_exists = yield auth_handler.does_user_exist(user_id)
|
|
|
if user_exists:
|
|
|
user_id, access_token, refresh_token = (
|
|
@@ -412,7 +413,7 @@ class CasTicketServlet(ClientV1RestServlet):
|
|
|
raise LoginError(401, "Unauthorized", errcode=Codes.UNAUTHORIZED)
|
|
|
|
|
|
user_id = UserID.create(user, self.hs.hostname).to_string()
|
|
|
- auth_handler = self.handlers.auth_handler
|
|
|
+ auth_handler = self.auth_handler
|
|
|
user_exists = yield auth_handler.does_user_exist(user_id)
|
|
|
if not user_exists:
|
|
|
user_id, _ = (
|