Merge pull request #124 from PKLOT/use_swift_result

Use `Result` in Swift standard library instead of from a dependency.
trivago · Jan 15, 2021 · 07d3db5 · 07d3db5
2 parents fd4b9c2 + 8181aac
commit 07d3db5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/Heimdallr.podspec b/Heimdallr.podspec
@@ -19,11 +19,11 @@ Pod::Spec.new do |spec|
 
   spec.ios.deployment_target = '9.0'
   spec.osx.deployment_target = '10.10'
+  spec.swift_version = '5.0'
 
   spec.default_subspec = 'Core'
 
   spec.subspec 'Core' do |subspec|
-    subspec.dependency 'Result', '~> 4.1.0'
     subspec.framework = 'Foundation'
 
     subspec.source_files = 'Heimdallr/*.swift'

diff --git a/Heimdallr/Heimdallr.swift b/Heimdallr/Heimdallr.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Result
 
 public let HeimdallrErrorDomain = "HeimdallrErrorDomain"
 
@@ -210,15 +209,14 @@ public let HeimdallrErrorNotAuthorized = 2
             if let expiration = accessToken.expiresAt, expiration < Date() {
                 if let refreshToken = accessToken.refreshToken {
                     requestAccessToken(grant: .refreshToken(refreshToken)) { result in
-                        completion(result.analysis(ifSuccess: { accessToken in
-                            let authenticatedRequest = self.authenticateRequest(request, accessToken: accessToken)
-                            return .success(authenticatedRequest)
-                            }, ifFailure: { error in
-                                if [HeimdallrErrorDomain, OAuthErrorDomain].contains(error.domain) {
-                                    self.clearAccessToken()
-                                }
-                                return .failure(error)
-                        }))
+                        completion(result.map { accessToken in
+                            self.authenticateRequest(request, accessToken: accessToken)
+                        }.mapError { error in
+                            if [HeimdallrErrorDomain, OAuthErrorDomain].contains(error.domain) {
+                                self.clearAccessToken()
+                            }
+                            return error
+                        })
                         self.releaseRequestQueue()
                     }
                 } else {

diff --git a/Heimdallr/OAuthAccessToken.swift b/Heimdallr/OAuthAccessToken.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Result
 
 /// An access token is used for authorizing requests to the resource endpoint.
 @objc

diff --git a/Heimdallr/OAuthAccessTokenDefaultParser.swift b/Heimdallr/OAuthAccessTokenDefaultParser.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Result
 
 @objc public class OAuthAccessTokenDefaultParser: NSObject, OAuthAccessTokenParser {
     public func parse(data: Data) throws -> OAuthAccessToken {

diff --git a/Heimdallr/OAuthAccessTokenParser.swift b/Heimdallr/OAuthAccessTokenParser.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Result
 
 /// An access token parser that can be used by Heimdallr.
 @objc public protocol OAuthAccessTokenParser {