@wwdrew/expo-spotify-sdk 0.3.0 → 0.3.1

package/build/ExpoSpotifySDK.types.d.ts

@@ -9,7 +9,6 @@ export interface SpotifyConfig {
     scopes: SpotifyScope[];
     tokenSwapURL?: string;
     tokenRefreshURL?: string;
-    shouldRequestAccessToken?: boolean;
 }
 export type SpotifyScope = "ugc-image-upload" | "user-read-playback-state" | "user-modify-playback-state" | "user-read-currently-playing" | "app-remote-control" | "streaming" | "playlist-read-private" | "playlist-read-collaborative" | "playlist-modify-private" | "playlist-modify-public" | "user-follow-modify" | "user-follow-read" | "user-top-read" | "user-read-recently-played" | "user-library-modify" | "user-library-read" | "user-read-email" | "user-read-private";
 //# sourceMappingURL=ExpoSpotifySDK.types.d.ts.map

package/build/ExpoSpotifySDK.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoSpotifySDK.types.d.ts","sourceRoot":"","sources":["../src/ExpoSpotifySDK.types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,MAAM,MAAM,YAAY,GACpB,kBAAkB,GAClB,0BAA0B,GAC1B,4BAA4B,GAC5B,6BAA6B,GAC7B,oBAAoB,GACpB,WAAW,GACX,uBAAuB,GACvB,6BAA6B,GAC7B,yBAAyB,GACzB,wBAAwB,GACxB,oBAAoB,GACpB,kBAAkB,GAClB,eAAe,GACf,2BAA2B,GAC3B,qBAAqB,GACrB,mBAAmB,GACnB,iBAAiB,GACjB,mBAAmB,CAAC"}
+{"version":3,"file":"ExpoSpotifySDK.types.d.ts","sourceRoot":"","sources":["../src/ExpoSpotifySDK.types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,YAAY,GACpB,kBAAkB,GAClB,0BAA0B,GAC1B,4BAA4B,GAC5B,6BAA6B,GAC7B,oBAAoB,GACpB,WAAW,GACX,uBAAuB,GACvB,6BAA6B,GAC7B,yBAAyB,GACzB,wBAAwB,GACxB,oBAAoB,GACpB,kBAAkB,GAClB,eAAe,GACf,2BAA2B,GAC3B,qBAAqB,GACrB,mBAAmB,GACnB,iBAAiB,GACjB,mBAAmB,CAAC"}

package/build/ExpoSpotifySDK.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoSpotifySDK.types.js","sourceRoot":"","sources":["../src/ExpoSpotifySDK.types.ts"],"names":[],"mappings":"","sourcesContent":["export interface SpotifySession {\n  accessToken: string;\n  refreshToken: string;\n  expirationDate: number;\n  isExpired: boolean;\n  scopes: SpotifyScope[];\n}\n\nexport interface SpotifyConfig {\n  scopes: SpotifyScope[];\n  tokenSwapURL?: string;\n  tokenRefreshURL?: string;\n  shouldRequestAccessToken?: boolean;\n}\n\nexport type SpotifyScope =\n  | \"ugc-image-upload\"\n  | \"user-read-playback-state\"\n  | \"user-modify-playback-state\"\n  | \"user-read-currently-playing\"\n  | \"app-remote-control\"\n  | \"streaming\"\n  | \"playlist-read-private\"\n  | \"playlist-read-collaborative\"\n  | \"playlist-modify-private\"\n  | \"playlist-modify-public\"\n  | \"user-follow-modify\"\n  | \"user-follow-read\"\n  | \"user-top-read\"\n  | \"user-read-recently-played\"\n  | \"user-library-modify\"\n  | \"user-library-read\"\n  | \"user-read-email\"\n  | \"user-read-private\";\n"]}
+{"version":3,"file":"ExpoSpotifySDK.types.js","sourceRoot":"","sources":["../src/ExpoSpotifySDK.types.ts"],"names":[],"mappings":"","sourcesContent":["export interface SpotifySession {\n  accessToken: string;\n  refreshToken: string;\n  expirationDate: number;\n  isExpired: boolean;\n  scopes: SpotifyScope[];\n}\n\nexport interface SpotifyConfig {\n  scopes: SpotifyScope[];\n  tokenSwapURL?: string;\n  tokenRefreshURL?: string;\n}\n\nexport type SpotifyScope =\n  | \"ugc-image-upload\"\n  | \"user-read-playback-state\"\n  | \"user-modify-playback-state\"\n  | \"user-read-currently-playing\"\n  | \"app-remote-control\"\n  | \"streaming\"\n  | \"playlist-read-private\"\n  | \"playlist-read-collaborative\"\n  | \"playlist-modify-private\"\n  | \"playlist-modify-public\"\n  | \"user-follow-modify\"\n  | \"user-follow-read\"\n  | \"user-top-read\"\n  | \"user-read-recently-played\"\n  | \"user-library-modify\"\n  | \"user-library-read\"\n  | \"user-read-email\"\n  | \"user-read-private\";\n"]}

package/ios/ExpoSpotifySDKModule.swift

@@ -2,44 +2,38 @@ import ExpoModulesCore
 import SpotifyiOS
 
 public class ExpoSpotifySDKModule: Module {
-    
+
     public func definition() -> ModuleDefinition {
-        
+
         let spotifySession = ExpoSpotifySessionManager.shared
-        
+
         Name("ExpoSpotifySDK")
-        
+
         Function("isAvailable") {
             return spotifySession.spotifyAppInstalled()
         }
-        
+
         AsyncFunction("authenticateAsync") { (config: [String: Any], promise: Promise) in
             guard let scopes = config["scopes"] as? [String] else {
                 promise.reject("INVALID_CONFIG", "Invalid SpotifyConfig object")
                 return
             }
-            
+
             let tokenSwapURL = config["tokenSwapURL"] as? String
             let tokenRefreshURL = config["tokenRefreshURL"] as? String
-            let shouldRequestAccessToken = config["shouldRequestAccessToken"] as? Bool ?? true
-            
-            spotifySession.authenticate(scopes: scopes, tokenSwapURL: tokenSwapURL, tokenRefreshURL: tokenRefreshURL, shouldRequestAccessToken: shouldRequestAccessToken).done { result in
-                switch result {
-                case .session(let session):
-                    promise.resolve([
-                        "accessToken": session.accessToken,
-                        "refreshToken": session.refreshToken,
-                        "expirationDate": Int(session.expirationDate.timeIntervalSince1970 * 1000),
-                        "scopes": SPTScopeSerializer.serializeScopes(session.scope),
-                        "isExpired": session.isExpired
-                    ])
-                case .authorizationCode(let code):
-                    promise.resolve(["code": code])
-                }
+
+            spotifySession.authenticate(scopes: scopes, tokenSwapURL: tokenSwapURL, tokenRefreshURL: tokenRefreshURL).done { session in
+                promise.resolve([
+                    "accessToken": session.accessToken,
+                    "refreshToken": session.refreshToken,
+                    "expirationDate": Int(session.expirationDate.timeIntervalSince1970 * 1000),
+                    "scopes": SPTScopeSerializer.serializeScopes(session.scope),
+                    "isExpired": session.isExpired
+                ])
             }.catch { error in
                 promise.reject(error)
             }
         }
-        
+
     }
 }

package/ios/ExpoSpotifySessionManager+SessionManagerDelegate.swift

@@ -3,9 +3,7 @@ import SpotifyiOS
 
 extension ExpoSpotifySessionManager: SPTSessionManagerDelegate {
     public func sessionManager(manager _: SPTSessionManager, didInitiate session: SPTSession) {
-        if shouldRequestAccessToken {
-            authPromiseSeal?.fulfill(AuthenticationResult.session(session))
-        }
+        authPromiseSeal?.fulfill(session)
     }
     
     public func sessionManager(manager _: SPTSessionManager, didFailWith error: Error) {
@@ -13,14 +11,6 @@ extension ExpoSpotifySessionManager: SPTSessionManagerDelegate {
     }
     
     public func sessionManager(manager _: SPTSessionManager, didRenew session: SPTSession) {
-        authPromiseSeal?.fulfill(AuthenticationResult.session(session))
-    }
-    
-    public func sessionManager(manager: SPTSessionManager, shouldRequestAccessTokenWith code: String) -> Bool {
-        if !shouldRequestAccessToken {
-            authPromiseSeal?.fulfill(AuthenticationResult.authorizationCode(code))
-        }
-        
-        return shouldRequestAccessToken
+        authPromiseSeal?.fulfill(session)
     }
 }

package/ios/ExpoSpotifySessionManager.swift

@@ -2,11 +2,6 @@ import ExpoModulesCore
 import SpotifyiOS
 import PromiseKit
 
-enum AuthenticationResult {
-    case session(SPTSession)
-    case authorizationCode(String)
-}
-
 enum SessionManagerError: Error {
     case notInitialized
     case invalidConfiguration
@@ -14,12 +9,10 @@ enum SessionManagerError: Error {
 
 final class ExpoSpotifySessionManager: NSObject {
     weak var module: ExpoSpotifySDKModule?
-    var authPromiseSeal: Resolver<AuthenticationResult>?
-    
-    var shouldRequestAccessToken: Bool = true
-    
+    var authPromiseSeal: Resolver<SPTSession>?
+
     static let shared = ExpoSpotifySessionManager()
-    
+
     private var expoSpotifyConfiguration: ExpoSpotifyConfiguration? {
         guard let expoSpotifySdkDict = Bundle.main.object(forInfoDictionaryKey: "ExpoSpotifySDK") as? [String: String],
               let clientID = expoSpotifySdkDict["clientID"],
@@ -28,30 +21,30 @@ final class ExpoSpotifySessionManager: NSObject {
         {
             return nil
         }
-        
+
         return ExpoSpotifyConfiguration(clientID: clientID, host: host, scheme: scheme)
     }
-    
+
     lazy var configuration: SPTConfiguration? = {
         guard let clientID = expoSpotifyConfiguration?.clientID,
               let redirectURL = expoSpotifyConfiguration?.redirectURL else {
             NSLog("Invalid Spotify configuration")
             return nil
         }
-        
+
         return SPTConfiguration(clientID: clientID, redirectURL: redirectURL)
     }()
-    
+
     lazy var sessionManager: SPTSessionManager? = {
         guard let configuration = configuration else {
             return nil
         }
-        
+
         return SPTSessionManager(configuration: configuration, delegate: self)
     }()
-    
-    
-    func authenticate(scopes: [String], tokenSwapURL: String?, tokenRefreshURL: String?, shouldRequestAccessToken: Bool = true) -> PromiseKit.Promise<AuthenticationResult> {
+
+
+    func authenticate(scopes: [String], tokenSwapURL: String?, tokenRefreshURL: String?) -> PromiseKit.Promise<SPTSession> {
         return Promise { seal in
             guard let clientID = expoSpotifyConfiguration?.clientID,
                   let redirectURL = expoSpotifyConfiguration?.redirectURL else {
@@ -59,40 +52,39 @@ final class ExpoSpotifySessionManager: NSObject {
                 seal.reject(SessionManagerError.invalidConfiguration)
                 return
             }
-            let configuration = SPTConfiguration(clientID: clientID, redirectURL: redirectURL)
             
+            let configuration = SPTConfiguration(clientID: clientID, redirectURL: redirectURL)
+
             if (tokenSwapURL != nil) {
                 configuration.tokenSwapURL = URL(string: tokenSwapURL ?? "")
             }
-            
+
             if (tokenRefreshURL != nil) {
                 configuration.tokenRefreshURL = URL(string: tokenRefreshURL ?? "")
             }
-            
-            self.shouldRequestAccessToken = shouldRequestAccessToken
+
+            self.authPromiseSeal = seal
             self.configuration = configuration
             self.sessionManager = SPTSessionManager(configuration: configuration, delegate: self)
-            
-            self.authPromiseSeal = seal
-            
+
             DispatchQueue.main.sync {
                 sessionManager?.initiateSession(with: SPTScopeSerializer.deserializeScopes(scopes), options: .default)
             }
         }
     }
-    
+
     func spotifyAppInstalled() -> Bool {
         guard let sessionManager = sessionManager else {
             NSLog("SPTSessionManager not initialized")
             return false
         }
-        
+
         var isInstalled = false
-        
+
         DispatchQueue.main.sync {
             isInstalled = sessionManager.isSpotifyAppInstalled
         }
-        
+
         return isInstalled
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwdrew/expo-spotify-sdk",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Expo Module for native Spotify SDK",
   "main": "build/index.js",
   "types": "build/index.d.ts",