fix: restore HTML login form with prerender: true per spec requirements
TaxBaik CI/CD / build-and-deploy (push) Successful in 2m24s
TaxBaik CI/CD / build-and-deploy (push) Successful in 2m24s
Context: Validation script requires Login.razor to use prerender: true for immediate form display before WASM boots (Phase 9 requirement). Solution: Revert to original HTML form + JavaScript approach: - AdminLoginForm: HTML form (statically rendered, works with prerender: true) - admin-session.js: JavaScript login handler - Post-login: 200ms delay before redirect to allow CustomAuthenticationStateProvider to read tokens from localStorage and establish auth state Flow: 1. User submits form (JavaScript handles it) 2. POST /api/auth/login 3. Save tokens to localStorage 4. 200ms delay 5. Redirect to /taxbaik/admin/dashboard 6. Page loads with Blazor bootstrapping + auth state restored Result: Login form displays immediately (prerender: true) while maintaining proper authentication state propagation for [Authorize] pages. Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
@page "/admin/login"
|
@page "/admin/login"
|
||||||
@layout TaxBaik.WasmClient.Components.Admin.Layout.BlankLayout
|
@layout TaxBaik.WasmClient.Components.Admin.Layout.BlankLayout
|
||||||
@attribute [AllowAnonymous]
|
@attribute [AllowAnonymous]
|
||||||
@rendermode @(new InteractiveWebAssemblyRenderMode(prerender: false))
|
@rendermode @(new InteractiveWebAssemblyRenderMode(prerender: true))
|
||||||
<PageTitle>로그인</PageTitle>
|
<PageTitle>로그인</PageTitle>
|
||||||
<AdminLoginForm />
|
<AdminLoginForm />
|
||||||
|
|||||||
@@ -1,57 +1,47 @@
|
|||||||
@using System.Text.Json
|
|
||||||
@inject ILocalStorageService LocalStorageService
|
@inject ILocalStorageService LocalStorageService
|
||||||
@inject NavigationManager Navigation
|
@inject IJSRuntime Js
|
||||||
@inject ISnackbar Snackbar
|
|
||||||
@inject HttpClient Http
|
|
||||||
@inject AuthenticationStateProvider AuthStateProvider
|
|
||||||
|
|
||||||
<MudContainer MaxWidth="MaxWidth.Small" Class="admin-login-page d-flex align-center justify-center" Style="min-height: 100vh;">
|
<MudContainer MaxWidth="MaxWidth.Small" Class="admin-login-page d-flex align-center justify-center" Style="min-height: 100vh;">
|
||||||
<MudPaper Class="pa-8" Elevation="3" Style="width: 100%; max-width: 400px;">
|
<MudPaper Class="pa-8" Elevation="3" Style="width: 100%; max-width: 400px;">
|
||||||
<MudText Typo="Typo.h4" Class="mb-6 text-center">관리자 로그인</MudText>
|
<MudText Typo="Typo.h4" Class="mb-6 text-center">관리자 로그인</MudText>
|
||||||
|
|
||||||
<MudForm @ref="form" OnSubmit="HandleLogin">
|
<form id="admin-login-form">
|
||||||
<MudTextField @bind-Value="username"
|
<input class="mud-input mud-input-outlined mud-input-root mud-input-root-adorned-start mb-4"
|
||||||
Label="사용자명"
|
style="width: 100%; min-height: 56px; padding: 16px 14px;"
|
||||||
Placeholder="사용자명"
|
placeholder="사용자명"
|
||||||
Variant="Variant.Outlined"
|
autocomplete="username"
|
||||||
Class="mb-4"
|
name="username"
|
||||||
Required="true"
|
value="@rememberedUsername" />
|
||||||
Disabled="@isLoggingIn"
|
|
||||||
InputType="InputType.Text"
|
|
||||||
Autocomplete="username" />
|
|
||||||
|
|
||||||
<MudTextField @bind-Value="password"
|
<input type="password"
|
||||||
Label="비밀번호"
|
class="mud-input mud-input-outlined mud-input-root mud-input-root-adorned-start mb-4"
|
||||||
Placeholder="비밀번호"
|
style="width: 100%; min-height: 56px; padding: 16px 14px;"
|
||||||
Variant="Variant.Outlined"
|
placeholder="비밀번호"
|
||||||
Class="mb-4"
|
autocomplete="current-password"
|
||||||
Required="true"
|
name="password" />
|
||||||
Disabled="@isLoggingIn"
|
|
||||||
InputType="InputType.Password"
|
|
||||||
Autocomplete="current-password" />
|
|
||||||
|
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
<MudCheckBox @bind-Checked="rememberMe" Label="아이디 저장" Disabled="@isLoggingIn" />
|
<input class="mud-checkbox" type="checkbox" name="rememberMe" />
|
||||||
|
<label style="margin-left: 8px; cursor: pointer;">아이디 저장</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<MudButton ButtonType="ButtonType.Submit"
|
<div class="mud-alert mud-alert-filled-error mb-4 login-error-message" style="display:none;">로그인 중 오류가 발생했습니다.</div>
|
||||||
Variant="Variant.Filled"
|
|
||||||
Color="Color.Primary"
|
<button type="submit"
|
||||||
FullWidth="true"
|
id="admin-login-submit"
|
||||||
Disabled="@isLoggingIn"
|
disabled="@(!isReady)"
|
||||||
Class="mud-elevation-0">
|
class="mud-button-root mud-button mud-button-filled mud-button-filled-primary mud-elevation-0"
|
||||||
@(isLoggingIn ? "로그인 중..." : "로그인")
|
style="width: 100%; min-height: 52px; border: 0; border-radius: 4px; color: white;">
|
||||||
</MudButton>
|
<span>@(isReady ? "로그인" : "준비 중...")</span>
|
||||||
</MudForm>
|
</button>
|
||||||
|
</form>
|
||||||
</MudPaper>
|
</MudPaper>
|
||||||
</MudContainer>
|
</MudContainer>
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
private MudForm? form;
|
private string rememberedUsername = "";
|
||||||
private string username = "";
|
private bool isRememberChecked = false;
|
||||||
private string password = "";
|
private bool isReady;
|
||||||
private bool rememberMe = false;
|
|
||||||
private bool isLoggingIn = false;
|
|
||||||
private const string RememberedUsernameKey = "admin-remembered-username";
|
private const string RememberedUsernameKey = "admin-remembered-username";
|
||||||
private const string RememberedCheckboxKey = "admin-remember-checkbox";
|
private const string RememberedCheckboxKey = "admin-remember-checkbox";
|
||||||
|
|
||||||
@@ -59,83 +49,35 @@
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
username = await LocalStorageService.GetItemAsStringAsync(RememberedUsernameKey) ?? "";
|
rememberedUsername = await LocalStorageService.GetItemAsStringAsync(RememberedUsernameKey) ?? "";
|
||||||
var checkboxValue = await LocalStorageService.GetItemAsStringAsync(RememberedCheckboxKey) ?? "false";
|
var checkboxValue = await LocalStorageService.GetItemAsStringAsync(RememberedCheckboxKey) ?? "false";
|
||||||
rememberMe = checkboxValue == "true" && !string.IsNullOrEmpty(username);
|
isRememberChecked = checkboxValue == "true" && !string.IsNullOrEmpty(rememberedUsername);
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
username = "";
|
rememberedUsername = "";
|
||||||
rememberMe = false;
|
isRememberChecked = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task HandleLogin()
|
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||||
|
{
|
||||||
|
if (firstRender)
|
||||||
{
|
{
|
||||||
if (form == null || isLoggingIn) return;
|
|
||||||
|
|
||||||
await form.Validate();
|
|
||||||
if (!form.IsValid) return;
|
|
||||||
|
|
||||||
isLoggingIn = true;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var response = await Http.PostAsJsonAsync("/api/auth/login", new { username, password });
|
await Js.InvokeVoidAsync("taxbaikAdminSession.syncRouteClass");
|
||||||
if (!response.IsSuccessStatusCode)
|
await Js.InvokeVoidAsync("taxbaikAdminSession.bindLoginForm");
|
||||||
{
|
|
||||||
Snackbar.Add("로그인 실패: 사용자명 또는 비밀번호가 올바르지 않습니다", Severity.Error);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
catch
|
||||||
var json = await response.Content.ReadAsStringAsync();
|
|
||||||
var loginResponse = JsonSerializer.Deserialize<LoginResponse>(json);
|
|
||||||
if (loginResponse == null || string.IsNullOrEmpty(loginResponse.AccessToken))
|
|
||||||
{
|
{
|
||||||
Snackbar.Add("로그인 실패: 응답 오류", Severity.Error);
|
// Login UI must remain visible even if JS binding fails.
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 로컬 저장소 저장
|
|
||||||
await LocalStorageService.SetItemAsStringAsync("accessToken", loginResponse.AccessToken);
|
|
||||||
await LocalStorageService.SetItemAsStringAsync("refreshToken", loginResponse.RefreshToken ?? "");
|
|
||||||
var expiryTicks = DateTimeOffset.UtcNow.AddSeconds(loginResponse.ExpiresIn).UtcTicks;
|
|
||||||
await LocalStorageService.SetItemAsStringAsync("tokenExpiry", expiryTicks.ToString());
|
|
||||||
|
|
||||||
// 아이디 저장
|
|
||||||
if (rememberMe)
|
|
||||||
{
|
|
||||||
await LocalStorageService.SetItemAsStringAsync(RememberedUsernameKey, username);
|
|
||||||
await LocalStorageService.SetItemAsStringAsync(RememberedCheckboxKey, "true");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
await LocalStorageService.RemoveItemAsync(RememberedUsernameKey);
|
|
||||||
await LocalStorageService.RemoveItemAsync(RememberedCheckboxKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Blazor 인증 상태 업데이트
|
|
||||||
if (AuthStateProvider is CustomAuthenticationStateProvider customProvider)
|
|
||||||
{
|
|
||||||
await customProvider.LoginAsync(loginResponse.AccessToken, loginResponse.RefreshToken ?? "", loginResponse.ExpiresIn);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 대시보드로 이동
|
|
||||||
Navigation.NavigateTo("/admin/dashboard", replace: true);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Snackbar.Add($"로그인 중 오류: {ex.Message}", Severity.Error);
|
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
isLoggingIn = false;
|
isReady = true;
|
||||||
|
StateHasChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private class LoginResponse
|
|
||||||
{
|
|
||||||
public string AccessToken { get; set; } = "";
|
|
||||||
public string RefreshToken { get; set; } = "";
|
|
||||||
public int ExpiresIn { get; set; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -341,10 +341,11 @@ window.taxbaikAdminSession = {
|
|||||||
localStorage.removeItem('admin-remember-checkbox');
|
localStorage.removeItem('admin-remember-checkbox');
|
||||||
}
|
}
|
||||||
|
|
||||||
// 토큰을 저장한 직후 페이지 리로드
|
// 토큰 저장 후 약간의 지연을 두고 대시보드로 이동
|
||||||
// 이렇게 하면 CustomAuthenticationStateProvider의 GetAuthenticationStateAsync()가
|
// 이렇게 하면 CustomAuthenticationStateProvider가 localStorage에서 토큰을 복원할 시간이 생김
|
||||||
// localStorage에서 토큰을 복원하고 [Authorize] 페이지가 제대로 렌더링됨
|
setTimeout(() => {
|
||||||
window.location.href = '/taxbaik/admin/dashboard';
|
window.location.href = '/taxbaik/admin/dashboard';
|
||||||
|
}, 200);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
window.taxbaikAdminSession.traceUiState('admin-login', `submit failed: ${error?.message || 'login failed'}`);
|
window.taxbaikAdminSession.traceUiState('admin-login', `submit failed: ${error?.message || 'login failed'}`);
|
||||||
postLog({
|
postLog({
|
||||||
|
|||||||
Reference in New Issue
Block a user