@imtbl/sdk 0.22.1 → 0.22.2

package/dist/index.cjs

@@ -3009,7 +3009,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.22.1' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.22.2' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -3069,7 +3069,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.22.1',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.22.2',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -3355,7 +3355,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.22.1',
+    sdkVersion: 'ts-immutable-sdk-0.22.2',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -7925,6 +7925,22 @@ class DeviceCredentialsManager {
     }
 }
 
+function isIdTokenExpired(idToken) {
+    if (!idToken) {
+        return false;
+    }
+    const decodedToken = jwt_decode(idToken);
+    const now = Math.floor(Date.now() / 1000);
+    return decodedToken.exp < now;
+}
+function isTokenExpired(oidcUser) {
+    const { id_token: idToken, expired } = oidcUser;
+    if (expired) {
+        return true;
+    }
+    return isIdTokenExpired(idToken);
+}
+
 const formUrlEncodedHeader = {
     headers: {
         'Content-Type': 'application/x-www-form-urlencoded',
@@ -8202,23 +8218,30 @@ class AuthManager {
         }, PassportErrorType.LOGOUT_ERROR);
     }
     async loginSilent() {
-        return withPassportError(async () => {
-            const existedUser = await this.getUser();
-            if (!existedUser) {
-                return null;
-            }
-            const oidcUser = await this.userManager.signinSilent();
-            if (!oidcUser) {
-                return null;
-            }
+        return withPassportError(async () => this.getUser(), PassportErrorType.SILENT_LOGIN_ERROR);
+    }
+    async getWebUser() {
+        const oidcUser = await this.userManager.getUser();
+        if (!oidcUser) {
+            return null;
+        }
+        const tokenExpired = isTokenExpired(oidcUser);
+        if (!tokenExpired) {
             return AuthManager.mapOidcUserToDomainModel(oidcUser);
-        }, PassportErrorType.SILENT_LOGIN_ERROR);
+        }
+        if (oidcUser.refresh_token) {
+            const newOidcUser = await this.userManager.signinSilent();
+            if (newOidcUser) {
+                return AuthManager.mapOidcUserToDomainModel(newOidcUser);
+            }
+        }
+        return null;
     }
     async getUser() {
         return withPassportError(async () => {
-            const oidcUser = await this.userManager.getUser();
-            if (oidcUser) {
-                return AuthManager.mapOidcUserToDomainModel(oidcUser);
+            const user = await this.getWebUser();
+            if (user) {
+                return user;
             }
             const deviceToken = this.deviceCredentialsManager.getCredentials();
             if (deviceToken) {
@@ -31996,7 +32019,7 @@ var checkout_sdk = /*#__PURE__*/Object.freeze({
 function $parcel$export(e, n, v, s) {
   Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
 }
-const $d663162fd5a0853f$export$38a083d9fb5551ca = "0.22.1";
+const $d663162fd5a0853f$export$38a083d9fb5551ca = "0.22.2";
 const $d663162fd5a0853f$export$83bf90b30cdfd29f = ()=>false;
 const $d663162fd5a0853f$export$1169f5475725171b = ()=>$d663162fd5a0853f$export$38a083d9fb5551ca;
 

package/dist/index.js

@@ -2987,7 +2987,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.22.1' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.22.2' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -3047,7 +3047,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.22.1',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.22.2',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -3333,7 +3333,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.22.1',
+    sdkVersion: 'ts-immutable-sdk-0.22.2',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -7903,6 +7903,22 @@ class DeviceCredentialsManager {
     }
 }
 
+function isIdTokenExpired(idToken) {
+    if (!idToken) {
+        return false;
+    }
+    const decodedToken = jwt_decode(idToken);
+    const now = Math.floor(Date.now() / 1000);
+    return decodedToken.exp < now;
+}
+function isTokenExpired(oidcUser) {
+    const { id_token: idToken, expired } = oidcUser;
+    if (expired) {
+        return true;
+    }
+    return isIdTokenExpired(idToken);
+}
+
 const formUrlEncodedHeader = {
     headers: {
         'Content-Type': 'application/x-www-form-urlencoded',
@@ -8180,23 +8196,30 @@ class AuthManager {
         }, PassportErrorType.LOGOUT_ERROR);
     }
     async loginSilent() {
-        return withPassportError(async () => {
-            const existedUser = await this.getUser();
-            if (!existedUser) {
-                return null;
-            }
-            const oidcUser = await this.userManager.signinSilent();
-            if (!oidcUser) {
-                return null;
-            }
+        return withPassportError(async () => this.getUser(), PassportErrorType.SILENT_LOGIN_ERROR);
+    }
+    async getWebUser() {
+        const oidcUser = await this.userManager.getUser();
+        if (!oidcUser) {
+            return null;
+        }
+        const tokenExpired = isTokenExpired(oidcUser);
+        if (!tokenExpired) {
             return AuthManager.mapOidcUserToDomainModel(oidcUser);
-        }, PassportErrorType.SILENT_LOGIN_ERROR);
+        }
+        if (oidcUser.refresh_token) {
+            const newOidcUser = await this.userManager.signinSilent();
+            if (newOidcUser) {
+                return AuthManager.mapOidcUserToDomainModel(newOidcUser);
+            }
+        }
+        return null;
     }
     async getUser() {
         return withPassportError(async () => {
-            const oidcUser = await this.userManager.getUser();
-            if (oidcUser) {
-                return AuthManager.mapOidcUserToDomainModel(oidcUser);
+            const user = await this.getWebUser();
+            if (user) {
+                return user;
             }
             const deviceToken = this.deviceCredentialsManager.getCredentials();
             if (deviceToken) {
@@ -31974,7 +31997,7 @@ var checkout_sdk = /*#__PURE__*/Object.freeze({
 function $parcel$export(e, n, v, s) {
   Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
 }
-const $d663162fd5a0853f$export$38a083d9fb5551ca = "0.22.1";
+const $d663162fd5a0853f$export$38a083d9fb5551ca = "0.22.2";
 const $d663162fd5a0853f$export$83bf90b30cdfd29f = ()=>false;
 const $d663162fd5a0853f$export$1169f5475725171b = ()=>$d663162fd5a0853f$export$38a083d9fb5551ca;
 

package/dist/passport.js

@@ -1785,7 +1785,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-0.22.1' };
+const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-0.22.2' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -1841,7 +1841,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.22.1',
+    sdkVersion: 'ts-immutable-sdk-0.22.2',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -6394,6 +6394,22 @@ class DeviceCredentialsManager {
     }
 }
 
+function isIdTokenExpired(idToken) {
+    if (!idToken) {
+        return false;
+    }
+    const decodedToken = jwt_decode(idToken);
+    const now = Math.floor(Date.now() / 1000);
+    return decodedToken.exp < now;
+}
+function isTokenExpired(oidcUser) {
+    const { id_token: idToken, expired } = oidcUser;
+    if (expired) {
+        return true;
+    }
+    return isIdTokenExpired(idToken);
+}
+
 const formUrlEncodedHeader = {
     headers: {
         'Content-Type': 'application/x-www-form-urlencoded',
@@ -6671,23 +6687,30 @@ class AuthManager {
         }, PassportErrorType.LOGOUT_ERROR);
     }
     async loginSilent() {
-        return withPassportError(async () => {
-            const existedUser = await this.getUser();
-            if (!existedUser) {
-                return null;
-            }
-            const oidcUser = await this.userManager.signinSilent();
-            if (!oidcUser) {
-                return null;
-            }
+        return withPassportError(async () => this.getUser(), PassportErrorType.SILENT_LOGIN_ERROR);
+    }
+    async getWebUser() {
+        const oidcUser = await this.userManager.getUser();
+        if (!oidcUser) {
+            return null;
+        }
+        const tokenExpired = isTokenExpired(oidcUser);
+        if (!tokenExpired) {
             return AuthManager.mapOidcUserToDomainModel(oidcUser);
-        }, PassportErrorType.SILENT_LOGIN_ERROR);
+        }
+        if (oidcUser.refresh_token) {
+            const newOidcUser = await this.userManager.signinSilent();
+            if (newOidcUser) {
+                return AuthManager.mapOidcUserToDomainModel(newOidcUser);
+            }
+        }
+        return null;
     }
     async getUser() {
         return withPassportError(async () => {
-            const oidcUser = await this.userManager.getUser();
-            if (oidcUser) {
-                return AuthManager.mapOidcUserToDomainModel(oidcUser);
+            const user = await this.getWebUser();
+            if (user) {
+                return user;
             }
             const deviceToken = this.deviceCredentialsManager.getCredentials();
             if (deviceToken) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@imtbl/sdk",
   "description": "Immutable Unified SDK",
-  "version": "0.22.1",
+  "version": "0.22.2",
   "author": "Immutable",
   "browser": "./dist/index.browser.js",
   "bugs": "https://github.com/immutable/ts-immutable-sdk/issues",
@@ -24,6 +24,7 @@
     "bn.js": "^5.2.1",
     "enc-utils": "^3.0.0",
     "ethers": "^5.7.2",
+    "jwt-decode": "^3.1.2",
     "magic-sdk": "^13.3.1",
     "oidc-client-ts": "^2.2.1"
   },