moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-76172 core: Fix error when userinfo is false

Browse source 
This patch should fix a regression introduced in MDL-75171, raised
while running the OBv2.1 certification.
The new method get_raw_userinfo() can return stdClass or false but
the second one was not taken into account from get_userid() (so an
error was thrown: "Argument 1 passed to
core\oauth2\client::map_userinfo_to_fields() must be an instance
of stdClass, bool given").
This commit is contained in:
Sara Arjona 2022-11-02 12:28:15 +01:00
parent 720bd60fc6
commit ae63a2d16b
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/classes/oauth2/client.php
View file

@ -488,7 +488,7 @@ class client extends \oauth2_client {
/** /**
* Fetch the user info from the user info endpoint. * Fetch the user info from the user info endpoint.
* *
* @return array|false Moodle user fields for the logged in user (or false if request failed) * @return stdClass|false Moodle user fields for the logged in user (or false if request failed)
* @throws moodle_exception if the response is empty after decoding it. * @throws moodle_exception if the response is empty after decoding it.
*/ */
public function get_raw_userinfo() { public function get_raw_userinfo() {
@ -528,6 +528,10 @@ class client extends \oauth2_client {
*/ */
public function get_userinfo() { public function get_userinfo() {
$userinfo = $this->get_raw_userinfo(); $userinfo = $this->get_raw_userinfo();
if ($userinfo === false) {
return false;
}
return $this->map_userinfo_to_fields($userinfo); return $this->map_userinfo_to_fields($userinfo);
} }