diff options
| author | David Baker <dave@matrix.org> | 2016-05-10 14:40:19 +0200 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-05-10 14:40:19 +0200 |
| commit | 997db0464828c8e8eac7dfa055f4fcd25e89cd29 (patch) | |
| tree | d10252566e9bc96a9bdf95bcd37e4db4ead6ab62 /synapse/federation/federation_server.py | |
| parent | More consistent config naming (diff) | |
| parent | Merge pull request #773 from matrix-org/erikj/get_domian_from_id (diff) | |
| download | synapse-997db0464828c8e8eac7dfa055f4fcd25e89cd29.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 429ab6ddec..f1d231b9d8 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -388,6 +388,11 @@ class FederationServer(FederationBase): }) @log_function + def on_openid_userinfo(self, token): + ts_now_ms = self._clock.time_msec() + return self.store.get_user_id_for_open_id_token(token, ts_now_ms) + + @log_function def _get_persisted_pdu(self, origin, event_id, do_auth=True): """ Get a PDU from the database with given origin and id. |