From 382069b8c9ab006933fbc4871813df4c0c7dafaa 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 c6031d7e0..1be8a95c2 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 2037457afa4d50305a0350661c3c81db5d6c111b Mon Sep 17 00:00:00 2001 From: Lai Wei Date: Tue, 25 Aug 2026 15:58:13 +0100 Subject: [PATCH 2/2] Remove duplicate lang strings in auth_oidc Bring in line with wip-136768-m405: drop the auth_settings_validation_error added directly after auth_oidcdescription (from microsoft/moodle-auth_oidc#70) and the stale error_masked_secret_not_changed wording that predates the "Change" checkbox UX, replacing both with the current wording already used on m405, in the error-strings block after error_invalid_custom_claim. 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/auth/oidc/lang/en/auth_oidc.php b/auth/oidc/lang/en/auth_oidc.php index 1be8a95c2..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.'; @@ -284,6 +281,8 @@ $string['error_tenant_specific_endpoint_required'] = 'When using "Microsoft identity platform (v2.0)" IdP type and "Certificate" authentication method, tenant specific endpoint (i.e. not common/organizations/consumers) is required.'; $string['error_empty_oidcresource'] = 'Resource cannot be empty when using Microsoft Entra ID (v1.0) or other types of IdP.'; $string['error_invalid_custom_claim'] = 'Invalid custom claim name. Custom claims can only contain alphanumeric characters, hyphens, and underscores.'; +$string['error_masked_secret_not_changed'] = 'Please enter a new value or uncheck the "Change" checkbox to keep the current value.'; +$string['auth_settings_validation_error'] = 'Invalid authentication settings detected. The following configuration issues must be resolved to ensure successful authentication:'; $string['errorupnchangeisnotsupported'] = 'Your Microsoft account UPN has changed. Please contact your administrator to update your Moodle account.'; $string['erroruserwithusernamealreadyexists'] = 'Error occurred when trying to rename your Moodle account. A Moodle user with the new username already exists. Ask your site administrator to resolve this first.'; $string['error_no_response_available'] = 'No responses available.';