From b1613031a6c0056c0525cc0db7ba58b6ee9d1a21 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Tue, 25 Aug 2026 14:22:57 +0100 Subject: [PATCH 1/2] Add missing auth_settings_validation_error lang string auth_oidc_validate_auth_settings() in lib.php (added in a13728f, 'Re-organise configuration pages for auth_oidc and local_o365...') calls get_string('auth_settings_validation_error', 'auth_oidc') to build the notification shown when settings validation fails, but the corresponding lang string was never added. Cherry-picked from microsoft/moodle-auth_oidc#70 (2c8b686ece4dba3a5a4a9ea47e5382c25291a54c) --- auth/oidc/lang/en/auth_oidc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/auth/oidc/lang/en/auth_oidc.php b/auth/oidc/lang/en/auth_oidc.php index 62da1de43..2d5140f9c 100644 --- a/auth/oidc/lang/en/auth_oidc.php +++ b/auth/oidc/lang/en/auth_oidc.php @@ -31,6 +31,7 @@ $string['pluginname'] = 'OpenID Connect'; $string['auth_oidcdescription'] = 'The OpenID Connect authentication plugin provides single-sign-on functionality using configurable IdP.'; +$string['auth_settings_validation_error'] = 'There are problems with the OpenID Connect settings:'; // Configuration pages. $string['settings_page_other_settings'] = 'Other options'; From c3dac5bb74ca9618d4921bcb1fa3748c536f9982 Mon Sep 17 00:00:00 2001 From: Lai Wei Date: Tue, 25 Aug 2026 15:58:00 +0100 Subject: [PATCH 2/2] Remove duplicate lang strings in auth_oidc Two commits independently added the same string keys without detecting the existing definitions, leaving two definitions each for error_masked_secret_not_changed and auth_settings_validation_error: - bcd2239 (Implement Azure portal style secret / certificate passphrase protection) added error_masked_secret_not_changed with wording that predates the "Change" checkbox UX. - 1cf6fb9 (Re-organise configuration pages for auth_oidc and local_o365...) re-added error_masked_secret_not_changed with updated wording matching the current checkbox-based UX, and also added auth_settings_validation_error - duplicating the fix applied in the previous commit on this branch (cherry-picked from microsoft/moodle-auth_oidc#70), which wasn't actually needed here since 1cf6fb9 already carried it with different wording. Keep the newer/current definitions (the ones matching the "Change" checkbox UX) and drop the stale/redundant ones. Also removes a pre-existing upstream duplicate, errorauthdisconnectinvalidmethod (added twice, identically, in 6f8e9528 back in 2015). Harmless since both copies had the same value, but redundant. --- auth/oidc/lang/en/auth_oidc.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/auth/oidc/lang/en/auth_oidc.php b/auth/oidc/lang/en/auth_oidc.php index 2d5140f9c..2ed27bf54 100644 --- a/auth/oidc/lang/en/auth_oidc.php +++ b/auth/oidc/lang/en/auth_oidc.php @@ -31,7 +31,6 @@ $string['pluginname'] = 'OpenID Connect'; $string['auth_oidcdescription'] = 'The OpenID Connect authentication plugin provides single-sign-on functionality using configurable IdP.'; -$string['auth_settings_validation_error'] = 'There are problems with the OpenID Connect settings:'; // Configuration pages. $string['settings_page_other_settings'] = 'Other options'; @@ -112,7 +111,6 @@ $string['cfg_err_invalidauthendpoint'] = 'Invalid Authorization Endpoint'; $string['cfg_err_invalidtokenendpoint'] = 'Invalid Token Endpoint'; $string['cfg_err_invalidclientid'] = 'Invalid client ID'; -$string['error_masked_secret_not_changed'] = 'Please enter a new value. The masked value cannot be saved.'; $string['cfg_err_invalidclientsecret'] = 'Invalid client secret'; $string['cfg_forceredirect_key'] = 'Force redirect'; $string['cfg_forceredirect_desc'] = 'If enabled, will skip the login index page and redirect to the OpenID Connect page. Can be bypassed with ?noredirect=1 URL param'; @@ -237,7 +235,6 @@ $string['errorauthdisconnectnewmethod'] = 'Use Login Method'; $string['errorauthdisconnectinvalidmethod'] = 'Invalid login method received.'; $string['errorauthdisconnectifmanual'] = 'If using the manual login method, enter credentials below.'; -$string['errorauthdisconnectinvalidmethod'] = 'Invalid login method received.'; $string['errorauthgeneral'] = 'There was a problem logging you in. Please contact your administrator for assistance.'; $string['errorauthinvalididtoken'] = 'Invalid id_token received.'; $string['errorauthloginfailednouser'] = 'Invalid login: User not found in Moodle. If this site has the "authpreventaccountcreation" setting enabled, this may mean you need an administrator to create an account for you first.';