Update TVDBSwift

pietrocaselani · Dec 16, 2019 · 540566a · 540566a
1 parent 944fe7b
commit 540566a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/TVDBSwift/Endpoints/Authentication.swift b/TVDBSwift/Endpoints/Authentication.swift
@@ -13,9 +13,9 @@ extension Authentication: TVDBType {
     }
   }
 
-  public var authorizationType: AuthorizationType {
+  public var authorizationType: AuthorizationType? {
     switch self {
-    case .login: return .none
+    case .login: return nil
     case .refreshToken: return .bearer
     }
   }

diff --git a/TVDBSwift/TVDB.swift b/TVDBSwift/TVDB.swift
@@ -1,5 +1,4 @@
 import Moya
-import Result
 import RxSwift
 
 public class TVDB {
@@ -64,9 +63,9 @@ public class TVDB {
 
     interceptors.append(TVDBTokenRequestInterceptor(tvdb: self))
 
-    plugins.append(AccessTokenPlugin { [weak self] () -> String in
-      self?.token ?? ""
-    })
+    plugins.append(AccessTokenPlugin(tokenClosure: { [token] _ -> String in
+      token ?? ""
+    }))
   }
 
   func createProvider<T: TVDBType>(forTarget target: T.Type) -> MoyaProvider<T> {

diff --git a/TVDBSwift/TVDBTokenRequestInterceptor.swift b/TVDBSwift/TVDBTokenRequestInterceptor.swift
@@ -1,5 +1,4 @@
 import Moya
-import Result
 
 final class TVDBTokenRequestInterceptor: RequestInterceptor {
   private weak var tvdb: TVDB?

diff --git a/TVDBSwift/TVDBType.swift b/TVDBSwift/TVDBType.swift
@@ -9,7 +9,7 @@ public extension TVDBType {
 
   var method: Moya.Method { return .get }
 
-  var authorizationType: AuthorizationType { return .bearer }
+  var authorizationType: AuthorizationType? { return .bearer}
 
   var sampleData: Data { return Data() }
 }