diff options
| author | Erik Johnston <erik@matrix.org> | 2016-05-09 13:05:09 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-05-09 13:05:09 +0100 |
| commit | def64d6ef32ea1b2acc92e470db307e97c6eac05 (patch) | |
| tree | 8d29d7d432a5b703d15f1176ae7e720b1caa5805 /synapse/federation/federation_server.py | |
| parent | Add bulk fetch storage API (diff) | |
| parent | Merge pull request #764 from matrix-org/erikj/replication_logging (diff) | |
| download | synapse-def64d6ef32ea1b2acc92e470db307e97c6eac05.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
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. |