From 12355219d445cfc5ee13a7721cd092128f2d1e97 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Wed, 14 Feb 2024 13:24:10 +0100
Subject: [PATCH] V13: The login screen does not display external login errors
 (#15715)

* show external login errors as a subheadline on the login screen
* fix: migrate error handling from v12 for external login
* cleanup unused client-side javascript
---
 .../umbraco/UmbracoBackOffice/Default.cshtml        |  3 ---
 .../umbraco/UmbracoLogin/Index.cshtml               | 10 ++++++++++
 .../Controllers/BackOfficeController.cs             | 13 +++++++++----
 .../Extensions/ViewDataExtensions.cs                |  2 ++
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
index faa84121e6..10d67be2da 100644
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
+++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
@@ -16,7 +16,6 @@
 @inject IOptions<GlobalSettings> globalSettings
 @inject IRuntimeMinifier runtimeMinifier
 @inject IProfilerHtml profilerHtml
-@inject IBackOfficeExternalLoginProviders externalLogins
 @{
     bool.TryParse(Context.Request.Query["umbDebug"], out bool isDebug);
     var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment);
@@ -114,8 +113,6 @@
 
     <script>
         document.angularReady = function(app) {
-            @await Html.AngularValueExternalLoginInfoScriptAsync(externalLogins, ViewData.GetExternalSignInProviderErrors()!)
-            @Html.AngularValueResetPasswordCodeInfoScript(ViewData[ViewDataExtensions.TokenPasswordResetCode]!)
             @await Html.AngularValueTinyMceAssetsAsync(runtimeMinifier)
             //required for the noscript trick
             document.getElementById("mainwrapper").style.display = "inherit";
diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml
index 07b729e737..8599501255 100644
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml
+++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml
@@ -32,6 +32,7 @@
     var disableLocalLogin = ExternalLogins.HasDenyLocalLogin();
     var externalLoginsUrl = LinkGenerator.GetPathByAction(nameof(BackOfficeController.ExternalLogin), ControllerExtensions.GetControllerName<BackOfficeController>(), new { area = Constants.Web.Mvc.BackOfficeArea });
     var externalLoginProviders = await ExternalLogins.GetBackOfficeProvidersAsync();
+    var externalSignInErrors = ViewData.GetExternalSignInProviderErrors();
 }
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
@@ -106,6 +107,15 @@
                 custom-view="@provider.ExternalLoginProvider.Options.CustomBackOfficeView">
             </umb-external-login-provider>
         }
+        @if (externalSignInErrors?.Errors?.Count() > 0)
+        {
+            <div slot="subheadline" style="color:var(--uui-color-danger-standalone)">
+                @foreach (var error in externalSignInErrors.Errors)
+                {
+                    <div>@error</div>
+                }
+            </div>
+        }
     </umb-auth>
 </umb-backoffice-icon-registry>
 
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
index 65d7c442f2..e81db799c3 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
@@ -426,7 +426,8 @@ public class BackOfficeController : UmbracoController
         if (user == null)
         {
             // ... this should really not happen
-            return RedirectToLogin(new { flow = "external-login", status = "localUserNotFound" });
+            TempData[ViewDataExtensions.TokenExternalSignInError] = new[] { "Local user does not exist" };
+            return RedirectToLogin(new { flow = "external-login", status = "localUserNotFound", logout = "true"});
         }
 
         ExternalLoginInfo? info =
@@ -435,7 +436,9 @@ public class BackOfficeController : UmbracoController
         if (info == null)
         {
             // Add error and redirect for it to be displayed
-            return RedirectToLogin(new { flow = "external-login", status = "externalLoginInfoNotFound" });
+            TempData[ViewDataExtensions.TokenExternalSignInError] =
+                new[] { "An error occurred, could not get external login info" };
+            return RedirectToLogin(new { flow = "external-login", status = "externalLoginInfoNotFound", logout = "true"});
         }
 
         IdentityResult addLoginResult = await _userManager.AddLoginAsync(user, info);
@@ -448,7 +451,8 @@ public class BackOfficeController : UmbracoController
         }
 
         // Add errors and redirect for it to be displayed
-        return RedirectToLogin(new { flow = "external-login", status = "failed" });
+        TempData[ViewDataExtensions.TokenExternalSignInError] = addLoginResult.Errors;
+        return RedirectToLogin(new { flow = "external-login", status = "failed", logout = "true" });
     }
 
     /// <summary>
@@ -469,8 +473,9 @@ public class BackOfficeController : UmbracoController
                 _httpContextAccessor.HttpContext,
                 ViewDataExtensions.TokenExternalSignInError,
                 _jsonSerializer) ||
-            ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError) || ViewData.FromTempData(TempData, ViewDataExtensions.TokenPasswordResetCode))
+            ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError))
         {
+            // Return early to let the client side handle the messaging
             return defaultResponse();
         }
 
diff --git a/src/Umbraco.Web.Common/Extensions/ViewDataExtensions.cs b/src/Umbraco.Web.Common/Extensions/ViewDataExtensions.cs
index 7710152792..96c5e2f0f0 100644
--- a/src/Umbraco.Web.Common/Extensions/ViewDataExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/ViewDataExtensions.cs
@@ -122,9 +122,11 @@ public static class ViewDataExtensions
         this ViewDataDictionary viewData,
         BackOfficeExternalLoginProviderErrors errors) => viewData[TokenExternalSignInError] = errors;
 
+    [Obsolete("This is deprecated and will be removed in V15")]
     public static string? GetPasswordResetCode(this ViewDataDictionary viewData) =>
         (string?)viewData[TokenPasswordResetCode];
 
+    [Obsolete("This is deprecated and will be removed in V15")]
     public static void SetPasswordResetCode(this ViewDataDictionary viewData, string value) =>
         viewData[TokenPasswordResetCode] = value;