From bd0a8bfdf727424b829f945fdd00189531929728 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Mon, 30 Oct 2023 15:13:12 +0100 Subject: [PATCH] post merge --- .../Umbraco.Cms.Api.Common.csproj | 4 +- .../Umbraco.Cms.Persistence.EFCore.csproj | 5 - .../UmbracoBackOffice/AuthorizeUpgrade.cshtml | 9 ++ .../umbraco/UmbracoLogin/Index.cshtml | 72 ++++++++++-- .../Umbraco.Infrastructure.csproj | 1 - src/Umbraco.Web.UI.New.Client | 2 +- .../Umbraco.Web.UI.New.csproj | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 1 - .../umbraco/UmbracoBackOffice/Default.cshtml | 95 ++++++++------- .../umbraco/UmbracoInstall/Index.cshtml | 110 ++++++++---------- .../misc/umbraco-linux.docker | 4 +- 11 files changed, 173 insertions(+), 132 deletions(-) diff --git a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj index 3b8d4fb8cd..0a42debdf0 100644 --- a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj +++ b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj index 17e279a161..3282f2622d 100644 --- a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj +++ b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj @@ -5,11 +5,6 @@ - - - - - diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml index cce2140d06..ab45a61ed0 100644 --- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml +++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml @@ -56,6 +56,15 @@ @await Html.BareMinimumServerVariablesScriptAsync(backOfficeServerVariables) + + @*And finally we can load in our angular app*@ diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml index bb179dc23a..08915506fa 100644 --- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml +++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml @@ -1,20 +1,76 @@ @using System.Globalization -@model Umbraco.Cms.Api.Management.BackOfficeLoginModel +@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(); +} @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - + - - - + + + + Umbraco - - + + + - + + + @foreach (var provider in externalLoginProviders) + { + + + } + + diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 6511d389dd..5e4948e538 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -25,7 +25,6 @@ - diff --git a/src/Umbraco.Web.UI.New.Client b/src/Umbraco.Web.UI.New.Client index 1822682202..65c14774c1 160000 --- a/src/Umbraco.Web.UI.New.Client +++ b/src/Umbraco.Web.UI.New.Client @@ -1 +1 @@ -Subproject commit 1822682202aa81bbb8b10d8196916fc0b6bd8650 +Subproject commit 65c14774c199bd69babd67413f41c63d88858eef diff --git a/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj b/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj index 776fd5d2a9..c61d74a1ec 100644 --- a/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj +++ b/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj @@ -11,7 +11,7 @@ - + all diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index e76a4a5b06..da1837032f 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -28,7 +28,6 @@ - all diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Default.cshtml index 5662c164a6..7e66a42d39 100644 --- a/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Default.cshtml +++ b/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Default.cshtml @@ -1,12 +1,10 @@ @using Microsoft.Extensions.Options; @using System.Globalization -@using Umbraco.Cms.Core @using Umbraco.Cms.Core.Configuration @using Umbraco.Cms.Core.Configuration.Models @using Umbraco.Cms.Core.Hosting @using Umbraco.Cms.Core.Logging @using Umbraco.Cms.Core.Routing -@using Umbraco.Cms.Core.Services @using Umbraco.Cms.Core.WebAssets @using Umbraco.Cms.Infrastructure.WebAssets @using Umbraco.Cms.Web.BackOffice.Controllers @@ -18,18 +16,15 @@ @inject IOptions globalSettings @inject IRuntimeMinifier runtimeMinifier @inject IProfilerHtml profilerHtml -@inject IIconService IconService @inject IBackOfficeExternalLoginProviders externalLogins -@inject IWebProfilerService WebProfilerService @{ - var webProfilingStatus = await WebProfilerService.GetStatus(); - var isDebug = (webProfilingStatus.Success && webProfilingStatus.Result) ? true : false; + bool.TryParse(Context.Request.Query["umbDebug"], out bool isDebug); var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment); } - + @@ -43,9 +38,11 @@ @Html.Raw(await runtimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoInitCssBundleName)) + + + - -
+ +
- + - - - - - - - - - - - - + + + @await Html.BareMinimumServerVariablesScriptAsync(backOfficeServerVariables) diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoInstall/Index.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoInstall/Index.cshtml index 68049c6c91..31d27dbf7d 100644 --- a/src/Umbraco.Web.UI/umbraco/UmbracoInstall/Index.cshtml +++ b/src/Umbraco.Web.UI/umbraco/UmbracoInstall/Index.cshtml @@ -1,80 +1,64 @@ +@using Microsoft.Extensions.Options; +@using Umbraco.Cms.Core +@using Umbraco.Cms.Core.Configuration +@using Umbraco.Cms.Core.Configuration.Models +@using Umbraco.Cms.Core.Hosting +@using Umbraco.Cms.Core.WebAssets +@using Umbraco.Cms.Infrastructure.WebAssets +@using Umbraco.Cms.Web.BackOffice.Controllers +@using Umbraco.Cms.Web.BackOffice.Security @using Umbraco.Extensions +@inject BackOfficeServerVariables backOfficeServerVariables +@inject IUmbracoVersion umbracoVersion +@inject IHostingEnvironment hostingEnvironment +@inject IOptions globalSettings +@inject IBackOfficeExternalLoginProviders externalLogins +@inject IRuntimeMinifier runtimeMinifier + @{ - Layout = null; + var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment); } - + + + - + - Install Umbraco - - + Umbraco + + @Html.Raw(await runtimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoUpgradeCssBundleName)) + + @*Because we're lazy loading angular js, the embedded cloak style will not be loaded initially, but we need it*@ + + + - + - + - - + @{ + var externalLoginUrl = Url.Action("ExternalLogin", "BackOffice", new + { + area = ViewData.GetUmbracoPath(), + //Custom redirect URL since we don't want to just redirect to the back office since this is for authing upgrades + redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice") + }); + } -
+ @await Html.BareMinimumServerVariablesScriptAsync(backOfficeServerVariables) -
+ @*And finally we can load in our angular app*@ + + -
-
-

A server error occurred

-

This is most likely due to an error during application startup

- -
-
-
-
-
-
- - -
-

Did you know

-

-
- -

{{installer.feedback}}

- - - - - - diff --git a/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker b/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker index fda51841a6..8161ad062f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker +++ b/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker @@ -2,7 +2,7 @@ ## Build ############################################ -FROM mcr.microsoft.com/dotnet/nightly/sdk:8.0.100-rc.1-jammy AS build +FROM mcr.microsoft.com/dotnet/nightly/sdk:8.0.100-rc.2-jammy AS build COPY nuget.config . @@ -22,7 +22,7 @@ RUN dotnet publish --configuration Release --no-build --output /dist ## Run ############################################ -FROM mcr.microsoft.com/dotnet/nightly/aspnet:8.0.0-rc.1-jammy AS run +FROM mcr.microsoft.com/dotnet/nightly/aspnet:8.0.0-rc.2-jammy AS run WORKDIR /app COPY --from=build dist .