ac/ac-deploy
1
0
Fork 0
mirror of git://f0xx.org/ac/ac-deploy synced 2026-07-29 02:57:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(lab-seeds): align login and QR approve views with ac-be-auth

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Anton Afanasyeu
2026-07-11 16:16:42 +02:00
parent eaee3d051d
commit d6f435ada0
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sim/cluster0/lab-seeds/backend/views/login.php
View File

@@ -12,6 +12,7 @@
*/ */
$bp = Auth::basePath(); $bp = Auth::basePath();
$auth = Auth::authUrl(); $auth = Auth::authUrl();
$loginRedirect = $loginRedirect ?? '';
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" data-theme="dark"> <html lang="en" data-theme="dark">
@@ -42,6 +43,9 @@ $auth = Auth::authUrl();
</label> </label>
</div> </div>
<form class="login-card" method="post" action="<?= h($auth) ?>/login"> <form class="login-card" method="post" action="<?= h($auth) ?>/login">
<?php if ($loginRedirect !== ''): ?>
<input type="hidden" name="redirect" value="<?= h($loginRedirect) ?>">
<?php endif; ?>
<h1><?= h(cfg('app_name')) ?></h1> <h1><?= h(cfg('app_name')) ?></h1>
<p class="muted" data-i18n="login.sign_in_hint">Sign in to view anonymous issue reports</p> <p class="muted" data-i18n="login.sign_in_hint">Sign in to view anonymous issue reports</p>
<?php if (!empty($loginError)): ?> <?php if (!empty($loginError)): ?>
@@ -50,8 +54,7 @@ $auth = Auth::authUrl();
<label><span data-i18n="login.username">Username</span><input name="username" autocomplete="username" required></label> <label><span data-i18n="login.username">Username</span><input name="username" autocomplete="username" required></label>
<label><span data-i18n="login.password">Password</span><input name="password" type="password" autocomplete="current-password" required></label> <label><span data-i18n="login.password">Password</span><input name="password" type="password" autocomplete="current-password" required></label>
<button type="submit" data-i18n="login.submit">Sign in</button> <button type="submit" data-i18n="login.submit">Sign in</button>
<p class="hint" data-i18n="login.hint_default">Default: admin / admin</p> <p class="hint"><a href="<?= h($auth) ?>/register" data-i18n="login.register">Create account</a></p>
<p class="hint"><a href="<?= h($auth) ?>/register" data-i18n="login.register">Register</a></p>
</form> </form>
<?php platform_render_footer(); ?> <?php platform_render_footer(); ?>
</body> </body>

23
sim/cluster0/lab-seeds/backend/views/two_factor_approve.php
View File

@@ -3,6 +3,7 @@ $bp = Auth::basePath();
$auth = Auth::authUrl(); $auth = Auth::authUrl();
$user = Auth::user(); $user = Auth::user();
$rawToken = trim($_GET['token'] ?? $_POST['token'] ?? ''); $rawToken = trim($_GET['token'] ?? $_POST['token'] ?? '');
$needsTotp = !$user && $approvalInfo && empty($approveResult);
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" data-theme="dark"> <html lang="en" data-theme="dark">
@@ -16,6 +17,8 @@ $rawToken = trim($_GET['token'] ?? $_POST['token'] ?? '');
if (t === 'light' || t === 'dark') document.documentElement.setAttribute('data-theme', t); if (t === 'light' || t === 'dark') document.documentElement.setAttribute('data-theme', t);
})(); })();
</script> </script>
<link rel="icon" type="image/x-icon" href="<?= h($bp) ?>/assets/favicon.ico">
<link rel="apple-touch-icon" href="<?= h($bp) ?>/assets/apple-touch-icon.ico">
<link rel="stylesheet" href="<?= h($bp) ?>/assets/css/app.css"> <link rel="stylesheet" href="<?= h($bp) ?>/assets/css/app.css">
</head> </head>
<body class="login-page"> <body class="login-page">
@@ -36,7 +39,7 @@ $rawToken = trim($_GET['token'] ?? $_POST['token'] ?? '');
</p> </p>
<p class="muted">Your other device should now be logged in automatically.</p> <p class="muted">Your other device should now be logged in automatically.</p>
<?php else: ?> <?php else: ?>
<p class="alert">This approval link has expired or is invalid.</p> <p class="alert">Invalid or expired code. Open the QR link again from your desktop, or enter the current 6-digit authenticator code.</p>
<?php endif; ?> <?php endif; ?>
<p style="margin-top:1.5rem;"> <p style="margin-top:1.5rem;">
<a href="<?= h($auth) ?>/" class="button">Back to hub</a> <a href="<?= h($auth) ?>/" class="button">Back to hub</a>
@@ -46,13 +49,27 @@ $rawToken = trim($_GET['token'] ?? $_POST['token'] ?? '');
<p style="font-size:1.1rem;font-weight:600;">Approve sign-in on another device?</p> <p style="font-size:1.1rem;font-weight:600;">Approve sign-in on another device?</p>
<p class="muted"> <p class="muted">
<?php if ($user): ?>
Tap <b>Approve</b> to log in the browser that showed you this QR code.<br> Tap <b>Approve</b> to log in the browser that showed you this QR code.<br>
<?php else: ?>
Enter the 6-digit code from your authenticator app to approve the other device.<br>
<?php endif; ?>
This link expires in a few minutes. This link expires in a few minutes.
</p> </p>
<form method="post" action="<?= h($auth) ?>/two-factor/approve" style="margin-top:1.5rem;"> <form method="post" action="<?= h($auth) ?>/two-factor/approve" style="margin-top:1.5rem;text-align:left;">
<input type="hidden" name="token" value="<?= h($rawToken) ?>"> <input type="hidden" name="token" value="<?= h($rawToken) ?>">
<button type="submit" style="width:100%;font-size:1.1rem;">Approve</button> <?php if ($needsTotp): ?>
<label><span>Authenticator code</span>
<input name="code" inputmode="numeric" pattern="[0-9]{6}" maxlength="6" autocomplete="one-time-code" required autofocus></label>
<?php endif; ?>
<button type="submit" style="width:100%;font-size:1.1rem;margin-top:0.75rem;">Approve</button>
</form> </form>
<?php if (!$user): ?>
<p class="hint" style="margin-top:1rem;">
Already signed in on this phone?
<a href="<?= h($auth) ?>/login?redirect=<?= urlencode($auth . '/two-factor/approve?token=' . $rawToken) ?>">Sign in first</a>
</p>
<?php endif; ?>
<p style="margin-top:1rem;"> <p style="margin-top:1rem;">
<a href="<?= h($auth) ?>/" class="muted" style="font-size:0.9rem;">Cancel</a> <a href="<?= h($auth) ?>/" class="muted" style="font-size:0.9rem;">Cancel</a>
</p> </p>