@logto/browser 0.1.4 → 0.1.10

package/lib/index.d.ts

@@ -1,11 +1,12 @@
 import { IdTokenClaims, Requester, UserInfoResponse } from '@logto/js';
 import { Nullable } from '@silverhand/essentials';
 import { Infer } from 'superstruct';
-export type { IdTokenClaims, UserInfoResponse } from '@logto/js';
+export type { IdTokenClaims, UserInfoResponse, LogtoErrorCode } from '@logto/js';
+export { LogtoError, OidcError } from '@logto/js';
 export * from './errors';
 export declare type LogtoConfig = {
     endpoint: string;
-    clientId: string;
+    appId: string;
     scopes?: string[];
     resources?: string[];
     usingPersistStorage?: boolean;
@@ -41,7 +42,6 @@ export default class LogtoClient {
     protected readonly requester: Requester;
     protected readonly 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;

package/lib/index.js

@@ -13,13 +13,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogtoSignInSessionItemSchema = void 0;
+exports.LogtoSignInSessionItemSchema = exports.OidcError = exports.LogtoError = void 0;
 const js_1 = require("@logto/js");
 const jose_1 = require("jose");
 const lodash_once_1 = __importDefault(require("lodash.once"));
 const superstruct_1 = require("superstruct");
 const errors_1 = require("./errors");
 const utils_1 = require("./utils");
+var js_2 = require("@logto/js");
+Object.defineProperty(exports, "LogtoError", { enumerable: true, get: function () { return js_2.LogtoError; } });
+Object.defineProperty(exports, "OidcError", { enumerable: true, get: function () { return js_2.OidcError; } });
 __exportStar(require("./errors"), exports);
 exports.LogtoSignInSessionItemSchema = (0, superstruct_1.type)({
     redirectUri: (0, superstruct_1.string)(),
@@ -33,9 +36,8 @@ class LogtoClient {
         this.accessTokenMap = new Map();
         this.getAccessTokenPromiseMap = new Map();
         this.logtoConfig = logtoConfig;
-        this.logtoStorageKey = (0, utils_1.buildLogtoKey)(logtoConfig.clientId);
+        this.logtoStorageKey = (0, utils_1.buildLogtoKey)(logtoConfig.appId);
         this.requester = requester;
-        this._refreshToken = localStorage.getItem((0, utils_1.buildRefreshTokenKey)(this.logtoStorageKey));
         this._idToken = localStorage.getItem((0, utils_1.buildIdTokenKey)(this.logtoStorageKey));
     }
     get isAuthenticated() {
@@ -64,10 +66,9 @@ class LogtoClient {
         sessionStorage.setItem(this.logtoStorageKey, jsonItem);
     }
     get refreshToken() {
-        return this._refreshToken;
+        return localStorage.getItem((0, utils_1.buildRefreshTokenKey)(this.logtoStorageKey));
     }
     set refreshToken(refreshToken) {
-        this._refreshToken = refreshToken;
         const refreshTokenKey = (0, utils_1.buildRefreshTokenKey)(this.logtoStorageKey);
         if (!refreshToken) {
             localStorage.removeItem(refreshTokenKey);
@@ -87,6 +88,7 @@ class LogtoClient {
         }
         localStorage.setItem(idTokenKey, idToken);
     }
+    // eslint-disable-next-line complexity
     async getAccessToken(resource) {
         if (!this.idToken) {
             throw new errors_1.LogtoClientError('not_authenticated');
@@ -134,7 +136,7 @@ class LogtoClient {
         return (0, js_1.fetchUserInfo)(userinfoEndpoint, accessToken, this.requester);
     }
     async signIn(redirectUri) {
-        const { clientId, resources, scopes: customScopes } = this.logtoConfig;
+        const { appId: clientId, resources, scopes: customScopes } = this.logtoConfig;
         const { authorizationEndpoint } = await this.getOidcConfig();
         const codeVerifier = (0, js_1.generateCodeVerifier)();
         const codeChallenge = await (0, js_1.generateCodeChallenge)(codeVerifier);
@@ -150,6 +152,8 @@ class LogtoClient {
             resources,
         });
         this.signInSession = { redirectUri, codeVerifier, state };
+        this.refreshToken = null;
+        this.idToken = null;
         window.location.assign(signInUri);
     }
     isSignInRedirected(url) {
@@ -168,7 +172,7 @@ class LogtoClient {
         }
         const { redirectUri, state, codeVerifier } = signInSession;
         const code = (0, js_1.verifyAndParseCodeFromCallbackUri)(callbackUri, redirectUri, state);
-        const { clientId } = logtoConfig;
+        const { appId: clientId } = logtoConfig;
         const { tokenEndpoint } = await this.getOidcConfig();
         const codeTokenResponse = await (0, js_1.fetchTokenByAuthorizationCode)({
             clientId,
@@ -179,12 +183,13 @@ class LogtoClient {
         }, requester);
         await this.verifyIdToken(codeTokenResponse.idToken);
         this.saveCodeToken(codeTokenResponse);
+        this.signInSession = null;
     }
     async signOut(postLogoutRedirectUri) {
         if (!this.idToken) {
             throw new errors_1.LogtoClientError('not_authenticated');
         }
-        const { clientId } = this.logtoConfig;
+        const { appId: clientId } = this.logtoConfig;
         const { endSessionEndpoint, revocationEndpoint } = await this.getOidcConfig();
         if (this.refreshToken) {
             try {
@@ -210,7 +215,7 @@ class LogtoClient {
         }
         try {
             const accessTokenKey = (0, utils_1.buildAccessTokenKey)(resource);
-            const { clientId } = this.logtoConfig;
+            const { appId: clientId } = this.logtoConfig;
             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, {
@@ -239,11 +244,11 @@ class LogtoClient {
         return (0, jose_1.createRemoteJWKSet)(new URL(jwksUri));
     }
     async verifyIdToken(idToken) {
-        const { clientId } = this.logtoConfig;
+        const { appId } = this.logtoConfig;
         const { issuer } = await this.getOidcConfig();
         const jwtVerifyGetKey = await this.getJwtVerifyGetKey();
         try {
-            await (0, js_1.verifyIdToken)(idToken, clientId, issuer, jwtVerifyGetKey);
+            await (0, js_1.verifyIdToken)(idToken, appId, issuer, jwtVerifyGetKey);
         }
         catch (error) {
             throw new errors_1.LogtoClientError('invalid_id_token', error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/browser",
-  "version": "0.1.4",
+  "version": "0.1.10",
   "main": "./lib/index.js",
   "exports": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -21,10 +21,10 @@
     "lint": "eslint --ext .ts src",
     "test": "jest",
     "test:coverage": "jest --silent --coverage",
-    "prepack": "pnpm test && pnpm build"
+    "prepack": "pnpm test"
   },
   "dependencies": {
-    "@logto/js": "^0.1.3",
+    "@logto/js": "^0.1.10",
     "@silverhand/essentials": "^1.1.6",
     "jose": "^4.5.0",
     "lodash.get": "^4.4.2",
@@ -33,8 +33,8 @@
   },
   "devDependencies": {
     "@jest/types": "^27.5.1",
-    "@silverhand/eslint-config": "^0.9.1",
-    "@silverhand/ts-config": "^0.9.1",
+    "@silverhand/eslint-config": "^0.14.0",
+    "@silverhand/ts-config": "^0.14.0",
     "@types/jest": "^27.4.0",
     "@types/lodash.get": "^4.4.6",
     "@types/lodash.once": "^4.1.6",
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a5eed81a3e3db3184a53f04f843db8ac707dd3ad"
+  "gitHead": "ea6c7b435be8f74baf7fb76336bc0ca7cb7304c4"
 }