From ebef3e2359363f3fecf6b15acdf07d62759ebedf Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 30 Oct 2023 15:42:31 +0100 Subject: [PATCH] The default login view should be the v14 compliant login component until the v13 login screen is migrated properly --- .../umbraco/UmbracoLogin/Index.cshtml | 74 +++---------------- 1 file changed, 9 insertions(+), 65 deletions(-) diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml index 08915506fa..e53a5d4a39 100644 --- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml +++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml @@ -1,76 +1,20 @@ @using System.Globalization -@using Microsoft.AspNetCore.Routing -@using Microsoft.Extensions.Options; -@using Umbraco.Cms.Core -@using Umbraco.Cms.Core.Configuration.Models -@using Umbraco.Cms.Core.Hosting -@using Umbraco.Cms.Core.Mail -@using Umbraco.Cms.Web.BackOffice.Controllers -@using Umbraco.Cms.Web.BackOffice.Security -@using Umbraco.Extensions -@inject IOptions ContentSettings -@inject IOptions SecuritySettings -@inject IEmailSender EmailSender -@inject IHostingEnvironment HostingEnvironment -@inject IOptions GlobalSettings -@inject IBackOfficeExternalLoginProviders ExternalLogins -@inject LinkGenerator LinkGenerator -@{ - var backOfficePath = GlobalSettings.Value.GetBackOfficePath(HostingEnvironment); - var loginLogoImage = ContentSettings.Value.LoginLogoImage; - var loginBackgroundImage = ContentSettings.Value.LoginBackgroundImage; - var usernameIsEmail = SecuritySettings.Value.UsernameIsEmail; - var allowUserInvite = EmailSender.CanSendRequiredEmail(); - var allowPasswordReset = SecuritySettings.Value.AllowPasswordReset && EmailSender.CanSendRequiredEmail(); - var disableLocalLogin = ExternalLogins.HasDenyLocalLogin(); - var externalLoginsUrl = LinkGenerator.GetPathByAction(nameof(BackOfficeController.ExternalLogin), ControllerExtensions.GetControllerName(), new { area = Constants.Web.Mvc.BackOfficeArea }); - var externalLoginProviders = await ExternalLogins.GetBackOfficeProvidersAsync(); -} +@model Umbraco.Cms.Api.Management.BackOfficeLoginModel @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - + - - - - + + + Umbraco - - - - + + + - - - @foreach (var provider in externalLoginProviders) - { - - - } - - +