fix: Avoid type confusion

Infomaniak · Jan 30, 2025 · 8c69cbe · 8c69cbe
1 parent 4ab178e
commit 8c69cbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/Sources/InfomaniakCore/Networking/AbstractNetworkRequest.swift b/Sources/InfomaniakCore/Networking/AbstractNetworkRequest.swift
@@ -19,12 +19,9 @@
 import Alamofire
 import Foundation
 
-/// Wrapping HTTP POST and GET parameters in this type
-public typealias Parameters = [String: any Encodable & Sendable]
-
 /// Wrapping the body of an HTTP Request with common types
 public enum RequestBody {
-    case POSTParameters(Parameters)
+    case POSTParameters(EncodableParameters)
     case requestBody(Data)
 }
 
@@ -34,7 +31,7 @@ public protocol Requestable {
 
     var route: Endpoint { get set }
 
-    var GETParameters: Parameters? { get set }
+    var GETParameters: EncodableParameters? { get set }
 
     var body: RequestBody? { get set }
 }
@@ -75,7 +72,7 @@ struct BodyDataEncoding: ParameterEncoding {
 }
 
 public struct Request: Requestable {
-    public init(method: Method, route: InfomaniakCore.Endpoint, GETParameters: Parameters?, body: RequestBody?) {
+    public init(method: Method, route: InfomaniakCore.Endpoint, GETParameters: EncodableParameters?, body: RequestBody?) {
         self.method = method
         self.route = route
         self.GETParameters = GETParameters
@@ -86,7 +83,7 @@ public struct Request: Requestable {
 
     public var route: InfomaniakCore.Endpoint
 
-    public var GETParameters: Parameters?
+    public var GETParameters: EncodableParameters?
 
     public var body: RequestBody?
 }

diff --git a/Sources/InfomaniakCore/Networking/ApiFetcher.swift b/Sources/InfomaniakCore/Networking/ApiFetcher.swift
@@ -22,6 +22,8 @@ import InfomaniakDI
 import InfomaniakLogin
 import Sentry
 
+public typealias EncodableParameters = [String: any Encodable & Sendable]
+
 public protocol RefreshTokenDelegate: AnyObject {
     func didUpdateToken(newToken: ApiToken, oldToken: ApiToken)
     func didFailRefreshToken(_ token: ApiToken)
@@ -135,7 +137,7 @@ open class ApiFetcher {
 
     public func authenticatedRequest(_ endpoint: Endpoint,
                                      method: HTTPMethod = .get,
-                                     parameters: [String: Encodable]? = nil,
+                                     parameters: EncodableParameters? = nil,
                                      overrideEncoder: ParameterEncoder? = nil,
                                      headers: HTTPHeaders? = nil,
                                      requestModifier: RequestModifier? = nil) -> DataRequest {