Fix legacy CLI auth code parsing

Author: jahooma

freebuff/web/src/app/onboard/__tests__/helpers.test.ts

@@ -23,6 +23,16 @@ describe('freebuff onboard/_helpers', () => {
       expect(result.receivedHash).toBe('hashvalue')
     })
 
+    test('parses legacy hyphen-delimited auth code', () => {
+      const receivedHash = 'a'.repeat(64)
+      const authCode = `1234567890abcdef1234567890abcdef-1704067200000-${receivedHash}`
+      const result = parseAuthCode(authCode)
+
+      expect(result.fingerprintId).toBe('1234567890abcdef1234567890abcdef')
+      expect(result.expiresAt).toBe('1704067200000')
+      expect(result.receivedHash).toBe(receivedHash)
+    })
+
     test('handles auth code missing separator before expiresAt', () => {
       const authCode =
         'fingerprint-1231704067200000.abc123hashabc123hashabc123hash'

freebuff/web/src/app/onboard/_helpers.ts

@@ -13,6 +13,17 @@ export function parseAuthCode(authCode: string): {
   )
 
   if (hashSeparatorIndex === -1 || expiresSeparatorIndex === -1) {
+    const legacyMatch = normalizedAuthCode.match(
+      /^(?<fingerprintId>.+)-(?<expiresAt>\d+)-(?<receivedHash>[a-f0-9]{64})$/i,
+    )
+    if (legacyMatch?.groups) {
+      return {
+        fingerprintId: legacyMatch.groups.fingerprintId,
+        expiresAt: legacyMatch.groups.expiresAt,
+        receivedHash: legacyMatch.groups.receivedHash,
+      }
+    }
+
     return { fingerprintId: '', expiresAt: '', receivedHash: '' }
   }
 

freebuff/web/src/app/onboard/page.tsx

@@ -103,6 +103,8 @@ const Onboard = async ({ searchParams }: PageProps) => {
     logger.warn(
       {
         authCodeLength: authCode.length,
+        dotCount: authCode.match(/\./g)?.length ?? 0,
+        hyphenCount: authCode.match(/-/g)?.length ?? 0,
         fingerprintIdPrefix: fingerprintId.slice(0, 24),
         fingerprintIdLength: fingerprintId.length,
         expiresAt,

web/src/app/onboard/__tests__/helpers.test.ts

@@ -32,6 +32,16 @@ describe('onboard/_helpers', () => {
       expect(result.receivedHash).toBe('abc123hash')
     })
 
+    test('parses legacy hyphen-delimited auth code', () => {
+      const receivedHash = 'a'.repeat(64)
+      const authCode = `1234567890abcdef1234567890abcdef-1704067200000-${receivedHash}`
+      const result = parseAuthCode(authCode)
+
+      expect(result.fingerprintId).toBe('1234567890abcdef1234567890abcdef')
+      expect(result.expiresAt).toBe('1704067200000')
+      expect(result.receivedHash).toBe(receivedHash)
+    })
+
     test('handles auth code missing separator before expiresAt', () => {
       const authCode =
         'fingerprint-1231704067200000.abc123hashabc123hashabc123hash'

web/src/app/onboard/_helpers.ts

@@ -13,6 +13,17 @@ export function parseAuthCode(authCode: string): {
   )
 
   if (hashSeparatorIndex === -1 || expiresSeparatorIndex === -1) {
+    const legacyMatch = normalizedAuthCode.match(
+      /^(?<fingerprintId>.+)-(?<expiresAt>\d+)-(?<receivedHash>[a-f0-9]{64})$/i,
+    )
+    if (legacyMatch?.groups) {
+      return {
+        fingerprintId: legacyMatch.groups.fingerprintId,
+        expiresAt: legacyMatch.groups.expiresAt,
+        receivedHash: legacyMatch.groups.receivedHash,
+      }
+    }
+
     return { fingerprintId: '', expiresAt: '', receivedHash: '' }
   }