diff options
| author | Erik Johnston <erik@matrix.org> | 2016-05-06 15:59:20 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-05-06 15:59:20 +0100 |
| commit | 012cb5416cded6453e676696d74cab871db4aaf8 (patch) | |
| tree | 71f21e4d6d4a6fd4037cfbf0a200667d29f46247 /synapse/federation/federation_server.py | |
| parent | Delete old pushers (diff) | |
| parent | Merge pull request #767 from matrix-org/erikj/transaction_txn (diff) | |
| download | synapse-012cb5416cded6453e676696d74cab871db4aaf8.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/push_actions_delete
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. |