@dynamic-labs/sdk-react-core 2.1.0-alpha.29 → 2.1.0-alpha.30

package/CHANGELOG.md

@@ -1,4 +1,14 @@
 
+## [2.1.0-alpha.30](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.0-alpha.29...v2.1.0-alpha.30) (2024-05-31)
+
+
+### Bug Fixes
+
+* ensure initExpirationTime is called automatically after authenticating ([#5797](https://github.com/dynamic-labs/DynamicAuth/issues/5797)) ([87eb802](https://github.com/dynamic-labs/DynamicAuth/commit/87eb802e0c2d3af2ca116e07099bfef426d30a1f))
+* initExpirationTime should use expiresAt from storage ([#5799](https://github.com/dynamic-labs/DynamicAuth/issues/5799)) ([384ed17](https://github.com/dynamic-labs/DynamicAuth/commit/384ed1747d9b813ac0d34aaee36eb6480cb256d3))
+* only run useValidateSession once on rerender ([#5795](https://github.com/dynamic-labs/DynamicAuth/issues/5795)) ([ba4446d](https://github.com/dynamic-labs/DynamicAuth/commit/ba4446df95726248b877a84def959cabe81ad9b6))
+* store expiresAt timestamp from VerifyResponse in local storage for use in initExpirationTime ([#5796](https://github.com/dynamic-labs/DynamicAuth/issues/5796)) ([5f8aaeb](https://github.com/dynamic-labs/DynamicAuth/commit/5f8aaeb1cd45b10cb007f9eac25d18f50f142d8f))
+
 ## [2.1.0-alpha.29](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.0-alpha.28...v2.1.0-alpha.29) (2024-05-30)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "2.1.0-alpha.29";
+var version = "2.1.0-alpha.30";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.453",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "2.1.0-alpha.29";
+var version = "2.1.0-alpha.30";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.453",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "2.1.0-alpha.29",
+  "version": "2.1.0-alpha.30",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -17,18 +17,18 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/iconic": "2.1.0-alpha.29",
-    "@dynamic-labs/logger": "2.1.0-alpha.29",
-    "@dynamic-labs/multi-wallet": "2.1.0-alpha.29",
-    "@dynamic-labs/rpc-provider-ethereum": "2.1.0-alpha.29",
-    "@dynamic-labs/rpc-provider-solana": "2.1.0-alpha.29",
-    "@dynamic-labs/rpc-providers": "2.1.0-alpha.29",
-    "@dynamic-labs/store": "2.1.0-alpha.29",
-    "@dynamic-labs/types": "2.1.0-alpha.29",
-    "@dynamic-labs/utils": "2.1.0-alpha.29",
-    "@dynamic-labs/viem-utils": "2.1.0-alpha.29",
-    "@dynamic-labs/wallet-book": "2.1.0-alpha.29",
-    "@dynamic-labs/wallet-connector-core": "2.1.0-alpha.29",
+    "@dynamic-labs/iconic": "2.1.0-alpha.30",
+    "@dynamic-labs/logger": "2.1.0-alpha.30",
+    "@dynamic-labs/multi-wallet": "2.1.0-alpha.30",
+    "@dynamic-labs/rpc-provider-ethereum": "2.1.0-alpha.30",
+    "@dynamic-labs/rpc-provider-solana": "2.1.0-alpha.30",
+    "@dynamic-labs/rpc-providers": "2.1.0-alpha.30",
+    "@dynamic-labs/store": "2.1.0-alpha.30",
+    "@dynamic-labs/types": "2.1.0-alpha.30",
+    "@dynamic-labs/utils": "2.1.0-alpha.30",
+    "@dynamic-labs/viem-utils": "2.1.0-alpha.30",
+    "@dynamic-labs/wallet-book": "2.1.0-alpha.30",
+    "@dynamic-labs/wallet-connector-core": "2.1.0-alpha.30",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/context/DynamicContext/DynamicContext.cjs

@@ -371,7 +371,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings: settings$1, lo
     });
     React.useEffect(() => {
         helpers.initExpirationTime(handleLogOut);
-    }, [handleLogOut]);
+    }, [handleLogOut, isAuthenticated]);
     const { setCallback } = useCustomerCallbacks.useCustomerCallbacks({
         callbacks: {
             onAuthSuccess: events === null || events === void 0 ? void 0 : events.onAuthSuccess,

package/src/lib/context/DynamicContext/DynamicContext.js

@@ -367,7 +367,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
     });
     useEffect(() => {
         initExpirationTime(handleLogOut);
-    }, [handleLogOut]);
+    }, [handleLogOut, isAuthenticated]);
     const { setCallback } = useCustomerCallbacks({
         callbacks: {
             onAuthSuccess: events === null || events === void 0 ? void 0 : events.onAuthSuccess,

package/src/lib/context/DynamicContext/helpers/helpers.cjs

@@ -18,7 +18,7 @@ require('../../../utils/constants/values.cjs');
 var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('@dynamic-labs/utils');
-var getAuthToken = require('../../../utils/functions/getAuthToken/getAuthToken.cjs');
+var getExpiresAt = require('../../../utils/functions/getExpiresAt/getExpiresAt.cjs');
 
 let logoutTimer;
 let dynamicContextSettingsTimer;
@@ -47,15 +47,10 @@ const isTokenExpired = (decoded) => {
     return false;
 };
 const initExpirationTime = (logout) => {
-    const decodedJwt = decodeJwt.decodeJwt(getAuthToken.getAuthToken());
-    if (!decodedJwt)
+    const expiresAt = getExpiresAt.getExpiresAt();
+    if (!expiresAt)
         return clearTimeout(logoutTimer);
-    const tokenExp = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.exp;
-    if (!tokenExp) {
-        clearTimeout(logoutTimer);
-        return logout();
-    }
-    const expirationTime = new Date(tokenExp * 1000).getTime();
+    const expirationTime = new Date(expiresAt * 1000).getTime();
     const currentTime = new Date().getTime();
     if (currentTime >= expirationTime) {
         clearTimeout(logoutTimer);

package/src/lib/context/DynamicContext/helpers/helpers.js

@@ -14,7 +14,7 @@ import '../../../utils/constants/values.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import '@dynamic-labs/sdk-api-core';
 import '@dynamic-labs/utils';
-import { getAuthToken } from '../../../utils/functions/getAuthToken/getAuthToken.js';
+import { getExpiresAt } from '../../../utils/functions/getExpiresAt/getExpiresAt.js';
 
 let logoutTimer;
 let dynamicContextSettingsTimer;
@@ -43,15 +43,10 @@ const isTokenExpired = (decoded) => {
     return false;
 };
 const initExpirationTime = (logout) => {
-    const decodedJwt = decodeJwt(getAuthToken());
-    if (!decodedJwt)
+    const expiresAt = getExpiresAt();
+    if (!expiresAt)
         return clearTimeout(logoutTimer);
-    const tokenExp = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.exp;
-    if (!tokenExp) {
-        clearTimeout(logoutTimer);
-        return logout();
-    }
-    const expirationTime = new Date(tokenExp * 1000).getTime();
+    const expirationTime = new Date(expiresAt * 1000).getTime();
     const currentTime = new Date().getTime();
     if (currentTime >= expirationTime) {
         clearTimeout(logoutTimer);

package/src/lib/store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs

@@ -26,8 +26,11 @@ require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 var userActions = require('../../actions/userActions/userActions.cjs');
 require('../../../locale/locale.cjs');
+var storeExpiresAt = require('../../../utils/functions/storeExpiresAt/storeExpiresAt.cjs');
 
-const storeAuthTokenAndUser = ({ user, jwt, minifiedJwt, }) => {
+const storeAuthTokenAndUser = ({ user, jwt, minifiedJwt, expiresAt, }) => {
+    // expiresAt is always sent back by the backend, regardless of whether jwt/minifiedJwt are sent or not
+    storeExpiresAt.storeExpiresAt(expiresAt);
     if (jwt && minifiedJwt) {
         index.storeAuthToken(jwt, minifiedJwt);
     }

package/src/lib/store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.d.ts

@@ -1,7 +1,3 @@
-import { SdkUser } from '@dynamic-labs/sdk-api-core';
+import { VerifyResponse } from '@dynamic-labs/sdk-api-core';
 import { UserProfile } from '../../../..';
-export declare const storeAuthTokenAndUser: ({ user, jwt, minifiedJwt, }: {
-    user: SdkUser;
-    jwt?: string;
-    minifiedJwt?: string;
-}) => UserProfile;
+export declare const storeAuthTokenAndUser: ({ user, jwt, minifiedJwt, expiresAt, }: VerifyResponse) => UserProfile;

package/src/lib/store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js

@@ -22,8 +22,11 @@ import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import { setUser } from '../../actions/userActions/userActions.js';
 import '../../../locale/locale.js';
+import { storeExpiresAt } from '../../../utils/functions/storeExpiresAt/storeExpiresAt.js';
 
-const storeAuthTokenAndUser = ({ user, jwt, minifiedJwt, }) => {
+const storeAuthTokenAndUser = ({ user, jwt, minifiedJwt, expiresAt, }) => {
+    // expiresAt is always sent back by the backend, regardless of whether jwt/minifiedJwt are sent or not
+    storeExpiresAt(expiresAt);
     if (jwt && minifiedJwt) {
         storeAuthToken(jwt, minifiedJwt);
     }

package/src/lib/utils/constants/localStorage.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const AUTH_TOKEN = 'dynamic_authentication_token';
 const AUTH_MIN_TOKEN = 'dynamic_min_authentication_token';
+const AUTH_EXPIRES_AT = 'dynamic_auth_expires_at';
 const LAST_USED_WALLET = 'dynamic_last_used_wallet';
 const NONCE_STORAGE_KEY = 'dynamic_nonce';
 const PRIMARY_WALLET_ID = 'dynamic_primary_wallet_id';
@@ -26,6 +27,7 @@ const PHONE_INPUT_DEFAULT_COUNTRY = 'dynamic_phone_input_default_country';
 const PHANTOM_SIGNATURE_STATE = 'phantom_verification_type';
 const STORE_STORAGE_KEY = 'dynamic_store';
 
+exports.AUTH_EXPIRES_AT = AUTH_EXPIRES_AT;
 exports.AUTH_MIN_TOKEN = AUTH_MIN_TOKEN;
 exports.AUTH_MODE = AUTH_MODE;
 exports.AUTH_TOKEN = AUTH_TOKEN;

package/src/lib/utils/constants/localStorage.d.ts

@@ -1,5 +1,6 @@
 export declare const AUTH_TOKEN = "dynamic_authentication_token";
 export declare const AUTH_MIN_TOKEN = "dynamic_min_authentication_token";
+export declare const AUTH_EXPIRES_AT = "dynamic_auth_expires_at";
 export declare const LAST_USED_WALLET = "dynamic_last_used_wallet";
 export declare const NETWORKS_STORAGE_KEY = "dynamic_networks";
 export declare const NONCE_STORAGE_KEY = "dynamic_nonce";

package/src/lib/utils/constants/localStorage.js

@@ -1,6 +1,7 @@
 'use client'
 const AUTH_TOKEN = 'dynamic_authentication_token';
 const AUTH_MIN_TOKEN = 'dynamic_min_authentication_token';
+const AUTH_EXPIRES_AT = 'dynamic_auth_expires_at';
 const LAST_USED_WALLET = 'dynamic_last_used_wallet';
 const NONCE_STORAGE_KEY = 'dynamic_nonce';
 const PRIMARY_WALLET_ID = 'dynamic_primary_wallet_id';
@@ -22,4 +23,4 @@ const PHONE_INPUT_DEFAULT_COUNTRY = 'dynamic_phone_input_default_country';
 const PHANTOM_SIGNATURE_STATE = 'phantom_verification_type';
 const STORE_STORAGE_KEY = 'dynamic_store';
 
-export { AUTH_MIN_TOKEN, AUTH_MODE, AUTH_TOKEN, BRIDGE_ONBOARDING_COMPLETED, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, COOKIE_ENABLED_KEY, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, EMBEDDED_WALLET_SECURE_BANNER, EMBEDDED_WALLET_SESSION_SETTINGS, LAST_USED_WALLET, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, NONCE_STORAGE_KEY, PHANTOM_SIGNATURE_STATE, PHONE_INPUT_DEFAULT_COUNTRY, PRIMARY_WALLET_ID, STORE_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY };
+export { AUTH_EXPIRES_AT, AUTH_MIN_TOKEN, AUTH_MODE, AUTH_TOKEN, BRIDGE_ONBOARDING_COMPLETED, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, COOKIE_ENABLED_KEY, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, EMBEDDED_WALLET_SECURE_BANNER, EMBEDDED_WALLET_SESSION_SETTINGS, LAST_USED_WALLET, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, NONCE_STORAGE_KEY, PHANTOM_SIGNATURE_STATE, PHONE_INPUT_DEFAULT_COUNTRY, PRIMARY_WALLET_ID, STORE_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY };

package/src/lib/utils/functions/getExpiresAt/getExpiresAt.cjs

@@ -0,0 +1,23 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('@dynamic-labs/sdk-api-core');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/wallet-book');
+var localStorage$1 = require('../../constants/localStorage.cjs');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+
+const getExpiresAt = () => localStorage.LocalStorage.getFromLS(localStorage$1.AUTH_EXPIRES_AT);
+
+exports.getExpiresAt = getExpiresAt;

package/src/lib/utils/functions/getExpiresAt/getExpiresAt.d.ts

@@ -0,0 +1 @@
+export declare const getExpiresAt: () => any;

package/src/lib/utils/functions/getExpiresAt/getExpiresAt.js

@@ -0,0 +1,19 @@
+'use client'
+import '@dynamic-labs/sdk-api-core';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/wallet-book';
+import { AUTH_EXPIRES_AT } from '../../constants/localStorage.js';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+
+const getExpiresAt = () => LocalStorage.getFromLS(AUTH_EXPIRES_AT);
+
+export { getExpiresAt };

package/src/lib/utils/functions/getExpiresAt/index.d.ts

@@ -0,0 +1 @@
+export { getExpiresAt } from './getExpiresAt';

package/src/lib/utils/functions/index.d.ts

@@ -74,3 +74,5 @@ export * from './getEmbeddedWalletSessionExpiration';
 export * from './serializeWalletConnectors';
 export * from './downloadFile';
 export * from './isCookieEnabled';
+export * from './storeExpiresAt';
+export * from './getExpiresAt';

package/src/lib/utils/functions/storeExpiresAt/index.d.ts

@@ -0,0 +1 @@
+export { storeExpiresAt } from './storeExpiresAt';

package/src/lib/utils/functions/storeExpiresAt/storeExpiresAt.cjs

@@ -0,0 +1,25 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('@dynamic-labs/sdk-api-core');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/wallet-book');
+var localStorage$1 = require('../../constants/localStorage.cjs');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+
+const storeExpiresAt = (expiresAt) => {
+    localStorage.LocalStorage.setToLS(localStorage$1.AUTH_EXPIRES_AT, expiresAt);
+};
+
+exports.storeExpiresAt = storeExpiresAt;

package/src/lib/utils/functions/storeExpiresAt/storeExpiresAt.d.ts

@@ -0,0 +1 @@
+export declare const storeExpiresAt: (expiresAt: number) => void;

package/src/lib/utils/functions/storeExpiresAt/storeExpiresAt.js

@@ -0,0 +1,21 @@
+'use client'
+import '@dynamic-labs/sdk-api-core';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/wallet-book';
+import { AUTH_EXPIRES_AT } from '../../constants/localStorage.js';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+
+const storeExpiresAt = (expiresAt) => {
+    LocalStorage.setToLS(AUTH_EXPIRES_AT, expiresAt);
+};
+
+export { storeExpiresAt };

package/src/lib/utils/hooks/useUserAuth/useUserAuth.cjs

@@ -236,6 +236,7 @@ const useUserAuth = ({ authMethod, }) => {
             const { updateUserProfileResponse, isSmsVerificationRequired, isEmailVerificationRequired, missingFields, } = yield updateJwtFunction();
             onValidUpdatedJwt === null || onValidUpdatedJwt === void 0 ? void 0 : onValidUpdatedJwt();
             const updatedUser = storeAuthTokenAndUser.storeAuthTokenAndUser({
+                expiresAt: updateUserProfileResponse.expiresAt,
                 jwt: updateUserProfileResponse.jwt,
                 minifiedJwt: updateUserProfileResponse.minifiedJwt,
                 user: updateUserProfileResponse.user,

package/src/lib/utils/hooks/useUserAuth/useUserAuth.js

@@ -232,6 +232,7 @@ const useUserAuth = ({ authMethod, }) => {
             const { updateUserProfileResponse, isSmsVerificationRequired, isEmailVerificationRequired, missingFields, } = yield updateJwtFunction();
             onValidUpdatedJwt === null || onValidUpdatedJwt === void 0 ? void 0 : onValidUpdatedJwt();
             const updatedUser = storeAuthTokenAndUser({
+                expiresAt: updateUserProfileResponse.expiresAt,
                 jwt: updateUserProfileResponse.jwt,
                 minifiedJwt: updateUserProfileResponse.minifiedJwt,
                 user: updateUserProfileResponse.user,

package/src/lib/utils/hooks/useValidateSession/useValidateSession.cjs

@@ -126,10 +126,12 @@ const useValidateSession = ({ environmentId, handleLogOut }) => {
         });
         storeActions.setEnvironment(environmentId);
     });
-    if (!hasLoggedOut) {
-        handleStoreAndEnvironemntMismatch();
-        handleUserDataOutOfSync();
-    }
+    React.useEffect(() => {
+        if (!hasLoggedOut) {
+            handleStoreAndEnvironemntMismatch();
+            handleUserDataOutOfSync();
+        }
+    }, [hasLoggedOut]);
     return { setHasLoggedOut };
 };
 

package/src/lib/utils/hooks/useValidateSession/useValidateSession.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import { CookieInvalidError } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
@@ -122,10 +122,12 @@ const useValidateSession = ({ environmentId, handleLogOut }) => {
         });
         setEnvironment(environmentId);
     });
-    if (!hasLoggedOut) {
-        handleStoreAndEnvironemntMismatch();
-        handleUserDataOutOfSync();
-    }
+    useEffect(() => {
+        if (!hasLoggedOut) {
+            handleStoreAndEnvironemntMismatch();
+            handleUserDataOutOfSync();
+        }
+    }, [hasLoggedOut]);
     return { setHasLoggedOut };
 };