@dynamic-labs/sdk-react-core 0.18.0-RC.17 → 0.18.0-RC.18

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+## [0.18.0-RC.18](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.17...v0.18.0-RC.18) (2023-07-24)
+
+### Bug Fixes
+
+* do not call connectSuccess when already connected ([#2705](https://github.com/dynamic-labs/DynamicAuth/issues/2705)) ([12a65fb](https://github.com/dynamic-labs/DynamicAuth/commit/12a65fb5e59a38de0f5fb0e7eab3ce3d558f201f))
+* do not proceed to authSuccess if there are still missing fields ([#2712](https://github.com/dynamic-labs/DynamicAuth/issues/2712)) ([2fb10ed](https://github.com/dynamic-labs/DynamicAuth/commit/2fb10ed7f9c28476d61856887b517bdae10b80f4))
+* add legacy safari detection ([#2733](https://github.com/dynamic-labs/DynamicAuth/issues/2733)) ([1b21c57](https://github.com/dynamic-labs/DynamicAuth/commit/1b21c57c1fd7c458f499cc09ef60364c314b0464))
+
 ## [0.18.0-RC.17](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.16...v0.18.0-RC.17) (2023-07-24)
 
 

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "0.18.0-RC.17";
+var version = "0.18.0-RC.18";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",

package/package.js

@@ -1,4 +1,4 @@
-var version = "0.18.0-RC.17";
+var version = "0.18.0-RC.18";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.18.0-RC.17",
+  "version": "0.18.0-RC.18",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -16,13 +16,13 @@
     "formik": "2.2.9",
     "qrcode": "1.5.1",
     "ethers": "5.7.2",
-    "@dynamic-labs/logger": "0.18.0-RC.17",
-    "@dynamic-labs/multi-wallet": "0.18.0-RC.17",
-    "@dynamic-labs/rpc-providers": "0.18.0-RC.17",
-    "@dynamic-labs/types": "0.18.0-RC.17",
-    "@dynamic-labs/utils": "0.18.0-RC.17",
-    "@dynamic-labs/wallet-book": "0.18.0-RC.17",
-    "@dynamic-labs/wallet-connector-core": "0.18.0-RC.17"
+    "@dynamic-labs/logger": "0.18.0-RC.18",
+    "@dynamic-labs/multi-wallet": "0.18.0-RC.18",
+    "@dynamic-labs/rpc-providers": "0.18.0-RC.18",
+    "@dynamic-labs/types": "0.18.0-RC.18",
+    "@dynamic-labs/utils": "0.18.0-RC.18",
+    "@dynamic-labs/wallet-book": "0.18.0-RC.18",
+    "@dynamic-labs/wallet-connector-core": "0.18.0-RC.18"
   },
   "devDependencies": {
     "semver": "7.3.8"

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

@@ -355,7 +355,6 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
             onLinkSuccess: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLinkSuccess,
             onUserProfileUpdate: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onUserProfileUpdate,
         },
-        connectedWallets,
         handleLogOut,
         isAuthenticated,
         ongoingVerifications,

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

@@ -351,7 +351,6 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
             onLinkSuccess: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLinkSuccess,
             onUserProfileUpdate: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onUserProfileUpdate,
         },
-        connectedWallets,
         handleLogOut,
         isAuthenticated,
         ongoingVerifications,

package/src/lib/context/DynamicContext/useCustomerCallbacks/types.d.ts

@@ -15,6 +15,5 @@ export type UseCustomerCallbacksArgs = {
     primaryWallet: Wallet | null;
     selectedWalletConnector: WalletConnector | null;
     user: UserProfile | undefined;
-    connectedWallets: Wallet[];
     ongoingVerifications: IOngoingVerifications;
 };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -32,7 +32,7 @@ const useConnectAndSign = () => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, ongoingVerifications, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, ongoingVerifications, isUserConnected, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -56,7 +56,6 @@ const useConnectAndSign = () => {
                 }
             }
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            setCallback('connectSuccess');
             const walletNetwork = yield walletConnector.getNetwork();
             const usesSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
                 network: walletNetwork,
@@ -71,8 +70,12 @@ const useConnectAndSign = () => {
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
                 handleWalletsToConnect();
+                if (!isUserConnected) {
+                    setCallback('connectSuccess');
+                }
                 return;
             }
+            setCallback('connectSuccess');
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
                 setView('captcha');
                 return;

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -28,7 +28,7 @@ const useConnectAndSign = () => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, ongoingVerifications, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, ongoingVerifications, isUserConnected, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -52,7 +52,6 @@ const useConnectAndSign = () => {
                 }
             }
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            setCallback('connectSuccess');
             const walletNetwork = yield walletConnector.getNetwork();
             const usesSupportedNetwork = isSupportedNetwork({
                 network: walletNetwork,
@@ -67,8 +66,12 @@ const useConnectAndSign = () => {
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
                 handleWalletsToConnect();
+                if (!isUserConnected) {
+                    setCallback('connectSuccess');
+                }
                 return;
             }
+            setCallback('connectSuccess');
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
                 setView('captcha');
                 return;

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

@@ -11,6 +11,18 @@ var isEmailVerificationRequired = require('../../functions/authenication/isEmail
 var EmailVerificationContext = require('../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 var useEmailVerificationRequest = require('../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.cjs');
 var useUpdateUserProfileByJWTCallback = require('../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
+var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
+require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('ethers');
+require('../../../shared/consts/index.cjs');
 
 // User Fields Schema without captchaToken and policiesConsent properties
 const userFieldsSchema = yup.object().shape({
@@ -33,11 +45,14 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
     const { verifyEmail: verifyEmailFn } = useEmailVerificationRequest.useEmailVerificationRequest();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
     const updateUser = React.useCallback((userFields, userEnvironmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
         });
         const updateUserProfileResponse = yield api.updateUserProfileFields(jwtToken, userEnvironmentId || environmentId, validatedUserFields);
+        // check if decoded JWT still somehow has missing fields, we can't proceed if it does
+        const decodedJwt = decodeJwt.decodeJwt(updateUserProfileResponse.jwt);
+        const userProfileHasMissingFields = ((_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _a !== void 0 ? _a : []).length > 0;
         const _isEmailVerificationRequired = isEmailVerificationRequired.isEmailVerificationRequired(updateUserProfileResponse);
         if (!_isEmailVerificationRequired) {
             // If email verification is not needed then we can update the user profile immediately.
@@ -45,11 +60,12 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
             return {
                 isEmailVerificationRequired: _isEmailVerificationRequired,
                 updateUserProfileResponse,
+                userProfileHasMissingFields,
             };
         }
         // We update EmailContext to use this information in the Email Verification view
-        setEmail((_a = updateUserProfileResponse.emailVerification) === null || _a === void 0 ? void 0 : _a.email);
-        setVerificationUUID((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.verificationUUID);
+        setEmail((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.email);
+        setVerificationUUID((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.verificationUUID);
         // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
         // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
         // setEmail and setVerificationUUID in the above lines will are not visible in this promise.
@@ -60,6 +76,7 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
         return {
             isEmailVerificationRequired: _isEmailVerificationRequired,
             updateUserProfileResponse,
+            userProfileHasMissingFields,
             verifyEmailFn: scopedVerifyEmailFn,
         };
     }), [

package/src/lib/utils/hooks/useUserUpdateRequest/useUserUpdateRequest.d.ts

@@ -6,10 +6,12 @@ export declare const useUserUpdateRequestInternal: ({ validationSchemaStripUnkno
     updateUser: (userFields: UpdateUserFieldsArg, userEnvironmentId?: string) => Promise<{
         isEmailVerificationRequired: false;
         updateUserProfileResponse: import("@dynamic-labs/sdk-api").UpdateSelfResponse;
+        userProfileHasMissingFields: boolean;
         verifyEmailFn?: undefined;
     } | {
         isEmailVerificationRequired: true;
         updateUserProfileResponse: import("@dynamic-labs/sdk-api").UpdateSelfResponse;
+        userProfileHasMissingFields: boolean;
         verifyEmailFn: (verificationToken: string) => Promise<import("@dynamic-labs/sdk-api").UpdateSelfResponse>;
     }>;
 };
@@ -17,10 +19,12 @@ export declare const useUserUpdateRequest: () => {
     updateUser: (userFields: UpdateUserFieldsArg, userEnvironmentId?: string) => Promise<{
         isEmailVerificationRequired: false;
         updateUserProfileResponse: import("@dynamic-labs/sdk-api").UpdateSelfResponse;
+        userProfileHasMissingFields: boolean;
         verifyEmailFn?: undefined;
     } | {
         isEmailVerificationRequired: true;
         updateUserProfileResponse: import("@dynamic-labs/sdk-api").UpdateSelfResponse;
+        userProfileHasMissingFields: boolean;
         verifyEmailFn: (verificationToken: string) => Promise<import("@dynamic-labs/sdk-api").UpdateSelfResponse>;
     }>;
 };

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

@@ -7,6 +7,18 @@ import { isEmailVerificationRequired } from '../../functions/authenication/isEma
 import { useEmailVerificationContext } from '../../../context/EmailVerificationContext/EmailVerificationContext.js';
 import { useEmailVerificationRequest } from '../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.js';
 import { useUpdateUserProfileByJWTCallback } from '../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
+import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '../../../shared/logger.js';
+import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
+import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import 'ethers';
+import '../../../shared/consts/index.js';
 
 // User Fields Schema without captchaToken and policiesConsent properties
 const userFieldsSchema = object().shape({
@@ -29,11 +41,14 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
     const { verifyEmail: verifyEmailFn } = useEmailVerificationRequest();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
     const updateUser = useCallback((userFields, userEnvironmentId) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
         });
         const updateUserProfileResponse = yield updateUserProfileFields(jwtToken, userEnvironmentId || environmentId, validatedUserFields);
+        // check if decoded JWT still somehow has missing fields, we can't proceed if it does
+        const decodedJwt = decodeJwt(updateUserProfileResponse.jwt);
+        const userProfileHasMissingFields = ((_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _a !== void 0 ? _a : []).length > 0;
         const _isEmailVerificationRequired = isEmailVerificationRequired(updateUserProfileResponse);
         if (!_isEmailVerificationRequired) {
             // If email verification is not needed then we can update the user profile immediately.
@@ -41,11 +56,12 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
             return {
                 isEmailVerificationRequired: _isEmailVerificationRequired,
                 updateUserProfileResponse,
+                userProfileHasMissingFields,
             };
         }
         // We update EmailContext to use this information in the Email Verification view
-        setEmail((_a = updateUserProfileResponse.emailVerification) === null || _a === void 0 ? void 0 : _a.email);
-        setVerificationUUID((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.verificationUUID);
+        setEmail((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.email);
+        setVerificationUUID((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.verificationUUID);
         // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
         // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
         // setEmail and setVerificationUUID in the above lines will are not visible in this promise.
@@ -56,6 +72,7 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
         return {
             isEmailVerificationRequired: _isEmailVerificationRequired,
             updateUserProfileResponse,
+            userProfileHasMissingFields,
             verifyEmailFn: scopedVerifyEmailFn,
         };
     }), [

package/src/lib/views/CollectUserDataView/OnboardingUserDataForm/OnboardingUserDataForm.cjs

@@ -48,13 +48,19 @@ var useUserDataForm = require('../../../utils/hooks/useUserDataForm/useUserDataF
 
 const OnboardingUserDataForm = ({ children, userProfile, disableSubmit, }) => {
     const { policiesConsentInnerComponent, onboardingOnlyJwt, setShowAuthFlow, setCallback, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView } = ViewContext.useViewContext();
+    const { setView, view } = ViewContext.useViewContext();
     const decodedJwt = decodeJwt.decodeJwt(onboardingOnlyJwt);
     const { updateUser } = useUserUpdateRequest.useUserUpdateRequestInternal({
         validationSchemaStripUnknown: false,
     });
     const onSubmit = React.useCallback((formValues) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const { isEmailVerificationRequired } = yield updateUser(formValues);
+        const { isEmailVerificationRequired, userProfileHasMissingFields } = yield updateUser(formValues);
+        if (userProfileHasMissingFields) {
+            // make sure we capture the fields that are required and still missing!
+            // do not change the view, just use the current one
+            setView(view);
+            return;
+        }
         if (isEmailVerificationRequired) {
             setView('verify-email');
             return;

package/src/lib/views/CollectUserDataView/OnboardingUserDataForm/OnboardingUserDataForm.js

@@ -44,13 +44,19 @@ import { useUserDataForm } from '../../../utils/hooks/useUserDataForm/useUserDat
 
 const OnboardingUserDataForm = ({ children, userProfile, disableSubmit, }) => {
     const { policiesConsentInnerComponent, onboardingOnlyJwt, setShowAuthFlow, setCallback, } = useInternalDynamicContext();
-    const { setView } = useViewContext();
+    const { setView, view } = useViewContext();
     const decodedJwt = decodeJwt(onboardingOnlyJwt);
     const { updateUser } = useUserUpdateRequestInternal({
         validationSchemaStripUnknown: false,
     });
     const onSubmit = useCallback((formValues) => __awaiter(void 0, void 0, void 0, function* () {
-        const { isEmailVerificationRequired } = yield updateUser(formValues);
+        const { isEmailVerificationRequired, userProfileHasMissingFields } = yield updateUser(formValues);
+        if (userProfileHasMissingFields) {
+            // make sure we capture the fields that are required and still missing!
+            // do not change the view, just use the current one
+            setView(view);
+            return;
+        }
         if (isEmailVerificationRequired) {
             setView('verify-email');
             return;