@turnkey/sdk-react 3.0.3 → 3.0.5

package/dist/components/auth/Auth.js

@@ -105,45 +105,6 @@ const Auth = ({
     const phoneNumber = parsePhoneNumberFromString(phone);
     return phoneNumber?.isValid() ?? false;
   };
-  const handleGetOrCreateSuborg = async (filterType, filterValue, additionalData = {}) => {
-    let suborgId;
-    if (filterType == constants.FilterType.Email || filterType == constants.FilterType.PhoneNumber) {
-      const getVerifiedSuborgsResponse = await sdkServer.server.getVerifiedSuborgs({
-        filterType,
-        filterValue
-      });
-      if (!getVerifiedSuborgsResponse || !getVerifiedSuborgsResponse.organizationIds) {
-        onError(constants.authErrors.suborg.fetchFailed);
-        return null;
-      }
-      suborgId = getVerifiedSuborgsResponse?.organizationIds[0];
-    } else {
-      const getSuborgsResponse = await sdkServer.server.getSuborgs({
-        filterType,
-        filterValue
-      });
-      if (!getSuborgsResponse || !getSuborgsResponse.organizationIds) {
-        onError(constants.authErrors.suborg.fetchFailed);
-        return null;
-      }
-      suborgId = getSuborgsResponse?.organizationIds[0];
-    }
-    if (!suborgId) {
-      const createSuborgData = {
-        ...additionalData
-      };
-      if (filterType === constants.FilterType.Email) createSuborgData.email = filterValue;else if (filterType === constants.FilterType.PhoneNumber) createSuborgData.phoneNumber = filterValue;
-      if (customAccounts) {
-        createSuborgData.customAccounts = customAccounts;
-      }
-      const createSuborgResponse = await sdkServer.server.createSuborg(createSuborgData);
-      if (!createSuborgResponse || !createSuborgResponse.subOrganizationId) {
-        onError(constants.authErrors.suborg.createFailed);
-      }
-      suborgId = createSuborgResponse?.subOrganizationId;
-    }
-    return suborgId;
-  };
   const handleAuthSuccess = async (credentialBundle, expirationSeconds) => {
     if (credentialBundle) {
       await authIframeClient.injectCredentialBundle(credentialBundle);
@@ -232,7 +193,22 @@ const Auth = ({
     }
   };
   const handleOtpLogin = async (type, value, otpType) => {
-    const suborgId = await handleGetOrCreateSuborg(type, value);
+    const createSuborgData = {};
+    if (type === constants.FilterType.Email) createSuborgData.email = value;else if (type === constants.FilterType.PhoneNumber) createSuborgData.phoneNumber = value;
+    if (customAccounts) {
+      createSuborgData.customAccounts = customAccounts;
+    }
+    const resp = await sdkServer.server.getOrCreateSuborg({
+      filterType: type,
+      filterValue: value,
+      additionalData: createSuborgData
+    });
+    const suborgIds = resp?.subOrganizationIds;
+    if (!suborgIds || suborgIds.length === 0) {
+      onError(constants.authErrors.otp.sendFailed);
+      return;
+    }
+    const suborgId = suborgIds[0];
     const initAuthResponse = await sdkServer.server.sendOtp({
       suborgID: suborgId,
       otpType,
@@ -252,12 +228,26 @@ const Auth = ({
   };
   const handleOAuthLogin = async (credential, providerName) => {
     setOauthLoading(providerName);
-    const suborgId = await handleGetOrCreateSuborg(constants.FilterType.OidcToken, credential, {
+    const createSuborgData = {
       oauthProviders: [{
         providerName,
         oidcToken: credential
       }]
+    };
+    if (customAccounts) {
+      createSuborgData.customAccounts = customAccounts;
+    }
+    const resp = await sdkServer.server.getOrCreateSuborg({
+      filterType: constants.FilterType.OidcToken,
+      filterValue: credential,
+      additionalData: createSuborgData
     });
+    const suborgIds = resp?.subOrganizationIds;
+    if (!suborgIds || suborgIds.length === 0) {
+      onError(constants.authErrors.oauth.loginFailed);
+      return;
+    }
+    const suborgId = suborgIds[0];
     const oauthResponse = await sdkServer.server.oauth({
       suborgID: suborgId,
       oidcToken: credential,