jeffemmett
/
rspace-online
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'
CI/CD / deploy (push) Successful in 2m40s Details

This commit is contained in:
Jeff Emmett 2026-04-08 22:27:23 -04:00
parent d69dfa4618 a711af055a
commit 75fef85df8
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/rspace-header.ts
View File

@ -688,7 +688,6 @@ export function showAuthModal(callbacks?: Partial<AuthModalCallbacks>): void {
{ alg: -257, type: 'public-key' as const }, { alg: -257, type: 'public-key' as const },
], ],
authenticatorSelection: { authenticatorSelection: {
authenticatorAttachment: 'platform',
residentKey: 'required', residentKey: 'required',
requireResidentKey: true, requireResidentKey: true,
userVerification: 'required', userVerification: 'required',
@ -717,9 +716,9 @@ export function showAuthModal(callbacks?: Partial<AuthModalCallbacks>): void {
username, username,
}), }),
}); });
const data = await completeRes.json(); const data = await completeRes.json().catch(() => null);
if (!completeRes.ok || !data.success) { if (!data || !completeRes.ok || !data.success) {
throw new Error(data.error || 'Registration failed'); throw new Error(data?.error || 'Registration failed');
} }
// 4. Store server-signed token with username // 4. Store server-signed token with username

8
shared/components/rstack-identity.ts
View File

@ -934,7 +934,7 @@ export class RStackIdentity extends HTMLElement {
{ alg: -7, type: "public-key" as const }, { alg: -7, type: "public-key" as const },
{ alg: -257, type: "public-key" as const }, { alg: -257, type: "public-key" as const },
], ],
authenticatorSelection: { authenticatorAttachment: "platform", residentKey: "required", requireResidentKey: true, userVerification: "required" }, authenticatorSelection: { residentKey: "required", requireResidentKey: true, userVerification: "required" },
attestation: "none", attestation: "none",
timeout: 60000, timeout: 60000,
}, },
@ -958,8 +958,8 @@ export class RStackIdentity extends HTMLElement {
username, username,
}), }),
}); });
const data = await completeRes.json(); const data = await completeRes.json().catch(() => null);
if (!completeRes.ok || !data.success) throw new Error(data.error || "Registration failed"); if (!data || !completeRes.ok || !data.success) throw new Error(data?.error || "Registration failed");
storeSession(data.token, username, data.did || ""); storeSession(data.token, username, data.did || "");
close(); close();
@ -1751,7 +1751,7 @@ export class RStackIdentity extends HTMLElement {
{ alg: -7, type: "public-key" as const }, { alg: -7, type: "public-key" as const },
{ alg: -257, type: "public-key" as const }, { alg: -257, type: "public-key" as const },
], ],
authenticatorSelection: { authenticatorAttachment: "platform", residentKey: "required", requireResidentKey: true, userVerification: "required" }, authenticatorSelection: { residentKey: "required", requireResidentKey: true, userVerification: "required" },
attestation: "none", attestation: "none",
timeout: 60000, timeout: 60000,
}, },

4
src/encryptid/server.ts
View File

@ -593,6 +593,10 @@ app.post('/api/register/start', async (c) => {
app.post('/api/register/complete', async (c) => { app.post('/api/register/complete', async (c) => {
const { challenge, credential, userId, username, email, clientDid, eoaAddress } = await c.req.json(); const { challenge, credential, userId, username, email, clientDid, eoaAddress } = await c.req.json();
if (!userId || !credential || !username) {
return c.json({ error: 'Missing required fields: userId, credential, username' }, 400);
}
// Verify challenge // Verify challenge
const challengeRecord = await getChallenge(challenge); const challengeRecord = await getChallenge(challenge);
if (!challengeRecord || challengeRecord.type !== 'registration') { if (!challengeRecord || challengeRecord.type !== 'registration') {