diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-03-04 14:44:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 14:44:22 +0000 |
| commit | 7eb6e39a8fe9d42a411cefd905cf2caa29896923 (patch) | |
| tree | ddcf4fc4eb801299d2e6191c7f34af2d3741c066 /synapse/rest/client/v1 | |
| parent | Fix link in UPGRADES (diff) | |
| download | synapse-7eb6e39a8fe9d42a411cefd905cf2caa29896923.tar.xz | |
Record the SSO Auth Provider in the login token (#9510)
This great big stack of commits is a a whole load of hoop-jumping to make it easier to store additional values in login tokens, and then to actually store the SSO Identity Provider in the login token. (Making use of that data will follow in a subsequent PR.)
Diffstat (limited to 'synapse/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/login.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 925edfc402..1ec3a47ffb 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -283,12 +283,10 @@ class LoginRestServlet(RestServlet): """ token = login_submission["token"] auth_handler = self.auth_handler - user_id = await auth_handler.validate_short_term_login_token_and_get_user_id( - token - ) + res = await auth_handler.validate_short_term_login_token(token) return await self._complete_login( - user_id, login_submission, self.auth_handler._sso_login_callback + res.user_id, login_submission, self.auth_handler._sso_login_callback ) async def _do_jwt_login(self, login_submission: JsonDict) -> Dict[str, str]: |