Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V14: Deny login screen access #16034

Merged
merged 2 commits into from
Apr 11, 2024
Merged

V14: Deny login screen access #16034

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c1d410
Add "UserIsAlreadyLoggedIn" property to BackOfficeLoginModel
Zeegaan Apr 11, 2024
e92ba63
Merge branch 'v14/dev' into v14/feature/deny-login-screen-access
Zeegaan Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/Umbraco.Cms.Api.Management/Controllers/BackOfficeLoginController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;

namespace Umbraco.Cms.Api.Management;

[BindProperties]
public class
BackOfficeLoginModel
public class BackOfficeLoginModel
{
/// <summary>
/// Gets or sets the value of the "ReturnUrl" query parameter or defaults to the configured Umbraco directory.
Expand All @@ -19,6 +20,8 @@ public class
/// The configured Umbraco directory.
/// </summary>
public string? UmbracoUrl { get; set; }

public bool UserIsAlreadyLoggedIn { get; set; }
}

[ApiExplorerSettings(IgnoreApi=true)]
Expand All @@ -38,13 +41,24 @@ public BackOfficeLoginController(
}

// GET
public IActionResult Index(CancellationToken cancellationToken, BackOfficeLoginModel model)
public async Task<IActionResult> Index(CancellationToken cancellationToken, BackOfficeLoginModel model)
{
AuthenticateResult cookieAuthResult = await HttpContext.AuthenticateAsync(Constants.Security.BackOfficeAuthenticationType);
if (cookieAuthResult.Succeeded)
{
model.UserIsAlreadyLoggedIn = true;
}

if (string.IsNullOrEmpty(model.UmbracoUrl))
{
model.UmbracoUrl = _hostingEnvironment.ToAbsolute(_globalSettings.UmbracoPath);
}

if (Uri.TryCreate(model.ReturnUrl, UriKind.Absolute, out _))
{
return BadRequest("ReturnUrl must be a relative path.");
}

if (string.IsNullOrEmpty(model.ReturnUrl))
{
model.ReturnUrl = model.UmbracoUrl;
Expand Down
Loading