Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(profile-ui): preserve reset error states for R15-M1
Josuée2fee6ded350
diff --git a/external-rest-api/package-lock.json b/external-rest-api/package-lock.jsonindex 784ab552f..eab0a3e2d 100644--- a/external-rest-api/package-lock.json+++ b/external-rest-api/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-external-rest-api",- "version": "0.1.128",+ "version": "0.1.129","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-external-rest-api",- "version": "0.1.128",+ "version": "0.1.129","dependencies": {"@clerum/jwt-key-policy": "file:../packages/jwt-key-policy","cors": "^2.8.5",diff --git a/external-rest-api/package.json b/external-rest-api/package.jsonindex 7e369839d..195f25710 100644--- a/external-rest-api/package.json+++ b/external-rest-api/package.json@@ -1,6 +1,6 @@{"name": "clerum-external-rest-api",- "version": "0.1.128",+ "version": "0.1.129","description": "External REST API for profile, team management, and RPC token brokerage","main": "dist/main.js","engines": {diff --git a/external-rest-api/src/releaseManifest.ts b/external-rest-api/src/releaseManifest.tsindex d3edd44c9..25201aad1 100644--- a/external-rest-api/src/releaseManifest.ts+++ b/external-rest-api/src/releaseManifest.ts@@ -8,7 +8,7 @@ export type ReleaseManifest = {export const releaseManifest: ReleaseManifest = {releaseId: 'v0.11.0',- externalRestApiVersion: '0.1.128',+ externalRestApiVersion: '0.1.129',rpcProxyVersion: '0.1.126',desktopVersion: '0.11.0',minimumDesktopVersion: '0.1.252',diff --git a/external-rest-api/src/routes/invitations.ts b/external-rest-api/src/routes/invitations.tsindex f249ef4c0..02276bf3c 100644--- a/external-rest-api/src/routes/invitations.ts+++ b/external-rest-api/src/routes/invitations.ts@@ -86,6 +86,49 @@ function sendInvitationPasswordError(res.status(400).json({ error: 'Password must be between 8 and 256 characters' })}+function sendPasswordResetError(+ res: Response,+ error:+ | 'not_found'+ | 'forbidden'+ | 'not_accepted'+ | 'not_pending'+ | 'expired'+ | 'invalid_invitation'+ | 'invalid_password'+): void {+ const response = {+ not_found: { status: 404, code: 'not_found', message: 'Invitation not found' },+ forbidden: {+ status: 403,+ code: 'forbidden',+ message: 'Invitation is invalid or unavailable',+ },+ not_accepted: {+ status: 409,+ code: 'invitation_not_accepted',+ message: 'Invitation must be accepted before setting a password',+ },+ not_pending: {+ status: 409,+ code: 'invitation_not_pending',+ message: 'Invitation has already been used',+ },+ expired: { status: 410, code: 'expired', message: 'Invitation has expired' },+ invalid_invitation: {+ status: 400,+ code: 'invalid_invitation',+ message: 'This recovery link is invalid or expired',+ },+ invalid_password: {+ status: 400,+ code: 'invalid_password',+ message: 'Password must be between 8 and 256 characters',+ },+ }[error]+ res.status(response.status).json({ error: response.code, message: response.message })+}+async function invitationPasswordAuthFromRequest(req: Request): Promise<| { auth: InvitationPasswordAuth }| {@@ -148,11 +191,12 @@ async function completePasswordReset(token: string,email: string,invitationId: string,- password: string+ password: string,+ sendError: typeof sendInvitationPasswordError = sendInvitationPasswordError): Promise<void> {const result = await setupInvitationPasswordWithToken(token, email, invitationId, password)if (result.error) {- sendInvitationPasswordError(res, result.error)+ sendError(res, result.error)return}const sessionToken = result.data?.token@@ -261,7 +305,15 @@ export function createInvitationsRouter(): Router {return}const password = String(req.body?.password || '')- await completePasswordReset(req, res, token, email, invitationId, password)+ await completePasswordReset(+ req,+ res,+ token,+ email,+ invitationId,+ password,+ sendPasswordResetError+ )} catch (error) {if (sendPasswordAuthorityError(error, res)) returnnext(error)diff --git a/external-rest-api/test/routes.invitations.test.ts b/external-rest-api/test/routes.invitations.test.tsindex e24017da4..0eb59c592 100644--- a/external-rest-api/test/routes.invitations.test.ts+++ b/external-rest-api/test/routes.invitations.test.ts@@ -186,6 +186,109 @@ describe('routes/invitations', () => {)})+ it.each([+ {+ source: 'invalid_password',+ status: 400,+ code: 'invalid_password',+ message: 'Password must be between 8 and 256 characters',+ },+ {+ source: 'invalid_invitation',+ status: 400,+ code: 'invalid_invitation',+ message: 'This recovery link is invalid or expired',+ },+ {+ source: 'not_found',+ status: 404,+ code: 'not_found',+ message: 'Invitation not found',+ },+ {+ source: 'forbidden',+ status: 403,+ code: 'forbidden',+ message: 'Invitation is invalid or unavailable',+ },+ {+ source: 'not_accepted',+ status: 409,+ code: 'invitation_not_accepted',+ message: 'Invitation must be accepted before setting a password',+ },+ {+ source: 'not_pending',+ status: 409,+ code: 'invitation_not_pending',+ message: 'Invitation has already been used',+ },+ {+ source: 'expired',+ status: 410,+ code: 'expired',+ message: 'Invitation has expired',+ },+ ] as const)(+ 'returns stable reset code and safe message for $source without a session cookie',+ async ({ source, status, code, message }) => {+ invitationsServiceMock.setupInvitationPasswordWithToken.mockResolvedValue({+ error: source,+ })++ const res = await request(makeApp())+ .post('/invitations/password-reset')+ .set(+ 'x-forwarded-for',+ {+ invalid_password: '198.51.100.151',+ invalid_invitation: '198.51.100.152',+ not_found: '198.51.100.153',+ forbidden: '198.51.100.154',+ not_accepted: '198.51.100.155',+ not_pending: '198.51.100.156',+ expired: '198.51.100.157',+ }[source]+ )+ .send({+ token: 'Synthetic-reset-proof',+ email: '[email protected]',+ invitationId: 'reset-1',+ password: 'Synthetic-new-password-123',+ })+ .expect(status)++ expect(res.body).toEqual({ error: code, message })+ expect(res.headers['set-cookie']).toBeUndefined()+ }+ )++ it('keeps legacy reset error responses unchanged for existing invitation clients', async () => {+ invitationsServiceMock.getInvitationByToken.mockResolvedValue({+ id: 'reset-1',+ email: '[email protected]',+ purpose: 'password_reset',+ status: 'pending',+ })+ invitationsServiceMock.setupInvitationPasswordWithToken.mockResolvedValue({+ error: 'invalid_password',+ })++ const res = await request(makeApp())+ .post('/invitations/password')+ .set('x-forwarded-for', '198.51.100.199')+ .send({+ token: 'Synthetic-reset-proof',+ email: '[email protected]',+ invitationId: 'reset-1',+ password: 'Synthetic-new-password-123',+ })+ .expect(400)++ expect(res.body).toEqual({ error: 'Password must be between 8 and 256 characters' })+ expect(res.headers['set-cookie']).toBeUndefined()+ })+it('uses non-enumerating wording when a reset row does not match the verified link', async () => {invitationsServiceMock.getInvitationByToken.mockResolvedValue({id: 'current-reset-row',diff --git a/profile-ui/app/invitations/[token]/InvitationClient.tsx b/profile-ui/app/invitations/[token]/InvitationClient.tsxindex 3c27a2936..d6333a2c3 100644--- a/profile-ui/app/invitations/[token]/InvitationClient.tsx+++ b/profile-ui/app/invitations/[token]/InvitationClient.tsx@@ -310,7 +310,8 @@ export function InvitationClient({return}setError('')- if (password.length < 8 || password.length > 256) {+ const normalizedPasswordLength = password.trim().length+ if (normalizedPasswordLength < 8 || normalizedPasswordLength > 256) {setError('Password must be between 8 and 256 characters.')return}diff --git a/profile-ui/package-lock.json b/profile-ui/package-lock.jsonindex e4413f4f9..793031c8f 100644--- a/profile-ui/package-lock.json+++ b/profile-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-profile-ui",- "version": "0.1.177",+ "version": "0.1.178","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-profile-ui",- "version": "0.1.177",+ "version": "0.1.178","dependencies": {"@clerum/desktop-app-links": "file:../packages/desktop-app-links","@clerum/frontend-components": "file:../packages/frontend-components",diff --git a/profile-ui/package.json b/profile-ui/package.jsonindex 84ab0fd0a..d2c7ebd38 100644--- a/profile-ui/package.json+++ b/profile-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-profile-ui",- "version": "0.1.177",+ "version": "0.1.178","private": true,"scripts": {"dev": "next dev",diff --git a/tests/e2e/playwright/package-lock.json b/tests/e2e/playwright/package-lock.jsonindex e3ee8e478..99a2d0dd7 100644--- a/tests/e2e/playwright/package-lock.json+++ b/tests/e2e/playwright/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-playwright-tests",- "version": "0.1.76",+ "version": "0.1.77","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-playwright-tests",- "version": "0.1.76",+ "version": "0.1.77","devDependencies": {"@playwright/test": "^1.50.0","@types/node": "^22.0.0",diff --git a/tests/e2e/playwright/package.json b/tests/e2e/playwright/package.jsonindex e092920e2..69341f88b 100644--- a/tests/e2e/playwright/package.json+++ b/tests/e2e/playwright/package.json@@ -1,6 +1,6 @@{"name": "clerum-playwright-tests",- "version": "0.1.76",+ "version": "0.1.77","private": true,"description": "Playwright E2E tests for Control UI and Desktop App","scripts": {diff --git a/tests/e2e/playwright/profile-ui-recovery-fixture.mjs b/tests/e2e/playwright/profile-ui-recovery-fixture.mjsindex 5c4b48b52..acb6e9d25 100644--- a/tests/e2e/playwright/profile-ui-recovery-fixture.mjs+++ b/tests/e2e/playwright/profile-ui-recovery-fixture.mjs@@ -1,4 +1,5 @@-import { spawn } from 'node:child_process'+import { spawn, spawnSync } from 'node:child_process'+import { generateKeyPairSync } from 'node:crypto'import { createServer } from 'node:http'import path from 'node:path'import { fileURLToPath } from 'node:url'@@ -6,8 +7,10 @@ import { fileURLToPath } from 'node:url'const fixtureDirectory = path.dirname(fileURLToPath(import.meta.url))const repositoryRoot = path.resolve(fixtureDirectory, '../../..')const profileUiRoot = path.join(repositoryRoot, 'profile-ui')+const externalRestRoot = path.join(repositoryRoot, 'external-rest-api')const port = Number(process.env.PROFILE_UI_RECOVERY_PORT || 31873)const invitationToken = 'synthetic-reset-proof'+const contractPasswordPrefix = 'Synthetic-Recovery-Contract-'const invitation = {id: 'synthetic-reset-row',teamId: null,@@ -35,6 +38,8 @@ const member = {let resetPosts = 0let authenticatedMeReads = 0let passwordChanged = false+let contractResetPosts = 0+let externalRestBaseUrlfunction sendJson(response, status, body, headers = {}) {response.writeHead(status, {@@ -59,7 +64,6 @@ const apiServer = createServer(async (request, response) => {}if (request.method === 'POST' && url.pathname === '/api/v1/invitations/password-reset') {- resetPosts += 1let bodytry {body = await readJson(request)@@ -67,6 +71,32 @@ const apiServer = createServer(async (request, response) => {sendJson(response, 400, { error: 'invalid_payload' })return}+ if (typeof body.password === 'string' && body.password.startsWith(contractPasswordPrefix)) {+ contractResetPosts += 1+ const ipSuffix = String((contractResetPosts % 200) + 20)+ try {+ const upstream = await fetch(`${externalRestBaseUrl}/api/v1/invitations/password-reset`, {+ method: 'POST',+ headers: {+ 'content-type': 'application/json',+ 'x-forwarded-for': `198.51.100.${ipSuffix}`,+ },+ body: JSON.stringify(body),+ })+ const text = await upstream.text()+ response.writeHead(upstream.status, {+ 'content-type': upstream.headers.get('content-type') || 'application/json',+ ...(upstream.headers.get('set-cookie')+ ? { 'set-cookie': upstream.headers.get('set-cookie') }+ : {}),+ })+ response.end(text)+ } catch {+ sendJson(response, 502, { error: 'synthetic_external_rest_unavailable' })+ }+ return+ }+ resetPosts += 1if (body.token !== invitationToken ||body.email !== invitation.email ||@@ -110,7 +140,54 @@ const apiServer = createServer(async (request, response) => {}if (request.method === 'GET' && url.pathname === '/__test/metrics') {- sendJson(response, 200, { resetPosts, authenticatedMeReads, passwordChanged })+ sendJson(response, 200, {+ resetPosts,+ authenticatedMeReads,+ passwordChanged,+ contractResetPosts,+ })+ return+ }++ if (request.method === 'POST' && url.pathname === '/api/v1/external/invitations/password-token') {+ let body+ try {+ body = await readJson(request)+ } catch {+ sendJson(response, 400, { error: 'invalid_payload' })+ return+ }+ if (+ request.headers.authorization !== 'Bearer synthetic-profile-recovery-service-token' ||+ body.token !== invitationToken ||+ body.email !== invitation.email ||+ body.invitationId !== invitation.id ||+ typeof body.password !== 'string' ||+ !body.password.startsWith(contractPasswordPrefix) ||+ body.password.trim().length < 8+ ) {+ sendJson(response, 400, { error: 'invalid_payload' })+ return+ }+ const outcomes = {+ invalid_password: [400, 'invalid_password'],+ invalid_invitation: [400, 'invalid_invitation'],+ forbidden: [403, 'forbidden'],+ expired: [410, 'expired'],+ not_pending: [409, 'invitation_not_pending'],+ rate_limited: [429, 'rate_limited'],+ authority_unavailable: [503, 'authority_unavailable'],+ recovery_outcome_unknown: [503, 'recovery_outcome_unknown'],+ }+ const scenario = body.password+ .slice(contractPasswordPrefix.length)+ .match(/^(.+)-Password-123$/)?.[1]+ const outcome = outcomes[String(scenario || '')]+ if (outcome) {+ sendJson(response, outcome[0], { error: outcome[1] })+ return+ }+ sendJson(response, 404, { error: 'not_found' })return}@@ -125,6 +202,47 @@ await new Promise((resolve, reject) => {const apiAddress = apiServer.address()if (!apiAddress || typeof apiAddress === 'string') throw new Error('Fixture API did not bind TCP')+const { publicKey } = generateKeyPairSync('rsa', { modulusLength: 2048 })+const externalRestProcess = spawn(+ process.execPath,+ [path.join(externalRestRoot, 'test/helpers/passwordRecoveryHttpServer.mjs')],+ {+ cwd: externalRestRoot,+ env: {+ NODE_ENV: 'development',+ EXTERNAL_REST_API_CONTROL_API_BASE_URL: `http://127.0.0.1:${apiAddress.port}/api/v1`,+ EXTERNAL_REST_API_CONTROL_API_SERVICE_TOKEN: 'synthetic-profile-recovery-service-token',+ EXTERNAL_REST_API_JWT_PUBLIC_KEY: publicKey+ .export({ type: 'spki', format: 'pem' })+ .toString(),+ EXTERNAL_REST_API_CORS_ORIGIN: 'http://127.0.0.1:31873',+ },+ stdio: ['pipe', 'pipe', 'inherit'],+ }+)++externalRestBaseUrl = await new Promise((resolve, reject) => {+ let output = ''+ const timeout = setTimeout(() => reject(new Error('External REST fixture did not start')), 15_000)+ externalRestProcess.stdout.setEncoding('utf8')+ externalRestProcess.stdout.on('data', chunk => {+ output += chunk+ const match = output.match(/http:\/\/127\.0\.0\.1:\d+/)+ if (match) {+ clearTimeout(timeout)+ resolve(match[0])+ }+ })+ externalRestProcess.once('error', error => {+ clearTimeout(timeout)+ reject(error)+ })+ externalRestProcess.once('exit', code => {+ clearTimeout(timeout)+ reject(new Error(`External REST fixture exited before readiness (${code})`))+ })+})+const nextBinary = path.join(profileUiRoot, 'node_modules/next/dist/bin/next')const nextProcess = spawn(process.execPath,@@ -151,10 +269,70 @@ const nextProcess = spawn()let shuttingDown = false+function childProcessIds(rootPid) {+ try {+ const result = spawnSync('ps', ['-A', '-o', 'pid=,ppid='], {+ encoding: 'utf8',+ timeout: 2_000,+ maxBuffer: 2 * 1024 * 1024,+ })+ if (result.status !== 0 || result.error) return []+ const children = new Map()+ for (const line of result.stdout.split('\n')) {+ const match = line.trim().match(/^(\d+)\s+(\d+)$/)+ if (!match) continue+ const pid = Number(match[1])+ const parentPid = Number(match[2])+ const peers = children.get(parentPid) || []+ peers.push(pid)+ children.set(parentPid, peers)+ }+ const descendants = []+ function visit(parentPid) {+ for (const pid of children.get(parentPid) || []) {+ visit(pid)+ descendants.push(pid)+ }+ }+ visit(rootPid)+ return descendants+ } catch {+ return []+ }+}++function signalChildTree(child, signal) {+ for (const pid of childProcessIds(child.pid)) {+ try {+ process.kill(pid, signal)+ } catch {}+ }+ if (child.exitCode === null && child.signalCode === null) child.kill(signal)+}++async function stopChild(child) {+ const childIsRunning = () => child.exitCode === null && child.signalCode === null+ const exited = childIsRunning()+ ? new Promise(resolve => child.once('exit', resolve))+ : Promise.resolve()+ signalChildTree(child, 'SIGTERM')+ let graceTimer+ await Promise.race([+ exited,+ new Promise(resolve => {+ graceTimer = setTimeout(resolve, 5_000)+ }),+ ])+ clearTimeout(graceTimer)+ if (childIsRunning() || childProcessIds(child.pid).length > 0) signalChildTree(child, 'SIGKILL')+ await exited+}+async function shutdown(signal) {if (shuttingDown) returnshuttingDown = true- nextProcess.kill(signal)+ apiServer.closeAllConnections()+ await Promise.all([stopChild(nextProcess), stopChild(externalRestProcess)])await new Promise(resolve => apiServer.close(resolve))}@@ -166,6 +344,8 @@ nextProcess.once('error', error => {void shutdown('SIGTERM')})nextProcess.once('exit', code => {- process.exitCode = code ?? 1- void shutdown('SIGTERM')+ if (!shuttingDown) {+ process.exitCode = code ?? 1+ void shutdown('SIGTERM')+ }})diff --git a/tests/e2e/playwright/profile-ui-recovery/reset-session-hydration.spec.ts b/tests/e2e/playwright/profile-ui-recovery/reset-session-hydration.spec.tsindex 39b3c7b3f..a05267531 100644--- a/tests/e2e/playwright/profile-ui-recovery/reset-session-hydration.spec.ts+++ b/tests/e2e/playwright/profile-ui-recovery/reset-session-hydration.spec.ts@@ -1,11 +1,47 @@import { expect, test } from '@playwright/test'+const resetErrorCases = [+ {+ token: 'invalid_password',+ status: 400,+ message: 'Password must be between 8 and 256 characters.',+ },+ {+ token: 'invalid_invitation',+ status: 400,+ message: 'This recovery link is invalid or expired.',+ },+ { token: 'forbidden', status: 403, message: 'Invitation email does not match.' },+ { token: 'expired', status: 410, message: 'This invitation has expired.' },+ { token: 'not_pending', status: 409, message: 'This invitation has already been used.' },+ {+ token: 'rate_limited',+ status: 429,+ message: 'Account recovery is temporarily busy. Please wait a moment and try again.',+ },+ {+ token: 'authority_unavailable',+ status: 503,+ message: 'Account recovery is temporarily unavailable. Please try again shortly.',+ },+ {+ token: 'recovery_outcome_unknown',+ status: 503,+ message:+ 'We could not confirm whether your password change completed. Try signing in with the new password. If that does not work, request a new reset link.',+ },+] as const++async function openRecovery(page: import('@playwright/test').Page) {+ // E2E_GUARDIAN_NAVIGATION: email-reset-entry — the synthetic emailed reset URL+ await page.goto('/invitations/synthetic-reset-proof')+ await expect(page.getByRole('heading', { name: 'Reset password' })).toBeVisible()+}+test('retries session hydration after committed reset without resubmitting the reset proof', async ({page,}) => {- // E2E_GUARDIAN_NAVIGATION: email-reset-entry — the emailed password-reset URL- await page.goto('/invitations/synthetic-reset-proof')- await expect(page.getByRole('heading', { name: 'Reset password' })).toBeVisible()+ await openRecovery(page)await page.getByLabel('Password', { exact: true }).fill('Synthetic-Recovery-Password-123')await page.getByLabel('Confirm password').fill('Synthetic-Recovery-Password-123')@@ -72,3 +108,66 @@ test('retries session hydration after committed reset without resubmitting the rpasswordChanged: true,})})++test('trimmed-too-short password gets password guidance without dispatching a reset', async ({+ page,+}) => {+ await openRecovery(page)+ const before = await page.request+ .get('/external-rest-api/__test/metrics')+ .then(response => response.json())++ await page.getByLabel('Password', { exact: true }).fill('abcdefg ')+ await page.getByLabel('Confirm password').fill('abcdefg ')+ await page.getByRole('button', { name: 'Reset password' }).click()++ await expect(+ page.getByText('Password must be between 8 and 256 characters.', { exact: true })+ ).toBeVisible()+ await expect(+ page.getByText('This recovery link is invalid or expired.', { exact: true })+ ).toHaveCount(0)+ const after = await page.request+ .get('/external-rest-api/__test/metrics')+ .then(response => response.json())+ expect(after.contractResetPosts).toBe(before.contractResetPosts)+ expect(after.resetPosts).toBe(before.resetPosts)+})++for (const failure of resetErrorCases) {+ test(`real reset route response ${failure.token} reaches Profile UI apiSend`, async ({+ page,+ }) => {+ await openRecovery(page)+ const before = await page.request+ .get('/external-rest-api/__test/metrics')+ .then(response => response.json())++ const password = `Synthetic-Recovery-Contract-${failure.token}-Password-123`+ await page.getByLabel('Password', { exact: true }).fill(password)+ await page.getByLabel('Confirm password').fill(password)+ const resetResponsePromise = page.waitForResponse(+ response =>+ response.url().endsWith('/api/v1/invitations/password-reset') &&+ response.request().method() === 'POST'+ )+ await page.getByRole('button', { name: 'Reset password' }).click()+ const resetResponse = await resetResponsePromise++ expect(resetResponse.status()).toBe(failure.status)+ expect(resetResponse.headers()['set-cookie']).toBeUndefined()+ await expect(page.getByText(failure.message, { exact: true })).toBeVisible()+ await expect(+ page.getByText('This recovery link is invalid or expired.', { exact: true })+ ).toHaveCount(failure.token === 'invalid_invitation' ? 1 : 0)++ const after = await page.request+ .get('/external-rest-api/__test/metrics')+ .then(response => response.json())+ expect(after.contractResetPosts).toBe(before.contractResetPosts + 1)+ expect(after.authenticatedMeReads).toBe(before.authenticatedMeReads)+ expect((await page.context().cookies()).some(cookie => cookie.name === 'profile_session')).toBe(+ false+ )+ })+}