@superfan-app/spotify-auth 0.1.29 → 0.1.30

package/ios/SpotifyAuthAuth.swift

@@ -233,33 +233,33 @@ final class SpotifyAuthAuth: NSObject, SPTSessionManagerDelegate {
     }
 
     private func securelyStoreToken(_ session: SPTSession) {
-        // Only pass token to JS, store sensitive data securely
+        // Pass token to JS and securely store refresh token
         module?.onAccessTokenObtained(session.accessToken)
         
-        // Store refresh token in keychain if available
-        if let refreshToken = session.refreshToken {
+        // Since refreshToken is now a non-optional String, we simply check for an empty value.
+        let refreshToken = session.refreshToken
+        if !refreshToken.isEmpty {
             do {
                 let keychainKey = try getKeychainKey()
-                try KeychainAccess.store(
-                    key: keychainKey,
-                    data: refreshToken.data(using: .utf8)!,
-                    accessibility: .afterFirstUnlock
-                )
+                // Create a Keychain instance (using bundle identifier as the service)
+                let keychain = Keychain(service: Bundle.main.bundleIdentifier ?? "com.superfan.app")
+                    .accessibility(.afterFirstUnlock)
+                try keychain.set(refreshToken, key: keychainKey)
             } catch {
-                print("Failed to store refresh token securely")
+                print("Failed to store refresh token securely: \(error)")
             }
         }
     }
 
     private func cleanupPreviousSession() {
-        // Clear any sensitive data from previous session
         refreshTimer?.invalidate()
         
         do {
             let keychainKey = try getKeychainKey()
-            try KeychainAccess.delete(key: keychainKey)
+            let keychain = Keychain(service: Bundle.main.bundleIdentifier ?? "com.superfan.app")
+            try keychain.remove(keychainKey)
         } catch {
-            print("Failed to clear previous refresh token")
+            print("Failed to clear previous refresh token: \(error)")
         }
         
         // Clear in-memory session data
@@ -287,8 +287,9 @@ final class SpotifyAuthAuth: NSObject, SPTSessionManagerDelegate {
             let scopes = try self.requestedScopes
             isAuthenticating = true
             
-            let options: SPTConfiguration.AuthorizationOptions = showDialog ? .clientOnly : .default
-            sessionManager.initiateSession(with: scopes, options: options)
+            // Updated: Use SPTSessionManagerOptions (an OptionSet) and pass nil for campaign.
+            let options: SPTSessionManagerOptions = showDialog ? .clientOnly : []
+            sessionManager.initiateSession(with: scopes, options: options, campaign: nil)
         } catch {
             isAuthenticating = false
             handleError(error, context: "authentication")
@@ -304,7 +305,8 @@ final class SpotifyAuthAuth: NSObject, SPTSessionManagerDelegate {
             }
             let scopes = try self.requestedScopes
             isAuthenticating = true
-            sessionManager.initiateSession(with: scopes, options: .default)
+            // Updated: Use SPTSessionManagerOptions and pass nil for campaign.
+            sessionManager.initiateSession(with: scopes, options: [], campaign: nil)
         } catch {
             isAuthenticating = false
             handleError(error, context: "authentication_retry")
@@ -382,19 +384,10 @@ final class SpotifyAuthAuth: NSObject, SPTSessionManagerDelegate {
     private func handleError(_ error: Error, context: String) {
         let spotifyError: SpotifyAuthError
         
-        if let error = error as? SpotifyAuthError {
-            spotifyError = error
-        } else if let sptError = error as? SPTError {
-            switch sptError {
-            case .configurationError:
-                spotifyError = .invalidConfiguration("Invalid Spotify configuration")
-            case .authenticationError:
-                spotifyError = .authenticationFailed("Please try authenticating again")
-            case .loggedOut:
-                spotifyError = .sessionError("User logged out")
-            default:
-                spotifyError = .authenticationFailed(sptError.localizedDescription)
-            }
+        // Instead of switching on SPTError cases (which are no longer available),
+        // we simply wrap the error’s description.
+        if error is SPTError {
+            spotifyError = .authenticationFailed(error.localizedDescription)
         } else {
             spotifyError = .authenticationFailed(error.localizedDescription)
         }
@@ -459,4 +452,4 @@ final class SpotifyAuthAuth: NSObject, SPTSessionManagerDelegate {
     deinit {
         cleanupPreviousSession()
     }
-}
+}

package/ios/SpotifyAuthDelegate.swift

@@ -17,7 +17,8 @@ public class SpotifyAuthDelegate: ExpoAppDelegateSubscriber, SPTSessionManagerDe
     }
 
     public func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
-        spotifyAuth.sessionManager.application(app, open: url, options: options)
+        // Use optional chaining to avoid calling on a nil session manager.
+        spotifyAuth.sessionManager?.application(app, open: url, options: options)
         return true
     }
-}
+}

package/ios/SpotifyAuthModule.swift

@@ -33,9 +33,6 @@ struct AuthorizeConfig: Record {
 public class SpotifyAuthModule: Module {
     let spotifyAuth = SpotifyAuthAuth.shared
 
-    // Each module class must implement the definition function. The definition consists of components
-    // that describes the module's functionality and behavior.
-    // See https://docs.expo.dev/modules/module-api for more details about available components.
     public func definition() -> ModuleDefinition {
         Name("SpotifyAuth")
 
@@ -51,12 +48,12 @@ public class SpotifyAuthModule: Module {
         // Defines event names that the module can send to JavaScript.
         Events(SPOTIFY_AUTHORIZATION_EVENT_NAME)
 
-        // This will be called when JS starts observing the event.
+        // Called when JS starts observing the event.
         OnStartObserving {
             secureLog("Started observing events")
         }
 
-        // This will be called when JS stops observing the event.
+        // Called when JS stops observing the event.
         OnStopObserving {
             secureLog("Stopped observing events")
         }
@@ -64,7 +61,7 @@ public class SpotifyAuthModule: Module {
         AsyncFunction("authorize") { (config: AuthorizeConfig, promise: Promise) in
             secureLog("Authorization requested")
             
-            // Sanitize and validate redirect URL
+            // Sanitize and validate redirect URL.
             guard let url = URL(string: config.redirectUrl),
                   url.scheme != nil,
                   url.host != nil else {
@@ -72,22 +69,21 @@ public class SpotifyAuthModule: Module {
                 return
             }
             
-            let configuration = SPTConfiguration(clientID: config.clientId, redirectURL: url)
+            // Create a configuration (this example does not use the variable afterwards).
+            let _ = SPTConfiguration(clientID: config.clientId, redirectURL: url)
             
             do {
                 try spotifyAuth.initAuth(showDialog: config.showDialog)
                 promise.resolve()
             } catch {
-                // Sanitize error message
+                // Sanitize error message.
                 let sanitizedError = sanitizeErrorMessage(error.localizedDescription)
                 promise.reject(SpotifyAuthError.authenticationFailed(sanitizedError))
             }
         }
 
-        // Enables the module to be used as a native view. Definition components that are accepted as part of the
-        // view definition: Prop, Events.
+        // Enables the module to be used as a native view.
         View(SpotifyAuthView.self) {
-            // Defines a setter for the `name` prop.
             Prop("name") { (_: SpotifyAuthView, prop: String) in
                 secureLog("View prop updated: \(prop)")
             }
@@ -95,7 +91,7 @@ public class SpotifyAuthModule: Module {
     }
 
     private func sanitizeErrorMessage(_ message: String) -> String {
-        // Remove any potential sensitive data from error messages
+        // Remove potential sensitive data from error messages.
         let sensitivePatterns = [
             "(?i)client[_-]?id",
             "(?i)token",
@@ -124,7 +120,7 @@ public class SpotifyAuthModule: Module {
         let eventData: [String: Any] = [
             "success": true,
             "token": token,
-            "error": nil
+            "error": NSNull()  // Use NSNull() instead of nil.
         ]
         sendEvent(SPOTIFY_AUTHORIZATION_EVENT_NAME, eventData)
     }
@@ -134,8 +130,8 @@ public class SpotifyAuthModule: Module {
         secureLog("User signed out")
         let eventData: [String: Any] = [
             "success": true,
-            "token": nil,
-            "error": nil
+            "token": NSNull(),  // Use NSNull() instead of nil.
+            "error": NSNull()   // Use NSNull() instead of nil.
         ]
         sendEvent(SPOTIFY_AUTHORIZATION_EVENT_NAME, eventData)
     }
@@ -146,9 +142,9 @@ public class SpotifyAuthModule: Module {
         secureLog("Authorization error: \(sanitizedError)")
         let eventData: [String: Any] = [
             "success": false,
-            "token": nil,
+            "token": NSNull(),  // Use NSNull() instead of nil.
             "error": sanitizedError
         ]
         sendEvent(SPOTIFY_AUTHORIZATION_EVENT_NAME, eventData)
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superfan-app/spotify-auth",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "description": "Spotify OAuth module for Expo",
   "main": "src/index.ts",
   "types": "build/index.d.ts",