From 6891cff72f3e1232b93e04aa9723695258fa5e23 Mon Sep 17 00:00:00 2001 From: Georg von Kries Date: Mon, 4 Dec 2023 11:19:41 +0100 Subject: [PATCH 1/4] Fixes a typo in the registration default user name generation script. --- .../OrchardCore.Users/Views/RegistrationSettings.Edit.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/RegistrationSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/RegistrationSettings.Edit.cshtml index df264fe67c3..7a441ceebc2 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/RegistrationSettings.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/RegistrationSettings.Edit.cshtml @@ -136,11 +136,11 @@ var editor = $('#@Html.IdFor(x => x.GenerateUsernameScript)').data('editor'); if (!keepText) { editor.doc.setValue( - '/* Uncomment to map AzureAD\n' + + '/* Uncomment to map AzureAd\n' + '// Uncomment to output the context variable in the logs\n' + '// log("warning", JSON.stringify(context));\n' + 'switch (context.loginProvider) {\n' + - ' case "AzureAD":\n' + + ' case "AzureAd":\n' + ' context.userName = "azad" + uuid();\n' + ' break;\n' + ' default:\n' + From fc36af88b05aa913d0a252bcd27c95193feab5b5 Mon Sep 17 00:00:00 2001 From: Georg von Kries Date: Wed, 6 Dec 2023 10:06:10 +0100 Subject: [PATCH 2/4] Fixes a typo in the login default roles update script. --- .../OrchardCore.Users/Views/LoginSettings.Edit.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml index c0c37d24f45..764729c1a99 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml @@ -103,9 +103,9 @@ var editor = $('#@Html.IdFor(x => x.SyncRolesScript)').data('editor'); if (!keepText) { editor.doc.setValue( - '/* Uncomment to map AzureAD\n' + + '/* Uncomment to map AzureAd\n' + 'switch (context.loginProvider) {\n' + - ' case "AzureAD":\n' + + ' case "AzureAd":\n' + ' context.externalClaims.forEach(claim => {\n' + ' if (claim.Type === "http://schemas.microsoft.com/ws/2008/06/identity/claims/role") {\n' + ' switch (claim.Value) {\n' + From 0bd1fb4e4b97e241cec5ceee5f8d149af8e8a70f Mon Sep 17 00:00:00 2001 From: Georg von Kries Date: Thu, 7 Dec 2023 09:32:37 +0100 Subject: [PATCH 3/4] Fixed errors in the default login script. --- .../OrchardCore.Users/Views/LoginSettings.Edit.cshtml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml index 764729c1a99..56aa6e4c505 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml @@ -107,8 +107,8 @@ 'switch (context.loginProvider) {\n' + ' case "AzureAd":\n' + ' context.externalClaims.forEach(claim => {\n' + - ' if (claim.Type === "http://schemas.microsoft.com/ws/2008/06/identity/claims/role") {\n' + - ' switch (claim.Value) {\n' + + ' if (claim.type === "http://schemas.microsoft.com/ws/2008/06/identity/claims/role") {\n' + + ' switch (claim.value) {\n' + ' case "Writer":\n' + ' context.rolesToAdd.push("Author");\n' + ' break;\n' + @@ -116,13 +116,14 @@ ' context.rolesToAdd.push("Administrator");\n' + ' break;\n' + ' default:\n' + - ' log("Warning", "Role " + claim.Value + " was not handled");\n' + + ' log("Warning", "Role " + claim.value + " was not handled");\n' + ' break;\n' + ' }\n' + ' }\n' + ' });\n' + + ' break;' + ' default:\n' + - ' log("Warning", "Provider " + loginProvider + " was not handled");\n' + + ' log("Warning", "Provider " + context.loginProvider + " was not handled");\n' + ' break;\n' + '}\n' + '*/\n' From ec6e7851a1e9bfffe5f77b64b5de6cd8a32503f1 Mon Sep 17 00:00:00 2001 From: Georg von Kries Date: Thu, 7 Dec 2023 09:38:32 +0100 Subject: [PATCH 4/4] Add missing new line in login script. --- .../OrchardCore.Users/Views/LoginSettings.Edit.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml index 56aa6e4c505..4761a5a8b95 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/LoginSettings.Edit.cshtml @@ -121,7 +121,7 @@ ' }\n' + ' }\n' + ' });\n' + - ' break;' + + ' break;\n' + ' default:\n' + ' log("Warning", "Provider " + context.loginProvider + " was not handled");\n' + ' break;\n' +