GCR deployment testing in progress - content type issue still remaining.
This commit is contained in:
@@ -2,6 +2,7 @@ using Htmx.ApiDemo.Data;
|
||||
using Immediate.Apis.Shared;
|
||||
using Immediate.Handlers.Shared;
|
||||
using Microsoft.AspNetCore.Antiforgery;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace Htmx.ApiDemo.Templates;
|
||||
@@ -31,9 +32,9 @@ public sealed class Login : LoginBase
|
||||
[MapGet("/login")]
|
||||
public static partial class GetLoginHandler
|
||||
{
|
||||
public record Query;
|
||||
public class Query;
|
||||
|
||||
private static ValueTask HandleAsync(
|
||||
private static ValueTask<IResult> HandleAsync(
|
||||
Query _,
|
||||
IHttpContextAccessor httpContextAccessor,
|
||||
IAntiforgery antiforgery,
|
||||
@@ -43,14 +44,10 @@ public static partial class GetLoginHandler
|
||||
?? throw new InvalidOperationException("HttpContext is not available.");
|
||||
|
||||
if (ctx.User.Identity?.IsAuthenticated == true)
|
||||
{
|
||||
ctx.Response.Redirect("/");
|
||||
return ValueTask.CompletedTask;
|
||||
}
|
||||
return ValueTask.FromResult<IResult>(new HtmxResult("/"));
|
||||
|
||||
var afTokens = antiforgery.GetAndStoreTokens(ctx);
|
||||
ctx.WriteHtmxPage(new Login(afToken: afTokens.RequestToken), title: "Sign in", appName: "HtmxApp", pageTitle: "Sign in");
|
||||
return ValueTask.CompletedTask;
|
||||
return ValueTask.FromResult<IResult>(ctx.WriteHtmxPage(new Login(afToken: afTokens.RequestToken), title: "Sign in", appName: "HtmxApp", pageTitle: "Sign in"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,12 +56,13 @@ public static partial class GetLoginHandler
|
||||
[MapPost("/login")]
|
||||
public static partial class PostLoginHandler
|
||||
{
|
||||
public record Command(
|
||||
[property: FromForm] string Email,
|
||||
[property: FromForm] string Password
|
||||
);
|
||||
public class Command
|
||||
{
|
||||
[FromForm] public string Email { get; set; } = default!;
|
||||
[FromForm] public string Password { get; set; } = default!;
|
||||
}
|
||||
|
||||
private static async ValueTask HandleAsync(
|
||||
private static async ValueTask<IResult> HandleAsync(
|
||||
[AsParameters] Command command,
|
||||
IHttpContextAccessor httpContextAccessor,
|
||||
IAntiforgery antiforgery,
|
||||
@@ -77,12 +75,9 @@ public static partial class PostLoginHandler
|
||||
var (success, error) = await authService.LoginAsync(command.Email, command.Password);
|
||||
|
||||
if (success)
|
||||
{
|
||||
ctx.Response.Redirect("/");
|
||||
return;
|
||||
}
|
||||
return new HtmxResult("/");
|
||||
|
||||
var afTokens = antiforgery.GetAndStoreTokens(ctx);
|
||||
ctx.WriteHtmxPage(new Login(error, afToken: afTokens.RequestToken), title: "Sign in", appName: "HtmxApp", pageTitle: "Sign in");
|
||||
return ctx.WriteHtmxPage(new Login(error, afToken: afTokens.RequestToken), title: "Sign in", appName: "HtmxApp", pageTitle: "Sign in");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user