Merge branch 'wip-110861-m401' into MOODLE_401_STABLE

# Conflicts:
#	local/o365/lang/en/local_o365.php

Author: weilai-irl

classes/utils.php

@@ -28,6 +28,7 @@
 use Exception;
 use moodle_exception;
 use auth_oidc\event\action_failed;
+use moodle_url;
 
 /**
  * General purpose utility class.
@@ -52,6 +53,18 @@ public static function process_json_response($response, array $expectedstructure
             $errmsg = 'Error response received.';
             self::debug($errmsg, __METHOD__, $result);
             if (isset($result['error_description'])) {
+                $isadminconsent = optional_param('admin_consent', false, PARAM_BOOL);
+                if ($isadminconsent) {
+                    if (get_config('auth_oidc', 'idptype') == AUTH_OIDC_IDP_TYPE_MICROSOFT_IDENTITY_PLATFORM &&
+                        auth_oidc_is_local_365_installed() &&
+                        $result['error'] === 'invalid_grant' &&
+                        isset($result['error_codes']) && count($result['error_codes']) == 1 &&
+                        $result['error_codes'][0] == 53003) {
+                        $localo365configurationpageurl = new moodle_url('/admin/settings.php', ['section' => 'local_o365']);
+                        throw new moodle_exception('settings_adminconsent_error_53003', 'local_o365',
+                            $localo365configurationpageurl, '', $result['error_description']);
+                    }
+                }
                 throw new moodle_exception('erroroidccall_message', 'auth_oidc', '', $result['error_description']);
             } else {
                 throw new moodle_exception('erroroidccall', 'auth_oidc');
@@ -173,7 +186,7 @@ private static function make_json_safe($data) {
      * @return string The redirect URL.
      */
     public static function get_redirecturl() {
-        $redirecturl = new \moodle_url('/auth/oidc/');
+        $redirecturl = new moodle_url('/auth/oidc/');
         return $redirecturl->out(false);
     }
 
@@ -183,7 +196,7 @@ public static function get_redirecturl() {
      * @return string The redirect URL.
      */
     public static function get_frontchannellogouturl() {
-        $logouturl = new \moodle_url('/auth/oidc/logout.php');
+        $logouturl = new moodle_url('/auth/oidc/logout.php');
         return $logouturl->out(false);
     }