05/16 Fix bugs 2

JanitorialQC/API/APIClient.swift

@@ -41,13 +41,30 @@ private struct _Envelope<T: Decodable & Sendable>: Decodable, Sendable {
 // local JSONDecoder to avoid Swift 6 actor-isolation errors.
 
 // Refresh-only envelope — Sendable so it can cross actor boundaries in Swift 6.
+// nonisolated init(from:) required on both types: without it the Swift 6 compiler
+// infers @MainActor isolation on the Decodable conformance from the surrounding
+// file context, producing "cannot be used in actor-isolated context" errors.
 private struct _RefreshEnvelope: Decodable, Sendable {
     struct Tokens: Decodable, Sendable {
         let accessToken: String
         let refreshToken: String
+
+        nonisolated init(from decoder: any Decoder) throws {
+            let c = try decoder.container(keyedBy: CodingKeys.self)
+            accessToken  = try c.decode(String.self, forKey: .accessToken)
+            refreshToken = try c.decode(String.self, forKey: .refreshToken)
+        }
+        private enum CodingKeys: String, CodingKey { case accessToken, refreshToken }
     }
     let ok: Bool
     let data: Tokens?
+
+    nonisolated init(from decoder: any Decoder) throws {
+        let c = try decoder.container(keyedBy: CodingKeys.self)
+        ok   = try  c.decode(Bool.self,    forKey: .ok)
+        data = try? c.decode(Tokens.self,  forKey: .data)
+    }
+    private enum CodingKeys: String, CodingKey { case ok, data }
 }
 
 actor APIClient {
@@ -107,7 +124,7 @@ actor APIClient {
 
     // ── Photo Upload ──────────────────────────────────────────────────────
 
-    func uploadPhoto(localPath: String, entityType: String) async throws -> String {
+    func uploadPhoto(localPath: String, entityType: String, retrying: Bool = false) async throws -> String {
         let url = try buildURL("/api/v1/photos/upload")
 
         guard let imageData = FileManager.default.contents(atPath: localPath) else {
@@ -133,9 +150,9 @@ actor APIClient {
 
         let (data, response) = try await performRequest(req)
 
-        if shouldRefresh(response, retrying: false) {
+        if shouldRefresh(response, retrying: retrying) {
             let refreshed = await refreshAccessToken()
-            if refreshed { return try await uploadPhoto(localPath: localPath, entityType: entityType) }
+            if refreshed { return try await uploadPhoto(localPath: localPath, entityType: entityType, retrying: true) }
             throw APIError.notAuthenticated
         }