@idealyst/oauth-client 1.0.73 → 1.0.75

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@idealyst/oauth-client",
-  "version": "1.0.73",
+  "version": "1.0.75",
   "description": "Universal OAuth2 client for web and React Native",
   "main": "src/index.ts",
   "module": "src/index.ts",
   "types": "src/index.ts",
   "exports": {
     ".": {
-      "types": "./src/index.d.ts",
-      "import": "./src/index.mjs",
-      "require": "./src/index.js"
+      "import": "./src/index.ts",
+      "require": "./src/index.ts",
+      "types": "./src/index.ts"
     }
   },
   "scripts": {
@@ -30,7 +30,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@idealyst/storage": "1.0.73"
+    "@idealyst/storage": "1.0.75",
+    "crypto": "^1.0.1"
   },
   "devDependencies": {
     "@types/react": "^18.3.18",
@@ -41,7 +42,8 @@
     "typescript": "^5.7.3"
   },
   "peerDependencies": {
-    "@idealyst/storage": "1.0.73"
+    "@idealyst/storage": "1.0.75",
+    "react-native": ">=0.60.0"
   },
   "files": [
     "dist",

package/src/index.ts

@@ -1,10 +1 @@
-// This file should not be used - use index.web.ts or index.native.ts instead
-export * from './types'
-
-// Fallback export that throws an error
-export function createOAuthClient(): never {
-  throw new Error(
-    '@idealyst/oauth-client: Platform-specific bundle not found. ' +
-    'Make sure your bundler is configured to use .web.ts or .native.ts files.'
-  )
-}
+export * from './index.web'

package/src/oauth-client.native.ts

@@ -35,6 +35,7 @@ export class NativeOAuthClient implements OAuthClient {
   private async waitForDeepLinkCallback(): Promise<{ code?: string; error?: string; state?: string }> {
     return new Promise((resolve, reject) => {
       let subscription: any
+      let timeoutId: NodeJS.Timeout | null = null
       
       const handleUrl = (event: { url: string }) => {
         const callbackData = this.parseDeepLink(event.url)
@@ -47,6 +48,12 @@ export class NativeOAuthClient implements OAuthClient {
       const cleanup = () => {
         if (subscription?.remove) {
           subscription.remove()
+        } else if (subscription) {
+          // For newer React Native versions
+          subscription()
+        }
+        if (timeoutId) {
+          clearTimeout(timeoutId)
         }
       }
 
@@ -60,13 +67,15 @@ export class NativeOAuthClient implements OAuthClient {
             return
           }
         }
+      }).catch(error => {
+        console.warn('Failed to get initial URL:', error)
       })
 
       // Listen for subsequent deep links
       subscription = Linking.addEventListener('url', handleUrl)
 
       // Timeout after 5 minutes
-      setTimeout(() => {
+      timeoutId = setTimeout(() => {
         cleanup()
         reject(new Error('OAuth timeout - user did not complete authorization'))
       }, 5 * 60 * 1000)
@@ -75,6 +84,7 @@ export class NativeOAuthClient implements OAuthClient {
 
   private parseDeepLink(url: string): { code?: string; error?: string; state?: string } | null {
     try {
+      // Handle custom scheme URLs (e.g., com.myapp://oauth/callback?code=123)
       const parsedUrl = new URL(url)
       
       // Check if this is our OAuth callback
@@ -83,11 +93,27 @@ export class NativeOAuthClient implements OAuthClient {
         return null
       }
 
-      // Extract OAuth parameters
+      // For custom schemes, parameters are in the query string
       const code = parsedUrl.searchParams.get('code')
       const error = parsedUrl.searchParams.get('error')
       const state = parsedUrl.searchParams.get('state')
 
+      // Also check the hash fragment for parameters (some OAuth providers use this)
+      if (!code && !error && parsedUrl.hash) {
+        const hashParams = new URLSearchParams(parsedUrl.hash.substring(1))
+        const hashCode = hashParams.get('code')
+        const hashError = hashParams.get('error')
+        const hashState = hashParams.get('state')
+        
+        if (hashCode || hashError) {
+          return {
+            code: hashCode || undefined,
+            error: hashError || undefined,
+            state: hashState || undefined
+          }
+        }
+      }
+
       if (!code && !error) {
         return null
       }
@@ -98,6 +124,7 @@ export class NativeOAuthClient implements OAuthClient {
         state: state || undefined 
       }
     } catch (error) {
+      console.warn('Failed to parse deep link URL:', url, error)
       return null
     }
   }

package/src/oauth-client.web.ts

@@ -1,5 +1,5 @@
 import type { OAuthClient, OAuthConfig, OAuthResult } from './types'
-
+import crypto from 'crypto'
 export class WebOAuthClient implements OAuthClient {
   private config: OAuthConfig
 
@@ -8,6 +8,7 @@ export class WebOAuthClient implements OAuthClient {
   }
 
   async authorize(): Promise<OAuthResult> {
+    console.log("AAAAAA")
     const state = this.generateState()
 
     // Check if we're already in a callback