diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-24 12:55:43 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-24 12:56:27 -0400 |
| commit | 669586c134641b29a95faa43090df124b59d4e14 (patch) | |
| tree | 3ebab05e614af7883e2c6db222ea71e8ade6be4b /phpBB/phpbb/auth | |
| parent | 58d5820069a5889ae2f09319ae4f972c8b8f87a8 (diff) | |
| download | forums-669586c134641b29a95faa43090df124b59d4e14.tar forums-669586c134641b29a95faa43090df124b59d4e14.tar.gz forums-669586c134641b29a95faa43090df124b59d4e14.tar.bz2 forums-669586c134641b29a95faa43090df124b59d4e14.tar.xz forums-669586c134641b29a95faa43090df124b59d4e14.zip | |
[feature/oauth] Token must be updated with the user_id
PHPBB3-11673
Diffstat (limited to 'phpBB/phpbb/auth')
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index 0762e202db..90ce1f8f5a 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -171,8 +171,8 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base if (!$row) { - // Account not tied to any existing account - // TODO: determine action that should occur + // The user does not yet exist, ask if they wish to register the account + throw new Exception($unique_id); } // Retrieve the user's account @@ -189,6 +189,9 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base throw new Exception('Invalid entry in ' . $this->auth_provider_oauth_token_account_assoc); } + // Update token storage to store the user_id + $storage->set_user_id($row['user_id']); + // The user is now authenticated and can be logged in return array( 'status' => LOGIN_SUCCESS, |