Fix auth_oidc overwriting email with UPN

microsoft/o365-moodle#2182 (comment) microsoft#55 re-based on MOODLE_402_STABLE
ucl-isd · Dec 12, 2023 · 9feea70 · 9feea70
1 parent 5b42f2b
commit 9feea70
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/classes/loginflow/base.php b/classes/loginflow/base.php
@@ -142,7 +142,7 @@ public function get_userinfo($username) {
                     // If local_o365 is installed, but all field mapping fields are in token, then use token.
                     $fieldmappingfromtoken = false;
                     // Process both ID token and access tokens.
-                    $tokenames = ['idtoken', 'token'];
+                    $tokenames = ['idtoken'];
 
                     foreach ($tokenames as $tokename) {
                         $token = jwt::instance_from_encoded($tokenrec->$tokename);
@@ -212,7 +212,7 @@ public function get_userinfo($username) {
             $userdata = [];
 
             // Process both ID token and access tokens.
-            $tokenames = ['idtoken', 'token'];
+            $tokenames = ['idtoken'];
 
             foreach ($tokenames as $tokename) {
                 try {