feat(swift5): use Basic auth instead of Bearer

Author: ThibaultBee

.openapi-generator/FILES

@@ -7,9 +7,6 @@ Sources/APIHelper.swift
 Sources/APIs.swift
 Sources/APIs/AuthenticationAPI.swift
 Sources/APIs/VideosAPI.swift
-Sources/AlamofireImplementations.swift
-Sources/Auth/ApiVideoAuthenticator.swift
-Sources/Auth/ApiVideoCredential.swift
 Sources/CodableHelper.swift
 Sources/Configuration.swift
 Sources/Extensions.swift
@@ -30,6 +27,7 @@ Sources/Models/VideoSourceLiveStream.swift
 Sources/Models/VideoSourceLiveStreamLink.swift
 Sources/OpenISO8601DateFormatter.swift
 Sources/SynchronizedDictionary.swift
+Sources/URLSessionImplementations.swift
 Sources/Upload/FileChunkInputStream.swift
 Sources/Upload/ProgressiveUploadSessionProtocol.swift
 Sources/Upload/RequestTaskQueue.swift

ApiVideoUploader.podspec

@@ -1,8 +1,8 @@
 Pod::Spec.new do |s|
   s.name = 'ApiVideoUploader'
-  s.ios.deployment_target = '10.0'
-  s.osx.deployment_target = '10.12'
-  s.tvos.deployment_target = '10.0'
+  s.ios.deployment_target = '9.0'
+  s.osx.deployment_target = '10.11'
+  s.tvos.deployment_target = '9.0'
   # Add back when CocoaPods/CocoaPods#11558 is released
   #s.watchos.deployment_target = '3.0'
   s.version = '1.1.1'
@@ -13,5 +13,4 @@ Pod::Spec.new do |s|
   s.summary = 'The official iOS video uploader for api.video '
   s.source_files = 'Sources/**/*.swift'
   s.dependency 'AnyCodable-FlightSchool', '~> 0.6.1'
-  s.dependency 'Alamofire', '~> 5.4.3'
 end

Cartfile

@@ -1,2 +1 @@
 github "Flight-School/AnyCodable" ~> 0.6.1
-github "Alamofire/Alamofire" ~> 5.4.3

Package.swift

@@ -5,9 +5,9 @@ import PackageDescription
 let package = Package(
     name: "ApiVideoUploader",
     platforms: [
-        .iOS(.v10),
-        .macOS(.v10_12),
-        .tvOS(.v10),
+        .iOS(.v9),
+        .macOS(.v10_11),
+        .tvOS(.v9),
         .watchOS(.v3),
     ],
     products: [
@@ -20,14 +20,13 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         .package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
-        .package(url: "https://github.com/Alamofire/Alamofire", from: "5.4.3"),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "ApiVideoUploader",
-            dependencies: ["AnyCodable", "Alamofire", ],
+            dependencies: ["AnyCodable", ],
             path: "Sources"
         ),
         // Targets for tests

README.md

@@ -60,7 +60,7 @@ import ApiVideoUploader
     // If you rather like to use the sandbox environment:
     // ApiVideoUploader.basePath = Environment.sandbox.rawValue
     // If you rather like to upload with your "YOUR_API_KEY" (upload)
-    // ApiVideoUploader.apiKey = "YOUR_API_KEY"
+    // ApiVideoUploader.setApiKey("YOUR_API_KEY")
 
     try VideosAPI.uploadWithUploadToken(token: "MY_VIDEO_TOKEN", file: url) { video, error in
         if let video = video {
@@ -119,7 +119,7 @@ Method | HTTP request | Description
 Most endpoints required to be authenticated using the API key mechanism described in our [documentation](https://docs.api.video/reference#authentication).
 The access token generation mechanism is automatically handled by the client. All you have to do is provide an API key:
 ```swift
-ApiVideoUploader.apiKey = YOUR_API_KEY
+ApiVideoUploader.setApiKey(YOUR_API_KEY)
 ```
 
 ### Public endpoints

Sources/APIs.swift

@@ -6,16 +6,31 @@
 
 import Foundation
 public class ApiVideoUploader {
-    public static var apiKey: String? = nil
+    private static var apiKey: String? = nil
     public static var basePath = "https://ws.api.video"
-    internal static var customHeaders:[String: String] = ["AV-Origin-Client": "ios-uploader:1.1.1"]
+    internal static var defaultHeaders:[String: String] = ["AV-Origin-Client": "ios-uploader:1.1.1"]
+    internal static var credential: URLCredential?
     private static var chunkSize: Int = 50 * 1024 * 1024
-    internal static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
-    internal static var credential = ApiVideoCredential()
+    internal static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory()
     public static var apiResponseQueue: DispatchQueue = .main
     public static var timeout: TimeInterval = 60
+    internal static var customHeaders:[String: String] {
+        var headers = defaultHeaders
+        if let apiKey = apiKey {
+            headers["Authorization"] = apiKey
+        }
+        return headers
+    }
+
+    public static func setApiKey(_ apiKey: String?) {
+        if let apiKey = apiKey {
+            self.apiKey = "Basic " + "\(apiKey):".toBase64()
+        } else {
+            self.apiKey = nil
+        }
+    }
 
-    public static func setChunkSize(chunkSize: Int) throws {
+    public static func setChunkSize(_ chunkSize: Int) throws {
         if (chunkSize > 128 * 1024 * 1024) {
             throw ParameterError.outOfRange
         } else if (chunkSize < 5 * 1024 * 1024) {
@@ -40,25 +55,25 @@ public class ApiVideoUploader {
         }
     }
 
-    static func isValidVersion(version: String) -> Bool {
+    static func isValidVersion(_ version: String) -> Bool {
         let pattern = #"^\d{1,3}(\.\d{1,3}(\.\d{1,3})?)?$"#
         return isValid(pattern: pattern, field: version)
     }
 
-    static func isValidName(name: String) -> Bool {
+    static func isValidName(_ name: String) -> Bool {
         let pattern = #"^[\w\-]{1,50}$"#
         return isValid(pattern: pattern, field: name)
     }
 
     static func setName(key: String, name: String, version: String) throws {
-        if(!isValidName(name: name)) {
+        if(!isValidName(name)) {
             throw ParameterError.invalidName
         }
 
-        if(!isValidVersion(version: version)) {
+        if(!isValidVersion(version)) {
             throw ParameterError.invalidVersion
         }
-        ApiVideoUploader.customHeaders[key] = name + ":" + version
+        ApiVideoUploader.defaultHeaders[key] = name + ":" + version
     }
 
     public static func setSdkName(name: String, version: String) throws {
@@ -68,17 +83,19 @@ public class ApiVideoUploader {
     public static func setApplicationName(name: String, version: String) throws {
         try setName(key: "AV-Origin-App", name: name, version: version)
     }
-
 }
 
 open class RequestBuilder<T> {
+    var credential: URLCredential?
     var headers: [String: String]
     public var parameters: [String: Any]?
     public let method: String
     public let URLString: String
     public let requestTask: RequestTask = RequestTask()
 
     /// Optional block to obtain a reference to the request's progress instance when available.
+    /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
+    /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
     public var onProgressReady: ((Progress) -> Void)?
 
     required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], onProgressReady: ((Progress) -> Void)? = nil) {
@@ -108,6 +125,11 @@ open class RequestBuilder<T> {
         }
         return self
     }
+
+    open func addCredential() -> Self {
+        credential = ApiVideoUploader.credential
+        return self
+    }
 }
 
 public protocol RequestBuilderFactory {