@logto/browser 0.1.2 → 0.1.3

package/lib/index.d.ts

@@ -31,23 +31,25 @@ export default class LogtoClient {
     protected logtoStorageKey: string;
     protected requester: Requester;
     protected accessTokenMap: Map<string, AccessToken>;
+    private readonly getAccessTokenPromiseMap;
     private _refreshToken;
     private _idToken;
     constructor(logtoConfig: LogtoConfig, requester?: <T>(input: RequestInfo, init?: RequestInit | undefined) => Promise<T>);
     get isAuthenticated(): boolean;
     protected get signInSession(): Nullable<LogtoSignInSessionItem>;
     protected set signInSession(logtoSignInSessionItem: Nullable<LogtoSignInSessionItem>);
-    private get refreshToken();
+    get refreshToken(): Nullable<string>;
     private set refreshToken(value);
-    private get idToken();
+    get idToken(): Nullable<string>;
     private set idToken(value);
-    getAccessToken(resource?: string): Promise<Nullable<string>>;
+    getAccessToken(resource?: string): Promise<string>;
     getIdTokenClaims(): IdTokenClaims;
     fetchUserInfo(): Promise<UserInfoResponse>;
     signIn(redirectUri: string): Promise<void>;
     isSignInRedirected(url: string): boolean;
     handleSignInCallback(callbackUri: string): Promise<void>;
     signOut(postLogoutRedirectUri?: string): Promise<void>;
+    private getAccessTokenByRefreshToken;
     private getOidcConfig;
     private verifyIdToken;
     private saveCodeToken;

package/lib/index.js

@@ -25,6 +25,7 @@ exports.LogtoSignInSessionItemSchema = (0, superstruct_1.type)({
 class LogtoClient {
     constructor(logtoConfig, requester = (0, js_1.createRequester)()) {
         this.accessTokenMap = new Map();
+        this.getAccessTokenPromiseMap = new Map();
         this.logtoConfig = logtoConfig;
         this.logtoStorageKey = (0, utils_1.buildLogtoKey)(logtoConfig.clientId);
         this.requester = requester;
@@ -89,33 +90,24 @@ class LogtoClient {
         if (accessToken && accessToken.expiresAt > Date.now() / 1000) {
             return accessToken.token;
         }
-        // Token expired, remove it from the map
-        if (accessToken) {
-            this.accessTokenMap.delete(accessTokenKey);
-        }
-        // Fetch new access token by refresh token
-        const { clientId } = this.logtoConfig;
-        if (!this.refreshToken) {
-            throw new errors_1.LogtoClientError('not_authenticated');
-        }
-        try {
-            const { tokenEndpoint } = await this.getOidcConfig();
-            const { accessToken, refreshToken, idToken, scope, expiresIn } = await (0, js_1.fetchTokenByRefreshToken)({ clientId, tokenEndpoint, refreshToken: this.refreshToken, resource }, this.requester);
-            this.accessTokenMap.set(accessTokenKey, {
-                token: accessToken,
-                scope,
-                expiresAt: Math.round(Date.now() / 1000) + expiresIn,
-            });
-            this.refreshToken = refreshToken;
-            if (idToken) {
-                await this.verifyIdToken(idToken);
-                this.idToken = idToken;
-            }
-            return accessToken;
-        }
-        catch (error) {
-            throw new errors_1.LogtoClientError('get_access_token_by_refresh_token_failed', error);
-        }
+        /**
+         * Token has expired, need to fetch a new one using refresh token.
+         * Reuse the cached promise if exists.
+         */
+        const cachedPromise = this.getAccessTokenPromiseMap.get(accessTokenKey);
+        if (cachedPromise) {
+            return cachedPromise;
+        }
+        /**
+         * Create a new promise and cache in map to avoid race condition.
+         * Since we enable "refresh token rotation" by default,
+         * it will be problematic when calling multiple `getAccessToken()` closely.
+         */
+        const promise = this.getAccessTokenByRefreshToken(resource);
+        this.getAccessTokenPromiseMap.set(accessTokenKey, promise);
+        const token = await promise;
+        this.getAccessTokenPromiseMap.delete(accessTokenKey);
+        return token;
     }
     getIdTokenClaims() {
         if (!this.idToken) {
@@ -202,6 +194,36 @@ class LogtoClient {
         this.idToken = null;
         window.location.assign(url);
     }
+    async getAccessTokenByRefreshToken(resource) {
+        const accessTokenKey = (0, utils_1.buildAccessTokenKey)(resource);
+        // Token expired, remove it from the map
+        if (this.accessTokenMap.has(accessTokenKey)) {
+            this.accessTokenMap.delete(accessTokenKey);
+        }
+        // Fetch new access token by refresh token
+        const { clientId } = this.logtoConfig;
+        if (!this.refreshToken) {
+            throw new errors_1.LogtoClientError('not_authenticated');
+        }
+        try {
+            const { tokenEndpoint } = await this.getOidcConfig();
+            const { accessToken, refreshToken, idToken, scope, expiresIn } = await (0, js_1.fetchTokenByRefreshToken)({ clientId, tokenEndpoint, refreshToken: this.refreshToken, resource }, this.requester);
+            this.accessTokenMap.set(accessTokenKey, {
+                token: accessToken,
+                scope,
+                expiresAt: Math.round(Date.now() / 1000) + expiresIn,
+            });
+            this.refreshToken = refreshToken;
+            if (idToken) {
+                await this.verifyIdToken(idToken);
+                this.idToken = idToken;
+            }
+            return accessToken;
+        }
+        catch (error) {
+            throw new errors_1.LogtoClientError('get_access_token_by_refresh_token_failed', error);
+        }
+    }
     async getOidcConfig() {
         if (!this.oidcConfig) {
             const { endpoint } = this.logtoConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/browser",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "./lib/index.js",
   "exports": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -8,6 +8,11 @@
     "lib"
   ],
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/logto-io/js.git",
+    "directory": "packages/browser"
+  },
   "scripts": {
     "dev:tsc": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
     "preinstall": "npx only-allow pnpm",
@@ -19,7 +24,7 @@
     "prepack": "pnpm test && pnpm build"
   },
   "dependencies": {
-    "@logto/js": "^0.1.2",
+    "@logto/js": "^0.1.3",
     "@silverhand/essentials": "^1.1.6",
     "jose": "^4.5.0",
     "lodash.get": "^4.4.2",
@@ -48,5 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "74bd01ec73a5215b26a96f426b874de9ad474dae"
+  "gitHead": "2a59d35046744dd1284eb81804cf0ef9a35f41e6"
 }