Update dependencies, syntax and usage of Reactive extension

Author: raxityo

Package.swift

@@ -1,3 +1,5 @@
+// swift-tools-version:5.3
+//
 // Package.swift
 /*
  The MIT License (MIT)
@@ -23,8 +25,21 @@ import PackageDescription
 
 let package = Package(
     name: "OAuthRxSwift",
+    products: [
+        .library(
+            name: "OAuthRxSwift",
+            targets: ["OAuthRxSwift"]
+        ),
+    ],
     dependencies: [
-        .Package(url: "https://github.com/OAuthSwift/OAuthSwift.git", majorVersion: 1),
-        .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3),
+      .package(url: "https://github.com/OAuthSwift/OAuthSwift", .upToNextMajor(from: "2.1.2")),
+      .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "5.1.1")),
+    ],
+    targets: [
+        .target(
+            name: "OAuthRxSwift",
+            dependencies: ["OAuthSwift", "RxSwift"],
+            path: "Sources"
+        ),
     ]
-)
+)

Sources/OAuthRxSwift.swift

@@ -10,94 +10,42 @@ import Foundation
 import OAuthSwift
 import RxSwift
 
-extension OAuthSwift {
-    public typealias ObservableElement = (credential: OAuthSwiftCredential, response: URLResponse?, parameters: Parameters) // see OAuthSwift.TokenSuccessHandler TODO replace with OAuthSwift.TokenSuccess
-}
-
-extension OAuth1Swift {
 
-    open func rx_authorize(withCallbackURL callbackURL: URL) -> Observable<ObservableElement> {
-        return Observable<ObservableElement>.create{ (observer: AnyObserver<ObservableElement>) -> Disposable in
-            let handle = self.authorize(
-                withCallbackURL: callbackURL,
-                success: { credential, response, parameters in
-                    observer.onNext((credential, response, parameters))
-                    observer.onCompleted()
-                },
-                failure: { error in
-                    observer.onError(error)
-                }
-            )
-            // else an error has been thrown
-            return Disposables.create {
-                handle?.cancel()
-            }
-            }.share()
-    }
-    
-    @nonobjc open func rx_authorize(withCallbackURL callbackURL: String) -> Observable<ObservableElement> {
-        return Observable<ObservableElement>.create{ (observer: AnyObserver<ObservableElement>) -> Disposable in
-            let handle = self.authorize(
-                withCallbackURL: callbackURL,
-                success: { credential, response, parameters in
-                    observer.onNext((credential, response, parameters))
-                    observer.onCompleted()
-                },
-                failure: { error in
-                    observer.onError(error)
-                }
-            )
-            // else an error has been thrown
-            return Disposables.create {
-                handle?.cancel()
-            }
-            }.share()
+extension Reactive where Base == OAuth1Swift {
+  public func authorize(withCallbackURL url: URLConvertible, headers: OAuthSwift.Headers? = nil) -> Observable<OAuthSwift.TokenSuccess> {
+    Observable.create { (observer: AnyObserver<OAuthSwift.TokenSuccess>) in
+      let requestHandle = self.base.authorize(withCallbackURL: url, headers: headers) { result in
+        observer.on(result.asEvent)
+        observer.on(.completed)
+      }
+      return Disposables.create {
+        requestHandle?.cancel()
+      }
     }
-
+  }
 }
 
-extension OAuth2Swift {
-    
-    open func rx_authorize(withCallbackURL callbackURL: URL, scope: String, state: String, parameters: Parameters = [:], headers: Headers? = nil) -> Observable<ObservableElement> {
-        
-        return Observable<ObservableElement>.create{ (observer: AnyObserver<ObservableElement>) -> Disposable in
-            let handle = self.authorize(
-                withCallbackURL: callbackURL,
-                scope: scope, state: state, parameters: parameters, headers: headers,
-                success: { credential, response, parameters in
-                    observer.onNext((credential, response, parameters))
-                    observer.onCompleted()
-                },
-                failure: { error in
-                    observer.onError(error)
-                }
-            )
-            // else an error has been thrown
-            return Disposables.create {
-                handle?.cancel()
-            }
-            }.share()
+extension Reactive where Base == OAuth2Swift {
+  public func authorize(withCallbackURL callbackURL: URLConvertible?, scope: String, state: String, parameters: OAuth2Swift.Parameters = [:], headers: OAuthSwift.Headers? = nil) -> Observable<OAuthSwift.TokenSuccess> {
+    Observable.create { (observer: AnyObserver<OAuthSwift.TokenSuccess>) in
+      let requestHandle = self.base.authorize(withCallbackURL: callbackURL, scope: scope, state: state, parameters: parameters, headers: headers) { result in
+        observer.on(result.asEvent)
+        observer.on(.completed)
+      }
+      return Disposables.create {
+        requestHandle?.cancel()
+      }
     }
+  }
+}
 
-    @nonobjc open func rx_authorize(withCallbackURL callbackURL: String, scope: String, state: String, parameters: Parameters = [:], headers: Headers? = nil) -> Observable<ObservableElement> {
-        
-        return Observable<ObservableElement>.create{ (observer: AnyObserver<ObservableElement>) -> Disposable in
-            let handle = self.authorize(
-                withCallbackURL: callbackURL,
-                scope: scope, state: state, parameters: parameters, headers: headers,
-                success: { credential, response, parameters in
-                    observer.onNext((credential, response, parameters))
-                    observer.onCompleted()
-                },
-                failure: { error in
-                    observer.onError(error)
-                }
-            )
-            // else an error has been thrown
-            return Disposables.create {
-                handle?.cancel()
-            }
-            }.share()
+extension Result {
+  var asEvent: Event<Success> {
+    switch self {
+      case let .success(element):
+        return .next(element)
+      case let .failure(error):
+        return .error(error)
     }
-
+  }
 }