Try to refresh token before each API call

Author: darrarski

Sources/DropboxClient/Client.swift

@@ -29,28 +29,34 @@ extension Client {
     dateGenerator: DateGenerator = .live,
     pkceUtils: PKCEUtils = .live
   ) -> Client {
-    Client(
-      auth: .live(
-        config: config,
-        keychain: keychain,
-        httpClient: httpClient,
-        openURL: openURL,
-        dateGenerator: dateGenerator,
-        pkceUtils: pkceUtils
-      ),
+    let auth = Auth.live(
+      config: config,
+      keychain: keychain,
+      httpClient: httpClient,
+      openURL: openURL,
+      dateGenerator: dateGenerator,
+      pkceUtils: pkceUtils
+    )
+
+    return Client(
+      auth: auth,
       listFolder: .live(
+        auth: auth,
         keychain: keychain,
         httpClient: httpClient
       ),
       downloadFile: .live(
+        auth: auth,
         keychain: keychain,
         httpClient: httpClient
       ),
       deleteFile: .live(
+        auth: auth,
         keychain: keychain,
         httpClient: httpClient
       ),
       uploadFile: .live(
+        auth: auth,
         keychain: keychain,
         httpClient: httpClient
       )

Sources/DropboxClient/DeleteFile.swift

@@ -41,10 +41,13 @@ public struct DeleteFile: Sendable {
 
 extension DeleteFile {
   public static func live(
+    auth: Auth,
     keychain: Keychain,
     httpClient: HTTPClient
   ) -> DeleteFile {
     DeleteFile { params in
+      try await auth.refreshToken()
+
       guard let credentials = await keychain.loadCredentials() else {
         throw Error.notAuthorized
       }

Sources/DropboxClient/DownloadFile.swift

@@ -33,10 +33,13 @@ public struct DownloadFile: Sendable {
 
 extension DownloadFile {
   public static func live(
+    auth: Auth,
     keychain: Keychain,
     httpClient: HTTPClient
   ) -> DownloadFile {
     DownloadFile { params in
+      try await auth.refreshToken()
+
       guard let credentials = await keychain.loadCredentials() else {
         throw Error.notAuthorized
       }

Sources/DropboxClient/ListFolder.swift

@@ -71,10 +71,13 @@ public struct ListFolder: Sendable {
 
 extension ListFolder {
   public static func live(
+    auth: Auth,
     keychain: Keychain,
     httpClient: HTTPClient
   ) -> ListFolder {
     ListFolder { params in
+      try await auth.refreshToken()
+
       guard let credentials = await keychain.loadCredentials() else {
         throw Error.notAuthorized
       }

Sources/DropboxClient/UploadFile.swift

@@ -58,10 +58,13 @@ public struct UploadFile: Sendable {
 
 extension UploadFile {
   public static func live(
+    auth: Auth,
     keychain: Keychain,
     httpClient: HTTPClient
   ) -> UploadFile {
     UploadFile { params in
+      try await auth.refreshToken()
+
       guard let credentials = await keychain.loadCredentials() else {
         throw Error.notAuthorized
       }

Tests/DropboxClientTests/DeleteFileTests.swift

@@ -5,8 +5,16 @@ final class DeleteFileTests: XCTestCase {
   func testDeleteFile() async throws {
     let params = DeleteFile.Params(path: "/Prime_Numbers.txt")
     let credentials = Credentials.test
+    let didRefreshToken = ActorIsolated(0)
     let httpRequests = ActorIsolated<[URLRequest]>([])
     let deleteFile = DeleteFile.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {
+          await didRefreshToken.withValue { $0 += 1 }
+        }
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { credentials }
@@ -41,6 +49,9 @@ final class DeleteFileTests: XCTestCase {
 
     let result = try await deleteFile(params)
 
+    await didRefreshToken.withValue {
+      XCTAssertEqual($0, 1)
+    }
     try await httpRequests.withValue {
       let url = URL(string: "https://api.dropboxapi.com/2/files/delete_v2")!
       var expectedRequest = URLRequest(url: url)
@@ -80,6 +91,11 @@ final class DeleteFileTests: XCTestCase {
 
   func testDeleteFileErrorResponse() async {
     let deleteFile = DeleteFile.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {}
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { .test }
@@ -115,6 +131,11 @@ final class DeleteFileTests: XCTestCase {
 
   func testDeleteFileWhenNotAuthorized() async {
     let deleteFile = DeleteFile.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {}
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { nil }

Tests/DropboxClientTests/DownloadFileTests.swift

@@ -4,8 +4,16 @@ import XCTest
 final class DownloadFileTests: XCTestCase {
   func testDownloadFile() async throws {
     let credentials = Credentials.test
+    let didRefreshToken = ActorIsolated(0)
     let httpRequests = ActorIsolated<[URLRequest]>([])
     let downloadFile = DownloadFile.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {
+          await didRefreshToken.withValue { $0 += 1 }
+        }
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { credentials }
@@ -28,6 +36,9 @@ final class DownloadFileTests: XCTestCase {
 
     let result = try await downloadFile(params)
 
+    await didRefreshToken.withValue {
+      XCTAssertEqual($0, 1)
+    }
     await httpRequests.withValue {
       let expectedRequest: URLRequest = {
         let url = URL(string: "https://content.dropboxapi.com/2/files/download")!
@@ -51,6 +62,11 @@ final class DownloadFileTests: XCTestCase {
 
   func testDownloadFileWhenNotAuthorized() async {
     let downloadFile = DownloadFile.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {}
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { nil }
@@ -72,6 +88,11 @@ final class DownloadFileTests: XCTestCase {
 
   func testDownloadFileErrorResponse() async {
     let downloadFile = DownloadFile.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {}
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { .test }

Tests/DropboxClientTests/ListFolderTests.swift

@@ -4,8 +4,16 @@ import XCTest
 final class ListFolderTests: XCTestCase {
   func testListFolder() async throws {
     let credentials = Credentials.test
+    let didRefreshToken = ActorIsolated(0)
     let httpRequests = ActorIsolated<[URLRequest]>([])
     let listFolder = ListFolder.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {
+          await didRefreshToken.withValue { $0 += 1 }
+        }
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { credentials }
@@ -51,6 +59,9 @@ final class ListFolderTests: XCTestCase {
 
     let result = try await listFolder(params)
 
+    await didRefreshToken.withValue {
+      XCTAssertEqual($0, 1)
+    }
     await httpRequests.withValue {
       let expectedRequest: URLRequest = {
         let url = URL(string: "https://api.dropboxapi.com/2/files/list_folder")!
@@ -97,6 +108,11 @@ final class ListFolderTests: XCTestCase {
 
   func testListFolderWhenNotAuthorized() async {
     let listFolder = ListFolder.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {}
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { nil }
@@ -118,6 +134,11 @@ final class ListFolderTests: XCTestCase {
 
   func testListFolderErrorResponse() async {
     let listFolder = ListFolder.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {}
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { .test }

Tests/DropboxClientTests/TestHelpers.swift

@@ -96,3 +96,35 @@ extension PKCEUtils {
     )
   }
 }
+
+extension Auth {
+  static func unimplemented(
+    file: StaticString = #filePath,
+    line: UInt = #line
+  ) -> Auth {
+    Auth(
+      isSignedIn: {
+        XCTFail("Unimplemented: \(Self.self).isSignedIn", file: file, line: line)
+        return false
+      },
+      isSignedInStream: {
+        XCTFail("Unimplemented: \(Self.self).isSignedInStream", file: file, line: line)
+        return AsyncStream { nil }
+      },
+      signIn: {
+        XCTFail("Unimplemented: \(Self.self).signIn", file: file, line: line)
+      },
+      handleRedirect: { _ in
+        XCTFail("Unimplemented: \(Self.self).handleRedirect", file: file, line: line)
+        throw UnimplementedError()
+      },
+      refreshToken: {
+        XCTFail("Unimplemented: \(Self.self).refreshToken", file: file, line: line)
+        throw UnimplementedError()
+      },
+      signOut: {
+        XCTFail("Unimplemented: \(Self.self).signOut", file: file, line: line)
+      }
+    )
+  }
+}

Tests/DropboxClientTests/UploadFileTests.swift

@@ -10,8 +10,16 @@ final class UploadFileTests: XCTestCase {
       autorename: true
     )
     let credentials = Credentials.test
+    let didRefreshToken = ActorIsolated(0)
     let httpRequests = ActorIsolated<[URLRequest]>([])
     let uploadFile = UploadFile.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {
+          await didRefreshToken.withValue { $0 += 1 }
+        }
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { credentials }
@@ -43,6 +51,9 @@ final class UploadFileTests: XCTestCase {
 
     let result = try await uploadFile(params)
 
+    await didRefreshToken.withValue {
+      XCTAssertEqual($0, 1)
+    }
     try await httpRequests.withValue {
       let url = URL(string: "https://content.dropboxapi.com/2/files/upload")!
       var expectedRequest = URLRequest(url: url)
@@ -92,6 +103,11 @@ final class UploadFileTests: XCTestCase {
 
   func testUploadFileErrorResponse() async {
     let uploadFile = UploadFile.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {}
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { .test }
@@ -127,6 +143,11 @@ final class UploadFileTests: XCTestCase {
 
   func testUploadFileWhenNotAuthorized() async {
     let uploadFile = UploadFile.live(
+      auth: {
+        var auth = Auth.unimplemented()
+        auth.refreshToken = {}
+        return auth
+      }(),
       keychain: {
         var keychain = Keychain.unimplemented()
         keychain.loadCredentials = { nil }