L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-58535 oauth2: Don't rely on the return scopes

Browse Source 
MS makes a big mess of returning scopes from oauth requests. They only return the custom MS scopes like
User.Read and they never return non-MS scopes (like openid, profile, email).
This commit is contained in:
Damyon Wiese
2017-05-02 10:03:58 +08:00
parent 13d21db324
commit 3ba79ff19a
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/oauth2/client.php
+13 -11
View File
@@ -203,12 +203,6 @@ class client extends \oauth2_client {
return false;
}
if (isset($r->refresh_token)) {
$systemaccount->set('refreshtoken', $r->refresh_token);
$systemaccount->update();
$this->refreshtoken = $r->refresh_token;
}
// Store the token an expiry time.
$accesstoken = new stdClass;
$accesstoken->token = $r->access_token;
@@ -216,14 +210,22 @@ class client extends \oauth2_client {
// Expires 10 seconds before actual expiry.
$accesstoken->expires = (time() + ($r->expires_in - 10));
}
if (isset($r->scope)) {
$accesstoken->scope = $r->scope;
} else {
$accesstoken->scope = $this->scope;
}
$accesstoken->scope = $this->scope;
// Also add the scopes.
$this->store_token($accesstoken);
if (isset($r->refresh_token)) {
$userinfo = $this->get_userinfo();
if ($userinfo['email'] == $systemaccount->get('email')) {
$systemaccount->set('refreshtoken', $r->refresh_token);
$systemaccount->update();
$this->refreshtoken = $r->refresh_token;
} else {
throw new moodle_exception('Attempt to store refresh token for non-system user.');
}
}
return true;
}