Update TraktSwift

pietrocaselani · Dec 16, 2019 · 7df44f4 · 7df44f4
1 parent 776cc29
commit 7df44f4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 19 deletions.
diff --git a/TraktSwift/Endpoints/Seasons.swift b/TraktSwift/Endpoints/Seasons.swift
@@ -19,10 +19,6 @@ extension Seasons: TraktType {
     }
   }
 
-  public var authorizationType: AuthorizationType {
-    return .none
-  }
-
   public var sampleData: Data {
     switch self {
     case .summary:

diff --git a/TraktSwift/Endpoints/Shows.swift b/TraktSwift/Endpoints/Shows.swift
@@ -52,12 +52,10 @@ extension Shows: TraktType {
     return .requestParameters(parameters: params, encoding: URLEncoding.default)
   }
 
-  public var authorizationType: AuthorizationType {
+  public var authorizationType: AuthorizationType? {
     switch self {
-    case .watchedProgress:
-      return .bearer
-    default:
-      return .none
+    case .watchedProgress: return .bearer
+    default: return nil
     }
   }
 

diff --git a/TraktSwift/Endpoints/Sync.swift b/TraktSwift/Endpoints/Sync.swift
@@ -69,7 +69,7 @@ extension Sync: TraktType {
     }
   }
 
-  public var authorizationType: AuthorizationType {
+  public var authorizationType: AuthorizationType? {
     return .bearer
   }
 

diff --git a/TraktSwift/Endpoints/Users.swift b/TraktSwift/Endpoints/Users.swift
@@ -13,7 +13,7 @@ extension Users: TraktType {
     return .requestPlain
   }
 
-  public var authorizationType: AuthorizationType {
+  public var authorizationType: AuthorizationType? {
     return .bearer
   }
 

diff --git a/TraktSwift/Trakt.swift b/TraktSwift/Trakt.swift
@@ -51,14 +51,14 @@ public class Trakt {
 
     if let redirectURL = credentials.redirectURL {
       let url = Trakt.siteURL.appendingPathComponent(Trakt.OAuth2AuthorizationPath)
-      var componenets = URLComponents(url: url, resolvingAgainstBaseURL: false)
+      var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
 
       let responseTypeItem = URLQueryItem(name: "response_type", value: "code")
       let clientIdItem = URLQueryItem(name: "client_id", value: clientId)
       let redirectURIItem = URLQueryItem(name: "redirect_uri", value: redirectURL)
-      componenets?.queryItems = [responseTypeItem, clientIdItem, redirectURIItem]
+      components?.queryItems = [responseTypeItem, clientIdItem, redirectURIItem]
 
-      oauthURL = componenets?.url
+      oauthURL = components?.url
     } else {
       oauthURL = nil
     }
@@ -67,8 +67,8 @@ public class Trakt {
 
     interceptors.append(TraktTokenInterceptor(trakt: self))
 
-    plugins.append(AccessTokenPlugin { [weak self] () -> String in
-      self?.accessToken?.accessToken ?? ""
+    plugins.append(AccessTokenPlugin { [accessToken] _ -> String in
+      accessToken?.accessToken ?? ""
     })
   }
 

diff --git a/TraktSwift/TraktTokenInterceptor.swift b/TraktSwift/TraktTokenInterceptor.swift
@@ -1,5 +1,4 @@
 import Moya
-import Result
 
 final class TraktTokenInterceptor: RequestInterceptor {
   private weak var trakt: Trakt?

diff --git a/TraktSwift/TraktType.swift b/TraktSwift/TraktType.swift
@@ -11,7 +11,7 @@ public extension TraktType {
 
   var task: Task { return .requestPlain }
 
-  var authorizationType: AuthorizationType { return .none }
+  var authorizationType: AuthorizationType? { return nil }
 
   var sampleData: Data {
     return "".utf8Encoded
@@ -23,7 +23,7 @@ public extension TraktType {
     hasher.combine(typeName)
     hasher.combine(path)
     hasher.combine(method)
-    hasher.combine(authorizationType.value)
+    hasher.combine(authorizationType?.value)
   }
 
   static func == (lhs: Self, rhs: Self) -> Bool {
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,7 @@ extension Sync: TraktType { @@
         }
       }
-      public var authorizationType: AuthorizationType {
+      public var authorizationType: AuthorizationType? {
         return .bearer
       }
@@ Expand Down @@