@stytch/vanilla-js 5.19.0 → 5.20.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @stytch/vanilla-js
 
+## 5.20.0
+
+### Minor Changes
+
+- 4427412: Allow specifying an organization slug via configuration when using the organization-specific auth flow, rather than relying on the URL. Specify an organization slug using `config.organizationSlug`.
+
+### Patch Changes
+
+- Updated dependencies [4427412]
+  - @stytch/core@2.45.0
+
+## 5.19.1
+
+### Patch Changes
+
+- b04388e: Fix incorrect error message when re-sending a B2B email one-time passcode fails
+- c98bfe2: Informative error for discovery logins that are disallowed due to claimed email domains
+
 ## 5.19.0
 
 ### Minor Changes

package/dist/b2b/index.esm.js

@@ -57,6 +57,7 @@ var ErrorType;
   ErrorType[ErrorType["Organization"] = 2] = "Organization";
   ErrorType[ErrorType["CannotJoinOrgDueToAuthPolicy"] = 3] = "CannotJoinOrgDueToAuthPolicy";
   ErrorType[ErrorType["AdBlockerDetected"] = 4] = "AdBlockerDetected";
+  ErrorType[ErrorType["OrganizationDiscoveryClaimedDomain"] = 5] = "OrganizationDiscoveryClaimedDomain";
 })(ErrorType || (ErrorType = {}));
 var AppScreens$1;
 (function (AppScreens) {
@@ -967,7 +968,7 @@ var ErrorScreen = function ErrorScreen() {
     _useGlobalReducer2 = _slicedToArray(_useGlobalReducer, 1),
     state = _useGlobalReducer2[0];
   var currentErrorType = state.errorType;
-  var ErrorTypeMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ErrorType.Default, 'Something went wrong. Try again later or contact your admin for help.'), ErrorType.EmailMagicLink, 'Something went wrong. Your login link may have expired, been revoked, or been used more than once. Request a new login link to try again, or contact your admin for help.'), ErrorType.Organization, 'The organization you are looking for could not be found. If you think this is a mistake, contact your admin.'), ErrorType.CannotJoinOrgDueToAuthPolicy, "Unable to join due to ".concat((_b = (_a = state.flowState.organization) === null || _a === void 0 ? void 0 : _a.organization_name) !== null && _b !== void 0 ? _b : 'the organization', "'s authentication policy. Please contact your admin for more information.")), ErrorType.AdBlockerDetected, 'The request was blocked by an Ad Blocker. Please disable your ad blocker, refresh the page, and try again.');
+  var ErrorTypeMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ErrorType.Default, 'Something went wrong. Try again later or contact your admin for help.'), ErrorType.EmailMagicLink, 'Something went wrong. Your login link may have expired, been revoked, or been used more than once. Request a new login link to try again, or contact your admin for help.'), ErrorType.Organization, 'The organization you are looking for could not be found. If you think this is a mistake, contact your admin.'), ErrorType.CannotJoinOrgDueToAuthPolicy, "Unable to join due to ".concat((_b = (_a = state.flowState.organization) === null || _a === void 0 ? void 0 : _a.organization_name) !== null && _b !== void 0 ? _b : 'the organization', "'s authentication policy. Please contact your admin for more information.")), ErrorType.AdBlockerDetected, 'The request was blocked by an Ad Blocker. Please disable your ad blocker, refresh the page, and try again.'), ErrorType.OrganizationDiscoveryClaimedDomain, 'Your email domain is associated with a particular organization, so you are unable to join or create other organizations. Please contact your admin for more information.');
   return /*#__PURE__*/wn.createElement(ErrorDisplay, {
     text: ErrorTypeMap[currentErrorType]
   });
@@ -1450,6 +1451,7 @@ var useMutate = function useMutate(key, fetcher, options) {
   }));
 };
 var useExtractSlug = function useExtractSlug() {
+  var _a;
   var _useGlobalReducer7 = useGlobalReducer(),
     _useGlobalReducer8 = _slicedToArray(_useGlobalReducer7, 2),
     state = _useGlobalReducer8[0],
@@ -1458,8 +1460,9 @@ var useExtractSlug = function useExtractSlug() {
     _h$2 = _slicedToArray(_h$, 2),
     pattern = _h$2[0],
     setPattern = _h$2[1];
+  var config = useConfig();
   var stytchClient = useStytch();
-  var slug = extractFromPattern(pattern || null, window.location.href);
+  var slug = (_a = config.organizationSlug) !== null && _a !== void 0 ? _a : extractFromPattern(pattern || null, window.location.href);
   var _useMutate = useMutate('stytch.organization.getBySlug', function (_, _ref41) {
       var slug = _ref41.arg.slug;
       return stytchClient.organization.getBySlug({
@@ -1496,10 +1499,10 @@ var useExtractSlug = function useExtractSlug() {
       });
     }
   }, [slug, state.flowState, state.screen]);
+  var resultPending = pattern === undefined || isSearching;
   return {
-    isSearching: isSearching,
     slug: slug,
-    pattern: pattern
+    resultPending: resultPending
   };
 };
 var useBootstrap = function useBootstrap() {
@@ -3592,6 +3595,12 @@ var Discovery = function Discovery() {
     }, {
       onSuccess: function onSuccess(data) {
         onAuthenticateSuccess(data, dispatch, config);
+      },
+      onError: function onError(error) {
+        dispatch({
+          type: 'set_error_message_and_transition',
+          errorType: error.error_type === 'action_not_allowed_email_domain_is_claimed' ? ErrorType.OrganizationDiscoveryClaimedDomain : ErrorType.Default
+        });
       }
     }),
     stytchDiscoveryExchange = _useMutate3.trigger,
@@ -3604,10 +3613,10 @@ var Discovery = function Discovery() {
       onSuccess: function onSuccess(data) {
         onAuthenticateSuccess(data, dispatch, config);
       },
-      onError: function onError() {
+      onError: function onError(error) {
         dispatch({
-          type: 'transition',
-          screen: AppScreens$1.Error
+          type: 'set_error_message_and_transition',
+          errorType: error.error_type === 'action_not_allowed_email_domain_is_claimed' ? ErrorType.OrganizationDiscoveryClaimedDomain : ErrorType.Default
         });
       }
     }),
@@ -4240,8 +4249,7 @@ var EmailOTPEntryScreen = function EmailOTPEntryScreen() {
     resetAuthenticate = _useMutate6.reset;
   var isAuthenticatingAny = isDiscoveryAuthenticating || isAuthenticating;
   var authenticateAnyError = discoveryAuthenticateError || authenticateError;
-  var errorAny = authenticateAnyError || sendError;
-  var errorMessage = errorAny ? 'Invalid passcode, please try again.' : undefined;
+  var errorMessage = authenticateAnyError ? 'Invalid passcode, please try again.' : sendError ? extractErrorMessage(sendError) : undefined;
   var resetAll = function resetAll() {
     resetDiscoveryAuthenticate();
     resetAuthenticate();
@@ -7979,9 +7987,8 @@ var AppContainer$1 = function AppContainer$1() {
     isDiscoveryLoading = _useMutate19.isMutating;
   var isTokenAuthLoading = isMagicLinkLoading || isSSOLoading || isDiscoveryLoading || isDiscoveryOAuthLoading || isOAuthLoading || isImpersonationLoading;
   var _useExtractSlug = useExtractSlug(),
-    isSearching = _useExtractSlug.isSearching,
     slug = _useExtractSlug.slug,
-    pattern = _useExtractSlug.pattern;
+    resultPending = _useExtractSlug.resultPending;
   p$1(function () {
     if (isOnlyFloatingOneTap) {
       return;
@@ -8046,13 +8053,13 @@ var AppContainer$1 = function AppContainer$1() {
     if (token && isSupportedTokenType(tokenType)) {
       return;
     }
-    if (!slug && pattern !== undefined && !isSearching && state.flowState.organization === null && state.screen === AppScreens$1.Main && state.flowState.type == AuthFlowType.Organization) {
+    if (!slug && !resultPending && state.flowState.organization === null && state.screen === AppScreens$1.Main && state.flowState.type == AuthFlowType.Organization) {
       dispatch({
         type: 'set_error_message_and_transition',
         errorType: ErrorType.Organization
       });
     }
-  }, [dispatch, isOnlyFloatingOneTap, isSearching, isTokenAuthLoading, pattern, slug, state.flowState.organization, state.flowState.type, state.screen, triggerError]);
+  }, [dispatch, isOnlyFloatingOneTap, isTokenAuthLoading, resultPending, slug, state.flowState.organization, state.flowState.type, state.screen, triggerError]);
   if (isOnlyFloatingOneTap) {
     return /*#__PURE__*/wn.createElement(B2BGoogleOneTap, null);
   }

package/dist/b2b/index.headless.esm.js

@@ -214,7 +214,7 @@ var ClientsideServicesProvider = /*#__PURE__*/function () {
     }
   }]);
 }();
-var version = "5.19.0";
+var version = "5.20.0";
 var NetworkClient = /*#__PURE__*/function () {
   function NetworkClient(_publicToken, _subscriptionDataLayer, _liveAPIURL, _testAPIURL, additionalTelemetryDataFn) {
     _classCallCheck(this, NetworkClient);

package/dist/b2b/index.headless.js

@@ -215,7 +215,7 @@ var ClientsideServicesProvider = /*#__PURE__*/function () {
     }
   }]);
 }();
-var version = "5.19.0";
+var version = "5.20.0";
 var NetworkClient = /*#__PURE__*/function () {
   function NetworkClient(_publicToken, _subscriptionDataLayer, _liveAPIURL, _testAPIURL, additionalTelemetryDataFn) {
     _classCallCheck(this, NetworkClient);

package/dist/b2b/index.js

@@ -58,6 +58,7 @@ var ErrorType;
   ErrorType[ErrorType["Organization"] = 2] = "Organization";
   ErrorType[ErrorType["CannotJoinOrgDueToAuthPolicy"] = 3] = "CannotJoinOrgDueToAuthPolicy";
   ErrorType[ErrorType["AdBlockerDetected"] = 4] = "AdBlockerDetected";
+  ErrorType[ErrorType["OrganizationDiscoveryClaimedDomain"] = 5] = "OrganizationDiscoveryClaimedDomain";
 })(ErrorType || (ErrorType = {}));
 var AppScreens$1;
 (function (AppScreens) {
@@ -968,7 +969,7 @@ var ErrorScreen = function ErrorScreen() {
     _useGlobalReducer2 = _slicedToArray(_useGlobalReducer, 1),
     state = _useGlobalReducer2[0];
   var currentErrorType = state.errorType;
-  var ErrorTypeMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ErrorType.Default, 'Something went wrong. Try again later or contact your admin for help.'), ErrorType.EmailMagicLink, 'Something went wrong. Your login link may have expired, been revoked, or been used more than once. Request a new login link to try again, or contact your admin for help.'), ErrorType.Organization, 'The organization you are looking for could not be found. If you think this is a mistake, contact your admin.'), ErrorType.CannotJoinOrgDueToAuthPolicy, "Unable to join due to ".concat((_b = (_a = state.flowState.organization) === null || _a === void 0 ? void 0 : _a.organization_name) !== null && _b !== void 0 ? _b : 'the organization', "'s authentication policy. Please contact your admin for more information.")), ErrorType.AdBlockerDetected, 'The request was blocked by an Ad Blocker. Please disable your ad blocker, refresh the page, and try again.');
+  var ErrorTypeMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ErrorType.Default, 'Something went wrong. Try again later or contact your admin for help.'), ErrorType.EmailMagicLink, 'Something went wrong. Your login link may have expired, been revoked, or been used more than once. Request a new login link to try again, or contact your admin for help.'), ErrorType.Organization, 'The organization you are looking for could not be found. If you think this is a mistake, contact your admin.'), ErrorType.CannotJoinOrgDueToAuthPolicy, "Unable to join due to ".concat((_b = (_a = state.flowState.organization) === null || _a === void 0 ? void 0 : _a.organization_name) !== null && _b !== void 0 ? _b : 'the organization', "'s authentication policy. Please contact your admin for more information.")), ErrorType.AdBlockerDetected, 'The request was blocked by an Ad Blocker. Please disable your ad blocker, refresh the page, and try again.'), ErrorType.OrganizationDiscoveryClaimedDomain, 'Your email domain is associated with a particular organization, so you are unable to join or create other organizations. Please contact your admin for more information.');
   return /*#__PURE__*/extractErrorMessage.wn.createElement(ErrorDisplay, {
     text: ErrorTypeMap[currentErrorType]
   });
@@ -1451,6 +1452,7 @@ var useMutate = function useMutate(key, fetcher, options) {
   }));
 };
 var useExtractSlug = function useExtractSlug() {
+  var _a;
   var _useGlobalReducer7 = useGlobalReducer(),
     _useGlobalReducer8 = _slicedToArray(_useGlobalReducer7, 2),
     state = _useGlobalReducer8[0],
@@ -1459,8 +1461,9 @@ var useExtractSlug = function useExtractSlug() {
     _extractErrorMessage$7 = _slicedToArray(_extractErrorMessage$6, 2),
     pattern = _extractErrorMessage$7[0],
     setPattern = _extractErrorMessage$7[1];
+  var config = useConfig();
   var stytchClient = useStytch();
-  var slug = extractFromPattern(pattern || null, window.location.href);
+  var slug = (_a = config.organizationSlug) !== null && _a !== void 0 ? _a : extractFromPattern(pattern || null, window.location.href);
   var _useMutate = useMutate('stytch.organization.getBySlug', function (_, _ref41) {
       var slug = _ref41.arg.slug;
       return stytchClient.organization.getBySlug({
@@ -1497,10 +1500,10 @@ var useExtractSlug = function useExtractSlug() {
       });
     }
   }, [slug, state.flowState, state.screen]);
+  var resultPending = pattern === undefined || isSearching;
   return {
-    isSearching: isSearching,
     slug: slug,
-    pattern: pattern
+    resultPending: resultPending
   };
 };
 var useBootstrap = function useBootstrap() {
@@ -3593,6 +3596,12 @@ var Discovery = function Discovery() {
     }, {
       onSuccess: function onSuccess(data) {
         onAuthenticateSuccess(data, dispatch, config);
+      },
+      onError: function onError(error) {
+        dispatch({
+          type: 'set_error_message_and_transition',
+          errorType: error.error_type === 'action_not_allowed_email_domain_is_claimed' ? ErrorType.OrganizationDiscoveryClaimedDomain : ErrorType.Default
+        });
       }
     }),
     stytchDiscoveryExchange = _useMutate3.trigger,
@@ -3605,10 +3614,10 @@ var Discovery = function Discovery() {
       onSuccess: function onSuccess(data) {
         onAuthenticateSuccess(data, dispatch, config);
       },
-      onError: function onError() {
+      onError: function onError(error) {
         dispatch({
-          type: 'transition',
-          screen: AppScreens$1.Error
+          type: 'set_error_message_and_transition',
+          errorType: error.error_type === 'action_not_allowed_email_domain_is_claimed' ? ErrorType.OrganizationDiscoveryClaimedDomain : ErrorType.Default
         });
       }
     }),
@@ -4241,8 +4250,7 @@ var EmailOTPEntryScreen = function EmailOTPEntryScreen() {
     resetAuthenticate = _useMutate6.reset;
   var isAuthenticatingAny = isDiscoveryAuthenticating || isAuthenticating;
   var authenticateAnyError = discoveryAuthenticateError || authenticateError;
-  var errorAny = authenticateAnyError || sendError;
-  var errorMessage = errorAny ? 'Invalid passcode, please try again.' : undefined;
+  var errorMessage = authenticateAnyError ? 'Invalid passcode, please try again.' : sendError ? extractErrorMessage.extractErrorMessage(sendError) : undefined;
   var resetAll = function resetAll() {
     resetDiscoveryAuthenticate();
     resetAuthenticate();
@@ -7980,9 +7988,8 @@ var AppContainer$1 = function AppContainer$1() {
     isDiscoveryLoading = _useMutate19.isMutating;
   var isTokenAuthLoading = isMagicLinkLoading || isSSOLoading || isDiscoveryLoading || isDiscoveryOAuthLoading || isOAuthLoading || isImpersonationLoading;
   var _useExtractSlug = useExtractSlug(),
-    isSearching = _useExtractSlug.isSearching,
     slug = _useExtractSlug.slug,
-    pattern = _useExtractSlug.pattern;
+    resultPending = _useExtractSlug.resultPending;
   extractErrorMessage.p(function () {
     if (isOnlyFloatingOneTap) {
       return;
@@ -8047,13 +8054,13 @@ var AppContainer$1 = function AppContainer$1() {
     if (token && isSupportedTokenType(tokenType)) {
       return;
     }
-    if (!slug && pattern !== undefined && !isSearching && state.flowState.organization === null && state.screen === AppScreens$1.Main && state.flowState.type == internal.AuthFlowType.Organization) {
+    if (!slug && !resultPending && state.flowState.organization === null && state.screen === AppScreens$1.Main && state.flowState.type == internal.AuthFlowType.Organization) {
       dispatch({
         type: 'set_error_message_and_transition',
         errorType: ErrorType.Organization
       });
     }
-  }, [dispatch, isOnlyFloatingOneTap, isSearching, isTokenAuthLoading, pattern, slug, state.flowState.organization, state.flowState.type, state.screen, triggerError]);
+  }, [dispatch, isOnlyFloatingOneTap, isTokenAuthLoading, resultPending, slug, state.flowState.organization, state.flowState.type, state.screen, triggerError]);
   if (isOnlyFloatingOneTap) {
     return /*#__PURE__*/extractErrorMessage.wn.createElement(B2BGoogleOneTap, null);
   }