@wwdrew/expo-spotify-sdk 0.1.1 → 0.2.0

package/build/ExpoSpotifySDK.types.d.ts

@@ -4,5 +4,10 @@ export interface SpotifySession {
     expirationDate: number;
     isExpired: boolean;
 }
+export interface SpotifyConfig {
+    scopes: SpotifyScope[];
+    tokenSwapURL?: string;
+    tokenRefreshURL?: string;
+}
 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;CACpB;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;CACpB;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}\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}\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/build/index.d.ts

@@ -1,6 +1,6 @@
-import { SpotifyScope, SpotifySession } from "./ExpoSpotifySDK.types";
+import { SpotifyConfig, SpotifySession } from "./ExpoSpotifySDK.types";
 declare function isAvailable(): boolean;
-declare function authenticateAsync(scopes: SpotifyScope[]): Promise<SpotifySession>;
+declare function authenticateAsync(config: SpotifyConfig): Promise<SpotifySession>;
 declare const Authenticate: {
     authenticateAsync: typeof authenticateAsync;
 };

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGtE,iBAAS,WAAW,IAAI,OAAO,CAE9B;AAED,iBAAS,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAE1E;AAED,QAAA,MAAM,YAAY;;CAEjB,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGvE,iBAAS,WAAW,IAAI,OAAO,CAE9B;AAED,iBAAS,iBAAiB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,CAMzE;AAED,QAAA,MAAM,YAAY;;CAEjB,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC"}

package/build/index.js

@@ -2,8 +2,11 @@ import ExpoSpotifySDKModule from "./ExpoSpotifySDKModule";
 function isAvailable() {
     return ExpoSpotifySDKModule.isAvailable();
 }
-function authenticateAsync(scopes) {
-    return ExpoSpotifySDKModule.authenticate(scopes);
+function authenticateAsync(config) {
+    if (!config.scopes || config.scopes?.length === 0) {
+        throw new Error("scopes are required");
+    }
+    return ExpoSpotifySDKModule.authenticateAsync(config);
 }
 const Authenticate = {
     authenticateAsync,

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAE1D,SAAS,WAAW;IAClB,OAAO,oBAAoB,CAAC,WAAW,EAAE,CAAC;AAC5C,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAsB;IAC/C,OAAO,oBAAoB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,YAAY,GAAG;IACnB,iBAAiB;CAClB,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC","sourcesContent":["import { SpotifyScope, SpotifySession } from \"./ExpoSpotifySDK.types\";\nimport ExpoSpotifySDKModule from \"./ExpoSpotifySDKModule\";\n\nfunction isAvailable(): boolean {\n  return ExpoSpotifySDKModule.isAvailable();\n}\n\nfunction authenticateAsync(scopes: SpotifyScope[]): Promise<SpotifySession> {\n  return ExpoSpotifySDKModule.authenticate(scopes);\n}\n\nconst Authenticate = {\n  authenticateAsync,\n};\n\nexport { isAvailable, Authenticate };\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAE1D,SAAS,WAAW;IAClB,OAAO,oBAAoB,CAAC,WAAW,EAAE,CAAC;AAC5C,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAqB;IAC9C,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,oBAAoB,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,YAAY,GAAG;IACnB,iBAAiB;CAClB,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC","sourcesContent":["import { SpotifyConfig, SpotifySession } from \"./ExpoSpotifySDK.types\";\nimport ExpoSpotifySDKModule from \"./ExpoSpotifySDKModule\";\n\nfunction isAvailable(): boolean {\n  return ExpoSpotifySDKModule.isAvailable();\n}\n\nfunction authenticateAsync(config: SpotifyConfig): Promise<SpotifySession> {\n  if (!config.scopes || config.scopes?.length === 0) {\n    throw new Error(\"scopes are required\");\n  }\n\n  return ExpoSpotifySDKModule.authenticateAsync(config);\n}\n\nconst Authenticate = {\n  authenticateAsync,\n};\n\nexport { isAvailable, Authenticate };\n"]}

package/ios/ExpoSpotifyConfiguration.swift

@@ -4,22 +4,17 @@ struct ExpoSpotifyConfiguration: Codable {
     let clientID: String
     let host: String
     let scheme: String
-    let tokenRefreshURL: URL?
-    let tokenSwapURL: URL?
-
+    
     var redirectURL: URL? {
         return URL(string: "\(scheme)://\(host)")
     }
-
+    
     init(clientID: String = "defaultClientID",
          host: String = "defaultHost",
-         scheme: String = "defaultScheme",
-         tokenRefreshURL: URL? = nil,
-         tokenSwapURL: URL? = nil) {
+         scheme: String = "defaultScheme"
+    ) {
         self.clientID = clientID
         self.host = host
         self.scheme = scheme
-        self.tokenRefreshURL = tokenRefreshURL
-        self.tokenSwapURL = tokenSwapURL
     }
 }

package/ios/ExpoSpotifySDKModule.swift

@@ -3,7 +3,6 @@ import SpotifyiOS
 
 public class ExpoSpotifySDKModule: Module {
 
-
     public func definition() -> ModuleDefinition {
 
         let spotifySession = ExpoSpotifySessionManager.shared
@@ -14,8 +13,16 @@ public class ExpoSpotifySDKModule: Module {
             return spotifySession.spotifyAppInstalled()
         }
 
-        AsyncFunction("authenticate") { (scopes: [String], promise: Promise) in
-            spotifySession.authenticate(requestedScopes: scopes).done { session in
+        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
+
+            spotifySession.authenticate(scopes: scopes, tokenSwapURL: tokenSwapURL, tokenRefreshURL: tokenRefreshURL).done { session in
                 let sessionData: [String: Any] = [
                     "accessToken": session.accessToken,
                     "refreshToken": session.refreshToken,

package/ios/ExpoSpotifySessionManager.swift

@@ -4,14 +4,15 @@ import PromiseKit
 
 enum SessionManagerError: Error {
     case notInitialized
+    case invalidConfiguration
 }
 
 final class ExpoSpotifySessionManager: NSObject {
     weak var module: ExpoSpotifySDKModule?
     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"],
@@ -20,63 +21,64 @@ final class ExpoSpotifySessionManager: NSObject {
         {
             return nil
         }
-
-        let tokenRefreshURL = URL(string: expoSpotifySdkDict["tokenRefreshURL"] ?? "")
-        let tokenSwapURL = URL(string: expoSpotifySdkDict["tokenSwapURL"] ?? "")
-
-        return ExpoSpotifyConfiguration(clientID: clientID, host: host, scheme: scheme, tokenRefreshURL: tokenRefreshURL, tokenSwapURL: tokenSwapURL)
+        
+        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
         }
-
-        configuration.tokenSwapURL = expoSpotifyConfiguration?.tokenSwapURL
-        configuration.tokenRefreshURL = expoSpotifyConfiguration?.tokenRefreshURL
-
+        
         return SPTSessionManager(configuration: configuration, delegate: self)
     }()
-
-
-    func authenticate(requestedScopes: [String]) -> PromiseKit.Promise<SPTSession> {
+    
+    
+    func authenticate(scopes: [String], tokenSwapURL: String?, tokenRefreshURL: String?) -> PromiseKit.Promise<SPTSession> {
         return Promise { seal in
-            guard let sessionManager = sessionManager else {
-                NSLog("Session manager not initialized")
-                seal.reject(SessionManagerError.notInitialized)
+            guard let clientID = expoSpotifyConfiguration?.clientID,
+                  let redirectURL = expoSpotifyConfiguration?.redirectURL else {
+                NSLog("Invalid Spotify configuration")
+                seal.reject(SessionManagerError.invalidConfiguration)
                 return
             }
+            let configuration = SPTConfiguration(clientID: clientID, redirectURL: redirectURL)
 
+            configuration.tokenSwapURL = URL(string: tokenSwapURL ?? "")
+            configuration.tokenRefreshURL = URL(string: tokenRefreshURL ?? "")
+            
+            self.sessionManager = SPTSessionManager(configuration: configuration, delegate: self)
+            
             self.authPromiseSeal = seal
-
+            
             DispatchQueue.main.sync {
-                sessionManager.initiateSession(with: SPTScopeSerializer.deserializeScopes(requestedScopes), options: .default)
+                sessionManager?.initiateSession(with: SPTScopeSerializer.deserializeScopes(scopes), options: .default)
             }
         }
     }
-
+    
     func spotifyAppInstalled() -> Bool {
         guard let sessionManager = sessionManager else {
-            NSLog("Session manager not initialized")
+            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.1.1",
+  "version": "0.2.0",
   "description": "Expo Module for native Spotify SDK",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/plugin/build/index.js

@@ -5,13 +5,16 @@ const withSpotifyAndroidAppBuildGradle_1 = require("./android/withSpotifyAndroid
 const withSpotifyQueryScheme_1 = require("./ios/withSpotifyQueryScheme");
 const withSpotifyURLScheme_1 = require("./ios/withSpotifyURLScheme");
 const withSpotifyConfig_1 = require("./withSpotifyConfig");
-const withSpotifySdkConfig = (config, spotifyConfig = {
-    clientID: "clientID",
-    host: "host",
-    scheme: "scheme",
-    tokenRefreshURL: "tokenRefreshURL",
-    tokenSwapURL: "tokenSwapURL",
-}) => {
+const withSpotifySdkConfig = (config, spotifyConfig) => {
+    if (!spotifyConfig.host) {
+        throw new Error("Missing required Spotify config value: host");
+    }
+    if (!spotifyConfig.scheme) {
+        throw new Error("Missing required Spotify config value: scheme");
+    }
+    if (!spotifyConfig.clientID) {
+        throw new Error("Missing required Spotify config value: clientID");
+    }
     config = (0, withSpotifyConfig_1.withSpotifyConfig)(config, spotifyConfig);
     // Android specific
     config = (0, withSpotifyAndroidAppBuildGradle_1.withSpotifyAndroidAppBuildGradle)(config, spotifyConfig);

package/plugin/build/types.d.ts

@@ -3,6 +3,4 @@ export interface SpotifyConfig {
     clientID: string;
     host: string;
     scheme: string;
-    tokenRefreshURL: string;
-    tokenSwapURL: string;
 }