@logto/client 2.2.0 → 2.2.1

package/lib/index.cjs

@@ -105,25 +105,38 @@ class LogtoClient {
         return `${origin}${pathname}` === redirectUri;
     }
     async handleSignInCallback(callbackUri) {
-        const { logtoConfig, adapter } = this;
-        const { requester } = adapter;
+        const { requester } = this.adapter;
         const signInSession = await this.getSignInSession();
         if (!signInSession) {
             throw new errors.LogtoClientError('sign_in_session.not_found');
         }
         const { redirectUri, state, codeVerifier } = signInSession;
         const code = js.verifyAndParseCodeFromCallbackUri(callbackUri, redirectUri, state);
-        const { appId: clientId } = logtoConfig;
+        // NOTE: Will add scope to accessTokenKey when needed. (Linear issue LOG-1589)
+        const accessTokenKey = index$2.buildAccessTokenKey();
+        const { appId: clientId } = this.logtoConfig;
         const { tokenEndpoint } = await this.getOidcConfig();
-        const codeTokenResponse = await js.fetchTokenByAuthorizationCode({
+        const requestedAt = Math.round(Date.now() / 1000);
+        const { idToken, refreshToken, accessToken, scope, expiresIn } = await js.fetchTokenByAuthorizationCode({
             clientId,
             tokenEndpoint,
             redirectUri,
             codeVerifier,
             code,
         }, requester);
-        await this.verifyIdToken(codeTokenResponse.idToken);
-        await this.saveCodeToken(codeTokenResponse);
+        await this.verifyIdToken(idToken);
+        await this.setRefreshToken(refreshToken ?? null);
+        await this.setIdToken(idToken);
+        this.accessTokenMap.set(accessTokenKey, {
+            token: accessToken,
+            scope,
+            /** The `expiresAt` variable provides an approximate estimation of the actual `exp` property
+             * in the token claims. It is utilized by the client to determine if the cached access token
+             * has expired and when a new access token should be requested.
+             */
+            expiresAt: requestedAt + expiresIn,
+        });
+        await this.saveAccessTokenMap();
         await this.setSignInSession(null);
     }
     async signOut(postLogoutRedirectUri) {
@@ -177,6 +190,7 @@ class LogtoClient {
         const accessTokenKey = index$2.buildAccessTokenKey(resource);
         const { appId: clientId } = this.logtoConfig;
         const { tokenEndpoint } = await this.getOidcConfig();
+        const requestedAt = Math.round(Date.now() / 1000);
         const { accessToken, refreshToken, idToken, scope, expiresIn } = await js.fetchTokenByRefreshToken({
             clientId,
             tokenEndpoint,
@@ -186,7 +200,11 @@ class LogtoClient {
         this.accessTokenMap.set(accessTokenKey, {
             token: accessToken,
             scope,
-            expiresAt: Math.round(Date.now() / 1000) + expiresIn,
+            /** The `expiresAt` variable provides an approximate estimation of the actual `exp` property
+             * in the token claims. It is utilized by the client to determine if the cached access token
+             * has expired and when a new access token should be requested.
+             */
+            expiresAt: requestedAt + expiresIn,
         });
         await this.saveAccessTokenMap();
         await this.setRefreshToken(refreshToken);
@@ -202,15 +220,6 @@ class LogtoClient {
         const jwtVerifyGetKey = await this.getJwtVerifyGetKey();
         await js.verifyIdToken(idToken, appId, issuer, jwtVerifyGetKey);
     }
-    async saveCodeToken({ refreshToken, idToken, scope, accessToken, expiresIn, }) {
-        await this.setRefreshToken(refreshToken ?? null);
-        await this.setIdToken(idToken);
-        // NOTE: Will add scope to accessTokenKey when needed. (Linear issue LOG-1589)
-        const accessTokenKey = index$2.buildAccessTokenKey();
-        const expiresAt = Date.now() / 1000 + expiresIn;
-        this.accessTokenMap.set(accessTokenKey, { token: accessToken, scope, expiresAt });
-        await this.saveAccessTokenMap();
-    }
     async saveAccessTokenMap() {
         const data = {};
         for (const [key, accessToken] of this.accessTokenMap.entries()) {

package/lib/index.d.ts

@@ -43,7 +43,6 @@ export default class LogtoClient {
     private setRefreshToken;
     private getAccessTokenByRefreshToken;
     private verifyIdToken;
-    private saveCodeToken;
     private saveAccessTokenMap;
     private loadAccessTokenMap;
 }

package/lib/index.js

@@ -102,25 +102,38 @@ class LogtoClient {
         return `${origin}${pathname}` === redirectUri;
     }
     async handleSignInCallback(callbackUri) {
-        const { logtoConfig, adapter } = this;
-        const { requester } = adapter;
+        const { requester } = this.adapter;
         const signInSession = await this.getSignInSession();
         if (!signInSession) {
             throw new LogtoClientError('sign_in_session.not_found');
         }
         const { redirectUri, state, codeVerifier } = signInSession;
         const code = verifyAndParseCodeFromCallbackUri(callbackUri, redirectUri, state);
-        const { appId: clientId } = logtoConfig;
+        // NOTE: Will add scope to accessTokenKey when needed. (Linear issue LOG-1589)
+        const accessTokenKey = buildAccessTokenKey();
+        const { appId: clientId } = this.logtoConfig;
         const { tokenEndpoint } = await this.getOidcConfig();
-        const codeTokenResponse = await fetchTokenByAuthorizationCode({
+        const requestedAt = Math.round(Date.now() / 1000);
+        const { idToken, refreshToken, accessToken, scope, expiresIn } = await fetchTokenByAuthorizationCode({
             clientId,
             tokenEndpoint,
             redirectUri,
             codeVerifier,
             code,
         }, requester);
-        await this.verifyIdToken(codeTokenResponse.idToken);
-        await this.saveCodeToken(codeTokenResponse);
+        await this.verifyIdToken(idToken);
+        await this.setRefreshToken(refreshToken ?? null);
+        await this.setIdToken(idToken);
+        this.accessTokenMap.set(accessTokenKey, {
+            token: accessToken,
+            scope,
+            /** The `expiresAt` variable provides an approximate estimation of the actual `exp` property
+             * in the token claims. It is utilized by the client to determine if the cached access token
+             * has expired and when a new access token should be requested.
+             */
+            expiresAt: requestedAt + expiresIn,
+        });
+        await this.saveAccessTokenMap();
         await this.setSignInSession(null);
     }
     async signOut(postLogoutRedirectUri) {
@@ -174,6 +187,7 @@ class LogtoClient {
         const accessTokenKey = buildAccessTokenKey(resource);
         const { appId: clientId } = this.logtoConfig;
         const { tokenEndpoint } = await this.getOidcConfig();
+        const requestedAt = Math.round(Date.now() / 1000);
         const { accessToken, refreshToken, idToken, scope, expiresIn } = await fetchTokenByRefreshToken({
             clientId,
             tokenEndpoint,
@@ -183,7 +197,11 @@ class LogtoClient {
         this.accessTokenMap.set(accessTokenKey, {
             token: accessToken,
             scope,
-            expiresAt: Math.round(Date.now() / 1000) + expiresIn,
+            /** The `expiresAt` variable provides an approximate estimation of the actual `exp` property
+             * in the token claims. It is utilized by the client to determine if the cached access token
+             * has expired and when a new access token should be requested.
+             */
+            expiresAt: requestedAt + expiresIn,
         });
         await this.saveAccessTokenMap();
         await this.setRefreshToken(refreshToken);
@@ -199,15 +217,6 @@ class LogtoClient {
         const jwtVerifyGetKey = await this.getJwtVerifyGetKey();
         await verifyIdToken(idToken, appId, issuer, jwtVerifyGetKey);
     }
-    async saveCodeToken({ refreshToken, idToken, scope, accessToken, expiresIn, }) {
-        await this.setRefreshToken(refreshToken ?? null);
-        await this.setIdToken(idToken);
-        // NOTE: Will add scope to accessTokenKey when needed. (Linear issue LOG-1589)
-        const accessTokenKey = buildAccessTokenKey();
-        const expiresAt = Date.now() / 1000 + expiresIn;
-        this.accessTokenMap.set(accessTokenKey, { token: accessToken, scope, expiresAt });
-        await this.saveAccessTokenMap();
-    }
     async saveAccessTokenMap() {
         const data = {};
         for (const [key, accessToken] of this.accessTokenMap.entries()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/client",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "type": "module",
   "main": "./lib/index.cjs",
   "module": "./lib/index.js",
@@ -27,18 +27,18 @@
     "jose": "^4.13.2"
   },
   "devDependencies": {
-    "@silverhand/eslint-config": "^3.0.1",
-    "@silverhand/ts-config": "^3.0.0",
+    "@silverhand/eslint-config": "^4.0.1",
+    "@silverhand/ts-config": "^4.0.0",
     "@swc/core": "^1.3.50",
     "@swc/jest": "^0.2.24",
     "@types/jest": "^29.5.0",
     "@types/node": "^18.0.0",
-    "eslint": "^8.38.0",
+    "eslint": "^8.44.0",
     "jest": "^29.5.0",
     "jest-matcher-specific-error": "^1.0.0",
     "lint-staged": "^13.0.0",
     "nock": "^13.3.0",
-    "prettier": "^2.8.7",
+    "prettier": "^3.0.0",
     "text-encoder": "^0.0.4",
     "type-fest": "^3.0.0",
     "typescript": "^5.0.0"