Update Authentication UX #13

+13 -11

packages/cli/src/commands/login.ts

··· 11 11 deleteOAuthSession, 12 12 getOAuthStorePath, 13 13 listOAuthSessions, 14 14 + listOAuthSessionsWithHandles, 15 15 + setOAuthHandle, 14 16 } from "../lib/oauth-store"; 15 17 import { exitOnCancel } from "../lib/prompts"; 16 18 ··· 33 35 handler: async ({ logout, list }) => { 34 36 // List sessions 35 37 if (list) { 36 36 - const sessions = await listOAuthSessions(); 38 38 + const sessions = await listOAuthSessionsWithHandles(); 37 39 if (sessions.length === 0) { 38 40 log.info("No OAuth sessions stored"); 39 41 } else { 40 42 log.info("OAuth sessions:"); 41 41 - for (const did of sessions) { 42 42 - console.log(` - ${did}`); 43 43 + for (const { did, handle } of sessions) { 44 44 + console.log(` - ${handle || did} (${did})`); 43 45 } 44 46 } 45 47 return; ··· 171 173 new URLSearchParams(result.params!), 172 174 ); 173 175 174 174 - // Try to get the handle for display (use the original handle input as fallback) 175 175 - let displayName = handle; 176 176 - try { 177 177 - // The session should have the DID, we can use the original handle they entered 178 178 - // or we could fetch the profile to get the current handle 179 179 - displayName = handle.startsWith("did:") ? session.did : handle; 180 180 - } catch { 181 181 - displayName = session.did; 176 176 + // Store the handle for friendly display 177 177 + // Use the original handle input (unless it was a DID) 178 178 + const handleToStore = handle.startsWith("did:") ? undefined : handle; 179 179 + if (handleToStore) { 180 180 + await setOAuthHandle(session.did, handleToStore); 182 181 } 183 182 183 183 + // Try to get the handle for display (use the original handle input as fallback) 184 184 + const displayName = handleToStore || session.did; 185 185 + 184 186 s.stop(`Logged in as ${displayName}`); 185 187 186 188 log.success(`OAuth session saved to ${getOAuthStorePath()}`);

+46 -6

packages/cli/src/commands/publish.ts

··· 5 5 import { loadConfig, loadState, saveState, findConfig } from "../lib/config"; 6 6 import { 7 7 loadCredentials, 8 8 - listCredentials, 8 8 + listAllCredentials, 9 9 getCredentials, 10 10 } from "../lib/credentials"; 11 11 + import { getOAuthHandle, getOAuthSession } from "../lib/oauth-store"; 11 12 import { 12 13 createAgent, 13 14 createDocument, ··· 59 60 60 61 // If no credentials resolved, check if we need to prompt for identity selection 61 62 if (!credentials) { 62 62 - const identities = await listCredentials(); 63 63 + const identities = await listAllCredentials(); 63 64 if (identities.length === 0) { 64 64 - log.error("No credentials found. Run 'sequoia auth' first."); 65 65 + log.error( 66 66 + "No credentials found. Run 'sequoia login' or 'sequoia auth' first.", 67 67 + ); 65 68 log.info( 66 69 "Or set ATP_IDENTIFIER and ATP_APP_PASSWORD environment variables.", 67 70 ); 68 71 process.exit(1); 69 72 } 70 73 74 74 + // Build labels with handles for OAuth sessions 75 75 + const options = await Promise.all( 76 76 + identities.map(async (cred) => { 77 77 + if (cred.type === "oauth") { 78 78 + const handle = await getOAuthHandle(cred.id); 79 79 + return { 80 80 + value: cred.id, 81 81 + label: `${handle || cred.id} (OAuth)`, 82 82 + }; 83 83 + } 84 84 + return { 85 85 + value: cred.id, 86 86 + label: `${cred.id} (App Password)`, 87 87 + }; 88 88 + }), 89 89 + ); 90 90 + 71 91 // Multiple identities exist but none selected - prompt user 72 92 log.info("Multiple identities found. Select one to use:"); 73 93 const selected = exitOnCancel( 74 94 await select({ 75 95 message: "Identity:", 76 76 - options: identities.map((id) => ({ value: id, label: id })), 96 96 + options, 77 97 }), 78 98 ); 79 99 80 80 - credentials = await getCredentials(selected); 100 100 + // Load the selected credentials 101 101 + const selectedCred = identities.find((c) => c.id === selected); 102 102 + if (selectedCred?.type === "oauth") { 103 103 + const session = await getOAuthSession(selected); 104 104 + if (session) { 105 105 + const handle = await getOAuthHandle(selected); 106 106 + credentials = { 107 107 + type: "oauth", 108 108 + did: selected, 109 109 + handle: handle || selected, 110 110 + pdsUrl: "https://bsky.social", 111 111 + }; 112 112 + } 113 113 + } else { 114 114 + credentials = await getCredentials(selected); 115 115 + } 116 116 + 81 117 if (!credentials) { 82 118 log.error("Failed to load selected credentials."); 83 119 process.exit(1); 84 120 } 85 121 122 122 + const displayId = 123 123 + credentials.type === "oauth" 124 124 + ? credentials.handle || credentials.did 125 125 + : credentials.identifier; 86 126 log.info( 87 87 - `Tip: Add "identity": "${selected}" to sequoia.json to use this by default.`, 127 127 + `Tip: Add "identity": "${displayId}" to sequoia.json to use this by default.`, 88 128 ); 89 129 } 90 130

+41 -5

packages/cli/src/commands/sync.ts

··· 5 5 import { loadConfig, loadState, saveState, findConfig } from "../lib/config"; 6 6 import { 7 7 loadCredentials, 8 8 - listCredentials, 8 8 + listAllCredentials, 9 9 getCredentials, 10 10 } from "../lib/credentials"; 11 11 + import { getOAuthHandle, getOAuthSession } from "../lib/oauth-store"; 11 12 import { createAgent, listDocuments } from "../lib/atproto"; 12 13 import { 13 14 scanContentDirectory, ··· 49 50 let credentials = await loadCredentials(config.identity); 50 51 51 52 if (!credentials) { 52 52 - const identities = await listCredentials(); 53 53 + const identities = await listAllCredentials(); 53 54 if (identities.length === 0) { 54 54 - log.error("No credentials found. Run 'sequoia auth' first."); 55 55 + log.error( 56 56 + "No credentials found. Run 'sequoia login' or 'sequoia auth' first.", 57 57 + ); 55 58 process.exit(1); 56 59 } 57 60 61 61 + // Build labels with handles for OAuth sessions 62 62 + const options = await Promise.all( 63 63 + identities.map(async (cred) => { 64 64 + if (cred.type === "oauth") { 65 65 + const handle = await getOAuthHandle(cred.id); 66 66 + return { 67 67 + value: cred.id, 68 68 + label: `${handle || cred.id} (OAuth)`, 69 69 + }; 70 70 + } 71 71 + return { 72 72 + value: cred.id, 73 73 + label: `${cred.id} (App Password)`, 74 74 + }; 75 75 + }), 76 76 + ); 77 77 + 58 78 log.info("Multiple identities found. Select one to use:"); 59 79 const selected = exitOnCancel( 60 80 await select({ 61 81 message: "Identity:", 62 62 - options: identities.map((id) => ({ value: id, label: id })), 82 82 + options, 63 83 }), 64 84 ); 65 85 66 66 - credentials = await getCredentials(selected); 86 86 + // Load the selected credentials 87 87 + const selectedCred = identities.find((c) => c.id === selected); 88 88 + if (selectedCred?.type === "oauth") { 89 89 + const session = await getOAuthSession(selected); 90 90 + if (session) { 91 91 + const handle = await getOAuthHandle(selected); 92 92 + credentials = { 93 93 + type: "oauth", 94 94 + did: selected, 95 95 + handle: handle || selected, 96 96 + pdsUrl: "https://bsky.social", 97 97 + }; 98 98 + } 99 99 + } else { 100 100 + credentials = await getCredentials(selected); 101 101 + } 102 102 + 67 103 if (!credentials) { 68 104 log.error("Failed to load selected credentials."); 69 105 process.exit(1);

+22 -6

packages/cli/src/lib/credentials.ts

··· 1 1 import * as fs from "node:fs/promises"; 2 2 import * as os from "node:os"; 3 3 import * as path from "node:path"; 4 4 - import { getOAuthSession, listOAuthSessions } from "./oauth-store"; 4 4 + import { 5 5 + getOAuthHandle, 6 6 + getOAuthSession, 7 7 + listOAuthSessions, 8 8 + listOAuthSessionsWithHandles, 9 9 + } from "./oauth-store"; 5 10 import type { 6 11 AppPasswordCredentials, 7 12 Credentials, ··· 86 91 if (profile.startsWith("did:")) { 87 92 const session = await getOAuthSession(profile); 88 93 if (session) { 94 94 + const handle = await getOAuthHandle(profile); 89 95 return { 90 96 type: "oauth", 91 97 did: profile, 92 92 - handle: profile, // We don't have the handle stored, use DID 98 98 + handle: handle || profile, 93 99 pdsUrl: "https://bsky.social", // Will be resolved from DID doc 94 100 }; 95 101 } 96 102 } 97 103 98 98 - // Otherwise, we would need to check all OAuth sessions to find a matching handle, 99 99 - // but handle matching isn't perfect without storing handles alongside sessions. 100 100 - // For now, just return null if profile isn't a DID. 104 104 + // Try to find OAuth session by handle 105 105 + const sessions = await listOAuthSessionsWithHandles(); 106 106 + const match = sessions.find((s) => s.handle === profile); 107 107 + if (match) { 108 108 + return { 109 109 + type: "oauth", 110 110 + did: match.did, 111 111 + handle: match.handle || match.did, 112 112 + pdsUrl: "https://bsky.social", 113 113 + }; 114 114 + } 115 115 + 101 116 return null; 102 117 } 103 118 ··· 166 181 if (oauthDids.length === 1 && oauthDids[0]) { 167 182 const session = await getOAuthSession(oauthDids[0]); 168 183 if (session) { 184 184 + const handle = await getOAuthHandle(oauthDids[0]); 169 185 return { 170 186 type: "oauth", 171 187 did: oauthDids[0], 172 172 - handle: oauthDids[0], 188 188 + handle: handle || oauthDids[0], 173 189 pdsUrl: "https://bsky.social", 174 190 }; 175 191 }

+37

packages/cli/src/lib/oauth-store.ts

··· 14 14 interface OAuthStore { 15 15 states: Record<string, NodeSavedState>; 16 16 sessions: Record<string, NodeSavedSession>; 17 17 + handles?: Record<string, string>; // DID -> handle mapping (optional for backwards compat) 17 18 } 18 19 19 20 async function fileExists(filePath: string): Promise<boolean> { ··· 122 123 export function getOAuthStorePath(): string { 123 124 return OAUTH_FILE; 124 125 } 126 126 + 127 127 + /** 128 128 + * Store handle for an OAuth session (DID -> handle mapping) 129 129 + */ 130 130 + export async function setOAuthHandle( 131 131 + did: string, 132 132 + handle: string, 133 133 + ): Promise<void> { 134 134 + const store = await loadOAuthStore(); 135 135 + if (!store.handles) { 136 136 + store.handles = {}; 137 137 + } 138 138 + store.handles[did] = handle; 139 139 + await saveOAuthStore(store); 140 140 + } 141 141 + 142 142 + /** 143 143 + * Get handle for an OAuth session by DID 144 144 + */ 145 145 + export async function getOAuthHandle(did: string): Promise<string | undefined> { 146 146 + const store = await loadOAuthStore(); 147 147 + return store.handles?.[did]; 148 148 + } 149 149 + 150 150 + /** 151 151 + * List all stored OAuth sessions with their handles 152 152 + */ 153 153 + export async function listOAuthSessionsWithHandles(): Promise< 154 154 + Array<{ did: string; handle?: string }> 155 155 + > { 156 156 + const store = await loadOAuthStore(); 157 157 + return Object.keys(store.sessions).map((did) => ({ 158 158 + did, 159 159 + handle: store.handles?.[did], 160 160 + })); 161 161 + }