authkit-react-native 0.1.2 → 0.1.3

package/dist/index.js

@@ -5,6 +5,7 @@ import {
   makeRedirectUri,
   RefreshTokenRequest,
   RevokeTokenRequest,
+  TokenError,
   TokenResponse
 } from "expo-auth-session";
 import * as WebBrowser from "expo-web-browser";
@@ -86,85 +87,114 @@ function createAuthStore(config) {
     ]);
     return meta;
   }
-  const store = createStore()((set) => ({
-    isLoading: true,
-    signIn: async ({ screenHint = "sign-in" } = {}) => {
-      const authSessionRequest = new AuthRequest({
-        clientId,
-        redirectUri,
-        extraParams: { provider: "authkit", screen_hint: screenHint }
-      });
-      const authSessionResult = await authSessionRequest.promptAsync({
-        authorizationEndpoint
-      });
-      if (authSessionResult.type === "error") {
-        throw new Error(
-          authSessionResult.error?.description ?? "Unknown error"
-        );
+  const store = createStore()((set) => {
+    let refreshInFlight = null;
+    function refreshSession(tokenResponse) {
+      if (!refreshInFlight) {
+        refreshInFlight = (async () => {
+          try {
+            const refreshTokenRequest = new RefreshTokenRequest({
+              refreshToken: tokenResponse.refreshToken,
+              clientId
+            });
+            const refreshed = await refreshTokenRequest.performAsync({
+              tokenEndpoint
+            });
+            const meta = await storeTokenResponse(refreshed);
+            set(meta);
+            return refreshed.accessToken;
+          } finally {
+            refreshInFlight = null;
+          }
+        })();
       }
-      if (authSessionResult.type !== "success") {
-        return false;
-      }
-      if (authSessionRequest.state !== authSessionResult.params.state) {
-        throw new Error("State mismatch");
-      }
-      if (!authSessionRequest.codeVerifier) {
-        throw new Error("Code verifier missing");
-      }
-      const tokenRequest = new AccessTokenRequest({
-        code: authSessionResult.params.code,
-        clientId,
-        redirectUri,
-        extraParams: {
-          code_verifier: authSessionRequest.codeVerifier
+      return refreshInFlight;
+    }
+    return {
+      isLoading: true,
+      signIn: async ({ screenHint = "sign-in" } = {}) => {
+        const authSessionRequest = new AuthRequest({
+          clientId,
+          redirectUri,
+          extraParams: { provider: "authkit", screen_hint: screenHint }
+        });
+        const authSessionResult = await authSessionRequest.promptAsync({
+          authorizationEndpoint
+        });
+        if (authSessionResult.type === "error") {
+          throw new Error(
+            authSessionResult.error?.description ?? "Unknown error"
+          );
         }
-      });
-      const tokenResponse = await tokenRequest.performAsync({ tokenEndpoint });
-      const meta = await storeTokenResponse(tokenResponse);
-      set(meta);
-      return true;
-    },
-    signOut: async () => {
-      const tokenResponse = await readTokenResponse();
-      if (tokenResponse?.accessToken) {
-        const revokeTokenRequest = new RevokeTokenRequest({
+        if (authSessionResult.type !== "success") {
+          return false;
+        }
+        if (authSessionRequest.state !== authSessionResult.params.state) {
+          throw new Error("State mismatch");
+        }
+        if (!authSessionRequest.codeVerifier) {
+          throw new Error("Code verifier missing");
+        }
+        const tokenRequest = new AccessTokenRequest({
+          code: authSessionResult.params.code,
           clientId,
-          token: tokenResponse.accessToken
+          redirectUri,
+          extraParams: {
+            code_verifier: authSessionRequest.codeVerifier
+          }
         });
-        await revokeTokenRequest.performAsync({ revocationEndpoint });
-      }
-      await storage.clear();
-      set(emptySession);
-    },
-    getAccessToken: async (options) => {
-      const forceRefresh = options?.forceRefresh ?? false;
-      try {
-        let tokenResponse = await readTokenResponse();
-        if (!tokenResponse) {
+        const tokenResponse = await tokenRequest.performAsync({
+          tokenEndpoint
+        });
+        const meta = await storeTokenResponse(tokenResponse);
+        set(meta);
+        return true;
+      },
+      signOut: async () => {
+        try {
+          const tokenResponse = await readTokenResponse();
+          if (tokenResponse?.accessToken) {
+            const revokeTokenRequest = new RevokeTokenRequest({
+              clientId,
+              token: tokenResponse.accessToken
+            });
+            await revokeTokenRequest.performAsync({ revocationEndpoint });
+          }
+        } catch (error) {
+          if (devMode) console.error(error);
+        } finally {
           await storage.clear();
           set(emptySession);
-          return null;
         }
-        if (forceRefresh || tokenResponse.shouldRefresh()) {
-          const refreshTokenRequest = new RefreshTokenRequest({
-            refreshToken: tokenResponse.refreshToken,
-            clientId
-          });
-          tokenResponse = await refreshTokenRequest.performAsync({
-            tokenEndpoint
-          });
-          const meta = await storeTokenResponse(tokenResponse);
-          set(meta);
+      },
+      getAccessToken: async (options) => {
+        const forceRefresh = options?.forceRefresh ?? false;
+        try {
+          const tokenResponse = await readTokenResponse();
+          if (!tokenResponse) {
+            await storage.clear();
+            set(emptySession);
+            return null;
+          }
+          if (forceRefresh || tokenResponse.shouldRefresh()) {
+            try {
+              return await refreshSession(tokenResponse);
+            } catch (error) {
+              if (error instanceof TokenError) throw error;
+              if (devMode) console.error(error);
+              return TokenResponse.isTokenFresh(tokenResponse) ? tokenResponse.accessToken : null;
+            }
+          }
+          return tokenResponse.accessToken;
+        } catch (error) {
+          if (devMode) console.error(error);
+          await storage.clear();
+          set(emptySession);
+          return null;
         }
-        return tokenResponse.accessToken;
-      } catch (error) {
-        if (devMode) console.error(error);
-        await storage.clear();
-        set(emptySession);
-        return null;
       }
-    }
-  }));
+    };
+  });
   (async () => {
     try {
       const storedMeta = await storage.readMeta();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authkit-react-native",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "WorkOS AuthKit integration for React Native — OAuth 2.0 PKCE auth with token storage, session restoration, and automatic refresh",
   "license": "MIT",
   "type": "module",
@@ -56,12 +56,12 @@
   "devDependencies": {
     "@changesets/changelog-github": "^0.7.0",
     "@changesets/cli": "^2.30.0",
-    "@react-native-async-storage/async-storage": "^2.2.0",
+    "@react-native-async-storage/async-storage": "^3.1.1",
     "@vitest/coverage-v8": "^4.1.0",
-    "expo-auth-session": "^55.0.7",
-    "expo-secure-store": "^55.0.8",
-    "expo-web-browser": "^55.0.9",
-    "lint-staged": "^16.1.0",
+    "expo-auth-session": "^57.0.1",
+    "expo-secure-store": "^57.0.0",
+    "expo-web-browser": "^57.0.0",
+    "lint-staged": "^17.0.8",
     "prettier": "^3.8.1",
     "react": "^19.2.0",
     "simple-git-hooks": "^2.13.0",