diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-01 09:43:27 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-01 09:43:27 +0000 |
| commit | 903fb34b39cd750050b4c89d9c0f5492652b8fcd (patch) | |
| tree | 7e74b35c054227b2897ed46bccfb2b4de40f47f6 /synapse/handlers/register.py | |
| parent | Report size of ExpiringCache (diff) | |
| parent | Merge pull request #607 from matrix-org/dbkr/send_inviter_member_event (diff) | |
| download | synapse-903fb34b39cd750050b4c89d9c0f5492652b8fcd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/expiring_cache_size
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index f8959e5d82..6d155d57e7 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -349,3 +349,18 @@ class RegistrationHandler(BaseHandler): def auth_handler(self): return self.hs.get_handlers().auth_handler + + @defer.inlineCallbacks + def guest_access_token_for(self, medium, address, inviter_user_id): + access_token = yield self.store.get_3pid_guest_access_token(medium, address) + if access_token: + defer.returnValue(access_token) + + _, access_token = yield self.register( + generate_token=True, + make_guest=True + ) + access_token = yield self.store.save_or_get_3pid_guest_access_token( + medium, address, access_token, inviter_user_id + ) + defer.returnValue(access_token) |