Merge pull request #15 from AppcentMobile/feature/auth-header_improvements

🎷 [FEATURE] Auth header improvements.

Author: burakcolakappcent

Sources/ACMNetworking/Library/Extensions/ACMNetworking+Extensions.swift

@@ -25,7 +25,7 @@ extension ACMNetworking {
             ACMBaseLogger.info(info)
         }
 
-        if let authHeader = endpoint.authHeader, authHeader.count > 0 {
+        if let authHeader = endpoint.authHeader {
             let info = ACMStringUtils.shared.merge(list: [
                 ACMNetworkConstants.httpAuthHeadersMessage,
                 "\(authHeader)",

Sources/ACMNetworking/Library/Manager/ACMBaseEndpoint.swift

@@ -57,7 +57,7 @@ public struct ACMBaseEndpoint {
 
     // MARK: Auth header
 
-    var authHeader: String?
+    var authHeader: ACMAuthModel?
 
     // MARK: Retry count
 
@@ -79,7 +79,7 @@ public struct ACMBaseEndpoint {
         urlRequest.httpMethod = method.rawValue
 
         if let header = authHeader {
-            urlRequest.setValue(header, forHTTPHeaderField: ACMNetworkConstants.headerAuthorization)
+            urlRequest.setValue(header.rawHeader, forHTTPHeaderField: ACMNetworkConstants.headerAuthorization)
         }
 
         if let basicHeaders = headers {
@@ -110,7 +110,7 @@ public struct ACMBaseEndpoint {
         return URLSession(configuration: configuration, delegate: delegate, delegateQueue: OperationQueue.main)
     }
 
-    init(config: ACMPlistModel? = nil, configOverride: Bool, host: String? = nil, scheme: ACMBaseScheme, path: String = "", queryItems: [URLQueryItem]? = nil, params: [String: Any?]? = nil, headers: NSMutableDictionary? = nil, method: ACMBaseMethod, authHeader: String? = nil, mediaData: NSMutableData? = nil, retryCount: Int? = nil) {
+    init(config: ACMPlistModel? = nil, configOverride: Bool, host: String? = nil, scheme: ACMBaseScheme, path: String = "", queryItems: [URLQueryItem]? = nil, params: [String: Any?]? = nil, headers: NSMutableDictionary? = nil, method: ACMBaseMethod, authHeader: ACMAuthModel? = nil, mediaData: NSMutableData? = nil, retryCount: Int? = nil) {
         if let config = config {
             self.config = config
         } else {

Sources/ACMNetworking/Library/Manager/ACMEndpoint.swift

@@ -25,7 +25,7 @@ public final class ACMEndpoint {
     var headers: NSMutableDictionary?
     var headersModel: [ACMHeaderModel]?
     var method: ACMBaseMethod = .get
-    var authHeader: String?
+    var authHeader: ACMAuthModel?
     var mediaData: NSMutableData?
     var retryCount: Int?
 
@@ -154,7 +154,7 @@ public final class ACMEndpoint {
     ///
     /// - Returns
     ///     - Self
-    public func add(authHeader: String) -> Self {
+    public func add(authHeader: ACMAuthModel) -> Self {
         self.authHeader = authHeader
         return self
     }

Sources/ACMNetworking/Library/Models/ACMAuthModel.swift

@@ -0,0 +1,66 @@
+//
+//  ACMAuthModel.swift
+//
+//
+//  Created by burak on 1.04.2023.
+//
+
+/// ACMAuthModel
+///
+/// A struct that holds the body payload
+public struct ACMAuthModel {
+    var type: ACMAuthType
+    var value: Any
+
+    var rawHeader: String {
+        switch type {
+        case .basic:
+            guard let model = value as? ACMBasicAuthModel else { return "" }
+            let header = String(format: "%@:%@", model.user, model.password)
+            guard let data = header.data(using: String.Encoding.utf8) else { return "" }
+            return String(format: "Basic %@", data.base64EncodedString())
+        case .bearer:
+            guard let header = value as? String else { return "" }
+            return String(format: "Bearer %@", header)
+        default:
+            guard let header = value as? String else { return "" }
+            return header
+        }
+    }
+
+    /// Public Init function
+    /// For creating auth header
+    ///    - Parameters:
+    ///      - key: Body payload key
+    ///      - value: Body payload value
+    ///    - Returns
+    ///      - Void
+    public init(type: ACMAuthType, value: Any) {
+        self.type = type
+        self.value = value
+    }
+}
+
+/// ACMAuthType
+///
+/// A struct that holds the authorization types
+public enum ACMAuthType {
+    case basic
+    case bearer
+    case raw
+}
+
+/// ACMBasicAuthModel
+///
+/// A struct that holds the authorization payload
+public struct ACMBasicAuthModel {
+    var user: String
+    var password: String
+}
+
+/// ACMBearerAuthModel
+///
+/// A struct that holds the authorization payload
+public struct ACMBearerAuthModel {
+    var bearer: String
+}