Hare/yoi
1
1
Fork 0
Code Actions Packages Releases Activity

fix: align account UI actor shape

Browse Source
This commit is contained in:
Keisuke Hirata 2026-07-23 18:35:04 +09:00
parent cd6468bb92
commit 2285277060
No known key found for this signature in database
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/workspace-server/src/server.rs
View File

@ -2669,7 +2669,7 @@ async fn post_passkey_registration_options(
async fn post_passkey_registration_complete( async fn post_passkey_registration_complete(
State(api): State<WorkspaceApi>, State(api): State<WorkspaceApi>,
Json(request): Json<PasskeyRegistrationCompleteRequest>, Json(request): Json<PasskeyRegistrationCompleteRequest>,
) -> ApiResult<Json<AuthUserResponse>> { ) -> ApiResult<Response> {
let challenge = api let challenge = api
.store .store
.consume_auth_challenge_by_id( .consume_auth_challenge_by_id(
@ -2732,9 +2732,7 @@ async fn post_passkey_registration_complete(
created_at: crate::auth::now_rfc3339(), created_at: crate::auth::now_rfc3339(),
last_used_at: None, last_used_at: None,
})?; })?;
Ok(Json(AuthUserResponse { issue_browser_session_response(&api, user)
user: user_response(user),
}))
} }
async fn post_passkey_login_options( async fn post_passkey_login_options(
@ -2869,6 +2867,10 @@ async fn post_passkey_login_complete(
created_at: stored.created_at, created_at: stored.created_at,
last_used_at: Some(crate::auth::now_rfc3339()), last_used_at: Some(crate::auth::now_rfc3339()),
})?; })?;
issue_browser_session_response(&api, user)
}
fn issue_browser_session_response(api: &WorkspaceApi, user: UserRecord) -> ApiResult<Response> {
let session_token = mint_secret("yoi_sess"); let session_token = mint_secret("yoi_sess");
api.store.create_browser_session(&BrowserSessionRecord { api.store.create_browser_session(&BrowserSessionRecord {
session_id: new_id("session"), session_id: new_id("session"),
@ -2893,7 +2895,7 @@ async fn post_passkey_login_complete(
); );
Ok(( Ok((
headers, headers,
Json(PasskeyLoginCompleteResponse { Json(AuthUserResponse {
user: user_response(user), user: user_response(user),
}), }),
) )

5
web/workspace/src/lib/workspace/auth/model.ts
View File

@ -5,9 +5,8 @@ export type AuthenticatedUser = {
display_name: string; display_name: string;
}; };
export type RequestActor = { export type RequestActor = AuthenticatedUser & {
user: AuthenticatedUser; auth_method: "browser_session" | "api_token" | string;
auth_kind: string;
}; };
export type WhoamiResponse = { export type WhoamiResponse = {

16
web/workspace/src/routes/account/+page.svelte
View File

@ -22,9 +22,9 @@
try { try {
const whoami = await loadWhoami(); const whoami = await loadWhoami();
actor = whoami.actor; actor = whoami.actor;
if (actor?.user.handle) { if (actor?.handle) {
handle = actor.user.handle; handle = actor.handle;
displayName = actor.user.display_name; displayName = actor.display_name;
} }
} catch (err) { } catch (err) {
error = err instanceof Error ? err.message : String(err); error = err instanceof Error ? err.message : String(err);
@ -104,23 +104,23 @@
<dl class="account-details"> <dl class="account-details">
<div> <div>
<dt>Handle</dt> <dt>Handle</dt>
<dd>{actor.user.handle}</dd> <dd>{actor.handle}</dd>
</div> </div>
<div> <div>
<dt>Display name</dt> <dt>Display name</dt>
<dd>{actor.user.display_name}</dd> <dd>{actor.display_name}</dd>
</div> </div>
<div> <div>
<dt>User ID</dt> <dt>User ID</dt>
<dd><code>{actor.user.user_id}</code></dd> <dd><code>{actor.user_id}</code></dd>
</div> </div>
<div> <div>
<dt>Account ID</dt> <dt>Account ID</dt>
<dd><code>{actor.user.account_id}</code></dd> <dd><code>{actor.account_id}</code></dd>
</div> </div>
<div> <div>
<dt>Auth kind</dt> <dt>Auth kind</dt>
<dd>{actor.auth_kind}</dd> <dd>{actor.auth_method}</dd>
</div> </div>
</dl> </dl>
<div class="settings-action-row"> <div class="settings-action-row">

4
web/workspace/src/routes/login/device/+page.svelte
View File

@ -22,7 +22,7 @@
try { try {
const whoami = await loadWhoami(); const whoami = await loadWhoami();
actor = whoami.actor; actor = whoami.actor;
if (actor?.user.handle) handle = actor.user.handle; if (actor?.handle) handle = actor.handle;
} catch (err) { } catch (err) {
error = err instanceof Error ? err.message : String(err); error = err instanceof Error ? err.message : String(err);
} finally { } finally {
@ -85,7 +85,7 @@
{#if loading} {#if loading}
<p class="muted">Loading session…</p> <p class="muted">Loading session…</p>
{:else if actor} {:else if actor}
<p>Logged in as <strong>{actor.user.display_name}</strong> <span class="muted">@{actor.user.handle}</span>.</p> <p>Logged in as <strong>{actor.display_name}</strong> <span class="muted">@{actor.handle}</span>.</p>
{:else} {:else}
<p class="muted">You need to log in with a passkey before approving a device login.</p> <p class="muted">You need to log in with a passkey before approving a device login.</p>
<form class="settings-form" onsubmit={(event) => { event.preventDefault(); void login(); }}> <form class="settings-form" onsubmit={(event) => { event.preventDefault(); void login(); }}>