0.40.0

dankinsoid · Mar 10, 2024 · 14b7138 · 14b7138
1 parent fd7b907
commit 14b7138
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 30 deletions.
diff --git a/Example/Sources/PetStore/PetStore.swift b/Example/Sources/PetStore/PetStore.swift
@@ -7,16 +7,16 @@ public struct PetStore {
 
 	var client: APIClient
 
-    public init(baseURL: BaseURL, fileID: String, line: UInt) {
-        client = APIClient(baseURL: baseURL.url)
-            .fileIDLine(fileID: fileID, line: line)
-            .bodyDecoder(PetStoreDecoder())
-            .tokenRefresher { client, _ in
-                try await client.path("token").post()
-            } auth: {
-                .bearer(token: $0)
-            }
-    }
+	public init(baseURL: BaseURL, fileID: String, line: UInt) {
+		client = APIClient(baseURL: baseURL.url)
+			.fileIDLine(fileID: fileID, line: line)
+			.bodyDecoder(PetStoreDecoder())
+			.tokenRefresher { client, _ in
+				try await client.path("token").post()
+			} auth: {
+				.bearer(token: $0)
+			}
+	}
 }
 
 // MARK: - "pet" path

diff --git a/README.md b/README.md
@@ -232,7 +232,7 @@ import PackageDescription
 let package = Package(
   name: "SomeProject",
   dependencies: [
-    .package(url: "https://github.com/dankinsoid/swift-api-client.git", from: "0.39.0")
+    .package(url: "https://github.com/dankinsoid/swift-api-client.git", from: "0.40.0")
   ],
   targets: [
     .target(

diff --git a/Sources/SwiftAPIClient/APIClientConfigs.swift b/Sources/SwiftAPIClient/APIClientConfigs.swift
@@ -12,8 +12,7 @@ public extension APIClient {
 		private var values: [PartialKeyPath<APIClient.Configs>: Any] = [:]
 
 		/// Initializes a new configuration set for `APIClient`.
-		public init() {
-		}
+		public init() {}
 
 		/// Provides subscript access to configuration values based on their key paths.
 		/// - Parameter keyPath: A `WritableKeyPath` to the configuration property.

diff --git a/Sources/SwiftAPIClient/Modifiers/TokenRefresher/TokenRefresher.swift b/Sources/SwiftAPIClient/Modifiers/TokenRefresher/TokenRefresher.swift
@@ -3,7 +3,7 @@ import Foundation
 public extension HTTPClientMiddleware where Self == TokenRefresherMiddleware {
 
 	static func tokenRefresher(
-        cacheService: TokenCacheService = valueFor(live: .keychain, test: .mock),
+		cacheService: TokenCacheService = valueFor(live: .keychain, test: .mock),
 		expiredStatusCodes: Set<HTTPStatusCode> = [.unauthorized],
 		refreshToken: @escaping (APIClient.Configs) async throws -> String,
 		auth: @escaping (String) -> AuthModifier
@@ -17,23 +17,23 @@ public extension HTTPClientMiddleware where Self == TokenRefresherMiddleware {
 	}
 }
 
-extension APIClient {
+public extension APIClient {
 
-    public func tokenRefresher(
-        cacheService: TokenCacheService = valueFor(live: .keychain, test: .mock),
-        expiredStatusCodes: Set<HTTPStatusCode> = [.unauthorized],
-        refreshToken: @escaping (APIClient, APIClient.Configs) async throws -> String,
-        auth: @escaping (String) -> AuthModifier
-    ) -> Self {
-        httpClientMiddleware(
-            TokenRefresherMiddleware(
-                cacheService: cacheService,
-                expiredStatusCodes: expiredStatusCodes,
-                refreshToken: { try await refreshToken(self, $0) },
-                auth: auth
-            )
-        )
-    }
+	func tokenRefresher(
+		cacheService: TokenCacheService = valueFor(live: .keychain, test: .mock),
+		expiredStatusCodes: Set<HTTPStatusCode> = [.unauthorized],
+		refreshToken: @escaping (APIClient, APIClient.Configs) async throws -> String,
+		auth: @escaping (String) -> AuthModifier
+	) -> Self {
+		httpClientMiddleware(
+			TokenRefresherMiddleware(
+				cacheService: cacheService,
+				expiredStatusCodes: expiredStatusCodes,
+				refreshToken: { try await refreshToken(self, $0) },
+				auth: auth
+			)
+		)
+	}
 }
 
 public struct TokenRefresherMiddleware: HTTPClientMiddleware {