From 6571f15f67d0b361e1fa3c00615d0bb8c433f0a1 Mon Sep 17 00:00:00 2001
From: jchinedu <jchinedu080@gmail.com>
Date: Sun, 26 Jul 2026 08:18:38 +0100
Subject: [PATCH 1/2] Fix camera permissions in access scanner

- Handled undetermined camera permission state with clear rationale before OS prompt
- Handled denied permission state gracefully (both temporary and permanent)
- Deep linked to system settings if permanently denied
---
 app/access-scanner.tsx | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/access-scanner.tsx b/app/access-scanner.tsx
index ca80d39..f703ad3 100644
--- a/app/access-scanner.tsx
+++ b/app/access-scanner.tsx
@@ -110,27 +110,30 @@ export default function AccessScanner() {
         <AppHeader title="Scan Access QR" showBack />
         <View className="flex-1 px-4 py-6">
           <Card>
-            <Text accessibilityRole="header" className="text-xl font-bold text-text mb-2">Camera access needed</Text>
-            <Text accessibilityLiveRegion="polite" className="text-text-muted mb-6">
-              GuildPass needs camera permission to scan access check QR codes.
+            <Text accessibilityRole="header" className="text-xl font-bold text-text mb-2">
+              {permission.status === "denied" ? "Camera permission denied" : "Camera access needed"}
             </Text>
+            
+            {permission.status === "denied" ? (
+              <Text accessibilityRole="alert" accessibilityLiveRegion="assertive" className="text-error mb-6">
+                {permission.canAskAgain
+                  ? "Camera permission was denied. Please allow camera access to scan QR codes."
+                  : "Camera permission was permanently denied. Open Settings to enable camera access for GuildPass to scan QR codes."}
+              </Text>
+            ) : (
+              <Text accessibilityLiveRegion="polite" className="text-text-muted mb-6">
+                GuildPass needs camera permission to scan access check QR codes.
+              </Text>
+            )}
+
             {permission.canAskAgain ? (
               <Button title="Allow Camera Access" onPress={requestPermission} />
             ) : (
-              <>
-                <Text accessibilityRole="alert" accessibilityLiveRegion="assertive" className="text-error">
-                  Camera permission was denied. Enable camera access in your device settings to scan
-                  QR codes.
-                </Text>
-                <Text accessibilityRole="alert" accessibilityLiveRegion="assertive" className="text-error mb-6">
-                  Camera permission was denied. Open Settings to enable camera access for GuildPass.
-                </Text>
-                <Button
-                  title="Open Settings"
-                  onPress={() => Linking.openSettings()}
-                  variant="outline"
-                />
-              </>
+              <Button
+                title="Open Settings"
+                onPress={() => Linking.openSettings()}
+                variant="outline"
+              />
             )}
           </Card>
         </View>

From cbe204d83f8fb2842406fd42a63b228027da0110 Mon Sep 17 00:00:00 2001
From: jchinedu <jchinedu080@gmail.com>
Date: Sun, 26 Jul 2026 09:01:21 +0100
Subject: [PATCH 2/2] test: Fix accessQrPayload and accessScanner tests for v2
 payload requirements and wording updates

Closes #235
---
 app/access-scanner.tsx                 | 14 +++----
 src/features/access/verifyQrPayload.ts | 16 +-------
 tests/accessCheckScreen.test.tsx       | 10 ++++-
 tests/accessQrPayload.test.ts          | 17 +++++---
 tests/accessScanner.test.tsx           | 55 +++++++++++++++++---------
 tests/qrKeyRotation.test.ts            | 35 +++++++---------
 tests/verifyAndParseQrPayload.test.ts  |  7 ++--
 7 files changed, 80 insertions(+), 74 deletions(-)

diff --git a/app/access-scanner.tsx b/app/access-scanner.tsx
index f703ad3..7998a20 100644
--- a/app/access-scanner.tsx
+++ b/app/access-scanner.tsx
@@ -7,9 +7,9 @@ import * as Linking from "expo-linking";
 import { AppHeader } from "../src/components/AppHeader";
 import { Button } from "../src/components/Button";
 import { Card } from "../src/components/Card";
-import { verifyAndParseAccessQrPayload, QrValidationResult } from "../src/features/access/verifyQrPayload";
-import { describeQrSignatureError, QR_SIGNATURE_ERROR_CODES, QrSignatureErrorCode } from "../src/features/access/qrSignature";
-import { describeQrPayloadError, QR_PAYLOAD_ERROR_CODES, QrPayloadErrorCode } from "../src/features/access/qrPayload";
+import { verifyAndParseAccessQrPayload } from "../src/features/access/verifyQrPayload";
+import { describeQrSignatureError, QR_SIGNATURE_ERROR_CODES, QrSignatureErrorCode, QrSignatureError } from "../src/features/access/qrSignature";
+import { describeQrPayloadError, QR_PAYLOAD_ERROR_CODES, QrPayloadErrorCode, QrPayloadError } from "../src/features/access/qrPayload";
 import { AccessHistoryList } from "../src/components/AccessHistoryList";
 import { useAccessHistoryStore } from "../src/features/access/accessHistory.store";
 
@@ -41,13 +41,11 @@ export default function AccessScanner() {
     setScanError(null);
     AccessibilityInfo.announceForAccessibility("Processing access QR code.");
 
-    const result = await verifyAndParseAccessQrPayload(data);
-
     try {
       AccessibilityInfo.announceForAccessibility("Processing access QR code.");
-      await verifyAndParseAccessQrPayload(data);
+      const result = await verifyAndParseAccessQrPayload(data);
       setVerificationSuccess(true);
-      AccessibilityInfo.announceForAccessibility("Signature verified. Opening access check.");
+      AccessibilityInfo.announceForAccessibility("QR code accepted. Opening access check.");
       
       setTimeout(() => {
         setVerificationSuccess(false);
@@ -74,8 +72,6 @@ export default function AccessScanner() {
         } else {
           errorMessage = error.message;
         }
-      } else if (error instanceof Error) {
-        errorMessage = error.message;
       }
 
       setScanError({ message: errorMessage, isUntrusted });
diff --git a/src/features/access/verifyQrPayload.ts b/src/features/access/verifyQrPayload.ts
index 57785a1..e26eddd 100644
--- a/src/features/access/verifyQrPayload.ts
+++ b/src/features/access/verifyQrPayload.ts
@@ -6,13 +6,6 @@ import type { ParsedAccessQrPayload } from "./qrPayload";
 import type { QrPayloadErrorCode } from "./qrPayload";
 import { checkAndRecordNonce } from "./qrReplayGuard";
 
-export type QrValidationResult =
-  | { success: true; payload: ParsedAccessQrPayload }
-  | {
-      success: false;
-      reason: QrSignatureErrorCode | QrPayloadErrorCode | "UNKNOWN_ERROR";
-      message?: string;
-    };
 
 const isRecord = (value: unknown): value is Record<string, unknown> =>
   typeof value === "object" && value !== null && !Array.isArray(value);
@@ -66,14 +59,7 @@ export const verifyAndParseAccessQrPayload = async (
   );
 
   if (parsed.nonce !== undefined) {
-    try {
-      await checkAndRecordNonce(parsed.nonce, parsed.expiresAt, now);
-    } catch (error) {
-      if (error instanceof QrPayloadError) {
-        return { success: false, reason: error.code, message: error.message };
-      }
-      return { success: false, reason: "UNKNOWN_ERROR", message: String(error) };
-    }
+    await checkAndRecordNonce(parsed.nonce, parsed.expiresAt, now);
   }
 
   return { payload: parsed, isVerified: true };
diff --git a/tests/accessCheckScreen.test.tsx b/tests/accessCheckScreen.test.tsx
index 22eab66..e4b191e 100644
--- a/tests/accessCheckScreen.test.tsx
+++ b/tests/accessCheckScreen.test.tsx
@@ -295,11 +295,14 @@ describe("AccessCheck screen", () => {
   it("does not show a wallet warning when the QR payload matches the connected wallet", async () => {
     searchParams.qrPayload = JSON.stringify({
       type: "guildpass.access-check",
-      version: 1,
+      version: 2,
       guildId: "guild-alpha",
       resourceId: "vip-door",
       walletAddress: walletState.walletAddress,
       expiresAt: "2099-01-01T00:00:00.000Z",
+      kid: "test-kid",
+      signature: "fake-signature",
+      nonce: "fake-nonce",
     });
 
     let screen: ReactTestRenderer;
@@ -315,11 +318,14 @@ describe("AccessCheck screen", () => {
   it("shows a warning and allows switching back to the connected wallet when the QR wallet differs", async () => {
     searchParams.qrPayload = JSON.stringify({
       type: "guildpass.access-check",
-      version: 1,
+      version: 2,
       guildId: "guild-alpha",
       resourceId: "vip-door",
       walletAddress: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
       expiresAt: "2099-01-01T00:00:00.000Z",
+      kid: "test-kid",
+      signature: "fake-signature",
+      nonce: "fake-nonce",
     });
 
     let screen: ReactTestRenderer;
diff --git a/tests/accessQrPayload.test.ts b/tests/accessQrPayload.test.ts
index 26f5605..7021ad2 100644
--- a/tests/accessQrPayload.test.ts
+++ b/tests/accessQrPayload.test.ts
@@ -17,6 +17,9 @@ const buildPayload = (overrides = {}) =>
     guildId: "guild_abc",
     resourceId: "vip-door",
     expiresAt: "2026-06-23T12:05:00.000Z",
+    kid: "test-kid",
+    signature: "fake-signature",
+    nonce: "fake-nonce",
     ...overrides,
   });
 
@@ -25,7 +28,7 @@ describe("SUPPORTED_QR_PAYLOAD_VERSIONS", () => {
     expect(SUPPORTED_QR_PAYLOAD_VERSIONS).toEqual([
       {
         type: "guildpass.access-check",
-        version: 1,
+        version: 2,
       },
     ]);
   });
@@ -45,6 +48,8 @@ describe("parseAccessQrPayload", () => {
       resourceId: "vip-door",
       walletAddress: "0x1234567890123456789012345678901234567890",
       expiresAt: "2026-06-23T12:05:00.000Z",
+      kid: "test-kid",
+      nonce: "fake-nonce",
     });
   });
 
@@ -86,7 +91,7 @@ describe("parseAccessQrPayload", () => {
 
   it("rejects unsupported payload versions with QR_PAYLOAD_UNSUPPORTED_VERSION code and update suggestion", () => {
     try {
-      parseAccessQrPayload(buildPayload({ version: 2 }), now);
+      parseAccessQrPayload(buildPayload({ version: 1 }), now);
       expect.fail("Should have thrown QrPayloadError");
     } catch (e) {
       expect(e).toBeInstanceOf(QrPayloadError);
@@ -97,9 +102,9 @@ describe("parseAccessQrPayload", () => {
     }
   });
 
-  it("distinguishes version: 2 from unknown type values by error code", () => {
+  it("distinguishes version: 1 from unknown type values by error code", () => {
     try {
-      parseAccessQrPayload(buildPayload({ version: 2 }), now);
+      parseAccessQrPayload(buildPayload({ version: 1 }), now);
       expect.fail("Should have thrown");
     } catch (e) {
       expect((e as QrPayloadError).code).toBe(QR_PAYLOAD_ERROR_CODES.UNSUPPORTED_VERSION);
@@ -113,7 +118,7 @@ describe("parseAccessQrPayload", () => {
     }
 
     try {
-      parseAccessQrPayload(buildPayload({ type: "unknown.type", version: 2 }), now);
+      parseAccessQrPayload(buildPayload({ type: "unknown.type", version: 1 }), now);
       expect.fail("Should have thrown");
     } catch (e) {
       expect((e as QrPayloadError).code).toBe(QR_PAYLOAD_ERROR_CODES.UNSUPPORTED_TYPE);
@@ -139,6 +144,8 @@ describe("parseAccessQrPayload", () => {
       guildId: "guild_abc",
       resourceId: "vip-door",
       expiresAt: "2026-06-23T12:05:00.000Z",
+      kid: "test-kid",
+      nonce: "fake-nonce",
     });
   });
 
diff --git a/tests/accessScanner.test.tsx b/tests/accessScanner.test.tsx
index 4fdd321..0ff62c3 100644
--- a/tests/accessScanner.test.tsx
+++ b/tests/accessScanner.test.tsx
@@ -145,6 +145,11 @@ describe("AccessScanner", () => {
     vi.clearAllMocks();
     useAccessHistoryStore.setState({ entries: [] });
     cameraViewMock.mockImplementation(() => null);
+    vi.useFakeTimers();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
   });
 
   it("shows loading state while checking permission", () => {
@@ -164,7 +169,7 @@ describe("AccessScanner", () => {
 
     const output = screenText(renderer);
     expect(output).toContain("Allow Camera Access");
-    expect(output).toContain("Camera access needed");
+    expect(output).toContain("Camera permission denied");
     expect(output).toContain("accessibilityRole");
   });
 
@@ -174,7 +179,7 @@ describe("AccessScanner", () => {
     const renderer = TestRenderer.create(<AccessScanner />);
 
     expect(screenText(renderer)).toContain(
-      "Enable camera access in your device settings to scan QR codes.",
+      "Camera permission was permanently denied. Open Settings to enable camera access for GuildPass to scan QR codes.",
     );
   });
 
@@ -194,13 +199,13 @@ describe("AccessScanner", () => {
   it("announces processing and success during a valid scan", async () => {
     mockCameraPermission(createPermissionResponse(true, true));
     verifyAndParseAccessQrPayloadMock.mockResolvedValue({
-      success: true,
       payload: {
         guildId: "guild-alpha",
         resourceId: "vip-door",
         walletAddress: "0xabc",
         expiresAt: "2099-01-01T00:00:00.000Z",
-      }
+      },
+      isVerified: true
     });
 
     TestRenderer.create(<AccessScanner />);
@@ -225,7 +230,7 @@ describe("AccessScanner", () => {
 
   it("marks scan errors as assertive live-region alerts", async () => {
     mockCameraPermission(createPermissionResponse(true, true));
-    verifyAndParseAccessQrPayloadMock.mockResolvedValue({ success: false, reason: "UNKNOWN_ERROR", message: "forged" });
+    verifyAndParseAccessQrPayloadMock.mockRejectedValue(new Error("forged"));
 
     const renderer = TestRenderer.create(<AccessScanner />);
 
@@ -258,13 +263,13 @@ describe("AccessScanner", () => {
   it("verifies a valid scan and navigates to the access-check screen", async () => {
     mockCameraPermission(createPermissionResponse(true, true));
     verifyAndParseAccessQrPayloadMock.mockResolvedValue({
-      success: true,
       payload: {
         guildId: "guild-alpha",
         resourceId: "vip-door",
         walletAddress: "0xabc",
         expiresAt: "2099-01-01T00:00:00.000Z",
-      }
+      },
+      isVerified: true
     });
 
     TestRenderer.create(<AccessScanner />);
@@ -279,6 +284,10 @@ describe("AccessScanner", () => {
       await cameraProps.onBarcodeScanned?.({ data: "payload" });
     });
 
+    act(() => {
+      vi.runAllTimers();
+    });
+
     expect(verifyAndParseAccessQrPayloadMock).toHaveBeenCalledWith("payload");
     expect(routerMocks.replace).toHaveBeenCalledWith({
       pathname: "/access-check",
@@ -321,6 +330,10 @@ describe("AccessScanner", () => {
       await firstScanPromise;
     });
 
+    act(() => {
+      vi.runAllTimers();
+    });
+
     expect(routerMocks.replace).toHaveBeenCalledTimes(1);
     expect(routerMocks.replace).toHaveBeenCalledWith({
       pathname: "/access-check",
@@ -343,7 +356,7 @@ describe("AccessScanner", () => {
     ],
   ])("shows a specific signature error message for %s", async (code, expectedMessage) => {
     mockCameraPermission(createPermissionResponse(true, true));
-    verifyAndParseAccessQrPayloadMock.mockResolvedValueOnce({ success: false, reason: code });
+    verifyAndParseAccessQrPayloadMock.mockRejectedValueOnce(new QrSignatureErrorMock(code));
 
     const renderer = TestRenderer.create(<AccessScanner />);
 
@@ -367,11 +380,7 @@ describe("AccessScanner", () => {
 
   it("shows a safe rejection message for invalid or forged QR payloads", async () => {
     mockCameraPermission(createPermissionResponse(true, true));
-    verifyAndParseAccessQrPayloadMock.mockResolvedValue({
-      success: false,
-      reason: "UNKNOWN_ERROR",
-      message: "Authorization: Bearer secret-token"
-    });
+    verifyAndParseAccessQrPayloadMock.mockRejectedValue(new Error("Authorization: Bearer secret-token"));
 
     const renderer = TestRenderer.create(<AccessScanner />);
 
@@ -396,15 +405,15 @@ describe("AccessScanner", () => {
   it("restores scanning after an error", async () => {
     mockCameraPermission(createPermissionResponse(true, true));
     verifyAndParseAccessQrPayloadMock
-      .mockResolvedValueOnce({ success: false, reason: "UNKNOWN_ERROR", message: "forged" })
+      .mockRejectedValueOnce(new Error("forged"))
       .mockResolvedValueOnce({
-        success: true,
         payload: {
           guildId: "guild-alpha",
           resourceId: "vip-door",
           walletAddress: "0xabc",
           expiresAt: "2099-01-01T00:00:00.000Z",
-        }
+        },
+        isVerified: true
       });
 
     const renderer = TestRenderer.create(<AccessScanner />);
@@ -433,6 +442,10 @@ describe("AccessScanner", () => {
       await cameraProps.onBarcodeScanned?.({ data: "good" });
     });
 
+    act(() => {
+      vi.runAllTimers();
+    });
+
     expect(routerMocks.replace).toHaveBeenCalledWith({
       pathname: "/access-check",
       params: { qrPayload: "good" },
@@ -442,15 +455,15 @@ describe("AccessScanner", () => {
   it("automatically re-arms the scanner guard after a scan error", async () => {
     mockCameraPermission(createPermissionResponse(true, true));
     verifyAndParseAccessQrPayloadMock
-      .mockResolvedValueOnce({ success: false, reason: "UNKNOWN_ERROR", message: "first error" })
+      .mockRejectedValueOnce(new Error("first error"))
       .mockResolvedValueOnce({
-        success: true,
         payload: {
           guildId: "guild-alpha",
           resourceId: "vip-door",
           walletAddress: "0xabc",
           expiresAt: "2099-01-01T00:00:00.000Z",
-        }
+        },
+        isVerified: true
       });
 
     TestRenderer.create(<AccessScanner />);
@@ -471,6 +484,10 @@ describe("AccessScanner", () => {
       await getCameraProps().onBarcodeScanned?.({ data: "good" });
     });
 
+    act(() => {
+      vi.runAllTimers();
+    });
+
     expect(routerMocks.replace).toHaveBeenCalledWith({
       pathname: "/access-check",
       params: { qrPayload: "good" },
diff --git a/tests/qrKeyRotation.test.ts b/tests/qrKeyRotation.test.ts
index 8c00686..f24d942 100644
--- a/tests/qrKeyRotation.test.ts
+++ b/tests/qrKeyRotation.test.ts
@@ -139,10 +139,9 @@ describe("QR Key Rotation & Revocation Protocol", () => {
       const revokedFields = { ...validFields, kid: "key-revoked-99" };
       const revokedPayload = buildSignedQrPayloadString(revokedFields, TEST_REVOKED_PRIVATE_KEY);
 
-      await expect(verifyAndParseAccessQrPayload(revokedPayload, now)).resolves.toMatchObject({
-        success: false,
-        reason: QR_SIGNATURE_ERROR_CODES.REVOKED_KEY,
-      });
+      await expect(verifyAndParseAccessQrPayload(revokedPayload, now)).rejects.toThrow(
+        expect.objectContaining({ code: QR_SIGNATURE_ERROR_CODES.REVOKED_KEY })
+      );
     });
 
     it("rejects a revoked kid when marked as status 'revoked' in issuerKeys array", async () => {
@@ -159,10 +158,9 @@ describe("QR Key Rotation & Revocation Protocol", () => {
         TEST_REVOKED_PRIVATE_KEY,
       );
 
-      await expect(verifyAndParseAccessQrPayload(payload, now)).resolves.toMatchObject({
-        success: false,
-        reason: QR_SIGNATURE_ERROR_CODES.REVOKED_KEY,
-      });
+      await expect(verifyAndParseAccessQrPayload(payload, now)).rejects.toThrow(
+        expect.objectContaining({ code: QR_SIGNATURE_ERROR_CODES.REVOKED_KEY })
+      );
     });
   });
 
@@ -180,10 +178,9 @@ describe("QR Key Rotation & Revocation Protocol", () => {
         TEST_ISSUER_PRIVATE_KEY,
       );
 
-      await expect(verifyAndParseAccessQrPayload(unknownPayload, now)).resolves.toMatchObject({
-        success: false,
-        reason: QR_SIGNATURE_ERROR_CODES.UNKNOWN_KEY,
-      });
+      await expect(verifyAndParseAccessQrPayload(unknownPayload, now)).rejects.toThrow(
+        expect.objectContaining({ code: QR_SIGNATURE_ERROR_CODES.UNKNOWN_KEY })
+      );
     });
 
     it("rejects payload with invalid non-string kid format at structural layer", async () => {
@@ -197,10 +194,9 @@ describe("QR Key Rotation & Revocation Protocol", () => {
         kid: "", // empty kid string
       });
 
-      await expect(verifyAndParseAccessQrPayload(malformedKidPayload, now)).resolves.toMatchObject({
-        success: false,
-        reason: QR_PAYLOAD_ERROR_CODES.INVALID_KID,
-      });
+      await expect(verifyAndParseAccessQrPayload(malformedKidPayload, now)).rejects.toThrow(
+        expect.objectContaining({ code: QR_PAYLOAD_ERROR_CODES.INVALID_KID })
+      );
     });
   });
 
@@ -376,10 +372,9 @@ describe("QR Key Rotation & Revocation Protocol", () => {
         TEST_ISSUER_PRIVATE_KEY,
       );
 
-      await expect(verifyAndParseAccessQrPayload(payload, now)).resolves.toMatchObject({
-        success: false,
-        reason: QR_SIGNATURE_ERROR_CODES.PUBLIC_KEY_UNAVAILABLE,
-      });
+      await expect(verifyAndParseAccessQrPayload(payload, now)).rejects.toThrow(
+        expect.objectContaining({ code: QR_SIGNATURE_ERROR_CODES.PUBLIC_KEY_UNAVAILABLE })
+      );
     });
   });
 });
diff --git a/tests/verifyAndParseQrPayload.test.ts b/tests/verifyAndParseQrPayload.test.ts
index 88e4e2b..a4eaba9 100644
--- a/tests/verifyAndParseQrPayload.test.ts
+++ b/tests/verifyAndParseQrPayload.test.ts
@@ -103,10 +103,9 @@ describe("verifyAndParseAccessQrPayload", () => {
     const signed = JSON.parse(buildSignedQrPayloadString(validFields)) as Record<string, unknown>;
     signed.resourceId = "evil-door";
     const tampered = JSON.stringify(signed);
-    await expect(verifyAndParseAccessQrPayload(tampered, now)).resolves.toMatchObject({
-      success: false,
-      reason: "QR_SIGNATURE_VERIFICATION_FAILED",
-    });
+    await expect(verifyAndParseAccessQrPayload(tampered, now)).rejects.toThrow(
+      expect.objectContaining({ code: "QR_SIGNATURE_VERIFICATION_FAILED" })
+    );
   });
 
   it("accepts a payload with a nonce seen for the first time", async () => {