diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-08-14 15:35:37 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-08-14 15:36:20 -0400 |
| commit | afebbf231adeee6828d75d346b64f3036ff46e7c (patch) | |
| tree | 46d1b76e89d0a12b33ec148a10d2469372813694 /phpBB/phpbb/auth/provider | |
| parent | ce387d9bfc2b4a5ac18f79585132862ced0a7687 (diff) | |
| download | forums-afebbf231adeee6828d75d346b64f3036ff46e7c.tar forums-afebbf231adeee6828d75d346b64f3036ff46e7c.tar.gz forums-afebbf231adeee6828d75d346b64f3036ff46e7c.tar.bz2 forums-afebbf231adeee6828d75d346b64f3036ff46e7c.tar.xz forums-afebbf231adeee6828d75d346b64f3036ff46e7c.zip | |
[feature/oauth] Update link_account to allow for two methods of linking
PHPBB3-11673
Diffstat (limited to 'phpBB/phpbb/auth/provider')
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index d2f7eb5527..36e605d8fc 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -364,7 +364,8 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base return 'LOGIN_LINK_NO_DATA_PROVIDED'; } - if (!array_key_exists('oauth_service', $login_link_data) || !$login_link_data['oauth_service']) + if (!array_key_exists('oauth_service', $login_link_data) || !$login_link_data['oauth_service'] || + !array_key_exists('link_method', $login_link_data) || !$login_link_data['link_method']) { return 'LOGIN_LINK_MISSING_DATA'; } @@ -377,6 +378,16 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base */ public function link_account(array $link_data) { + // Check for a valid link method (auth_link or login_link) + if (!array_key_exists('link_method', $link_data) || + !in_array($link_data['link_method'], array( + 'auth_link', + 'login_link', + ))) + { + return 'LOGIN_LINK_MISSING_DATA'; + } + // We must have an oauth_service listed, check for it two ways if (!array_key_exists('oauth_service', $link_data) || !$link_data['oauth_service']) { |