Merge branch 'wip-94735-m402' into MOODLE_402_STABLE

microsoft · Oct 3, 2023 · 0f528cf · 0f528cf
2 parents 6a16677 + 96f9383
commit 0f528cf
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/settings.php b/settings.php
@@ -110,6 +110,12 @@
             $desc = new lang_string('settings_setup_step2_desc', 'local_o365');
 
             $systemapiuser = get_config('local_o365', 'systemtokens');
+            $enableapponlyaccess = get_config('local_o365', 'enableapponlyaccess');
+            if (!empty($enableapponlyaccess) && !empty($systemapiuser)) {
+                // Both "Application access" and "System API user" are enabled - we simply disable "System API user".
+                unset_config('systemtokens', 'local_o365');
+                $systemapiuser = null;
+            }
             if (!empty($systemapiuser)) {
                 // Show option to convert to app only access.
                 $desc .= new lang_string('settings_setup_step2_desc_additional', 'local_o365');