Merge branch 'wip-87584-m41' into MOODLE_41_STABLE

weilai-irl · weilai-irl · commit 046aca2b8d11 · 2022-11-23T11:36:33.000Z
diff --git a/manageapplication.php b/manageapplication.php
@@ -73,7 +73,8 @@
     }
 
     // Prepare config settings to save.
-    $configstosave = ['idptype', 'clientid', 'tenantnameorguid', 'clientauthmethod', 'authendpoint', 'tokenendpoint'];
+    $configstosave = ['idptype', 'clientid', 'tenantnameorguid', 'clientauthmethod', 'authendpoint', 'tokenendpoint',
+        'oidcresource', 'oidcscope'];
 
     // Depending on the value of clientauthmethod, save clientsecret or (clientprivatekey and clientcert).
     switch ($fromform->clientauthmethod) {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`// Prepare config settings to save.`
`76`		`- $configstosave = ['idptype', 'clientid', 'tenantnameorguid', 'clientauthmethod', 'authendpoint', 'tokenendpoint'];`
	`76`	`+ $configstosave = ['idptype', 'clientid', 'tenantnameorguid', 'clientauthmethod', 'authendpoint', 'tokenendpoint',`
	`77`	`+ 'oidcresource', 'oidcscope'];`
`77`	`78`
`78`	`79`	`// Depending on the value of clientauthmethod, save clientsecret or (clientprivatekey and clientcert).`
`79`	`80`	`switch ($fromform->clientauthmethod) {`