fix: handle null in provider list of the tenant config

supertokens · Aug 27, 2023 · ac38eb3 · ac38eb3
1 parent 1f5c5dd
commit ac38eb3
Show file tree

Hide file tree

Showing 12 changed files with 164 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.34.2] - 2023-08-27
+
+### Fixes
+
+-   Fixed the SDK trying to merge the providers from the tenant config if the third party login method is disabled.
+
 ## [0.34.1] - 2023-07-31
 
 ### Changes
@@ -35,43 +41,54 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Backend SDKs have to be updated first to a version that supports multi-tenancy for thirdparty
     -   supertokens-node: >= 15.0.0
 -   In ThirdParty recipe,
+
     -   Changed signatures of the functions `getAuthorisationURLWithQueryParamsAndSetState`
+
         ```diff
          import { getAuthorisationURLWithQueryParamsAndSetState } from 'supertokens-auth-react/recipe/thirdparty';
-        
+
          getAuthorisationURLWithQueryParamsAndSetState({
         -  providerId: "google",
         +  thirdPartyId: "google",
         -  authorisationURL: "http://localhost/auth/callback/google",
         +  frontendRedirectURI: "http://localhost/auth/callback/google",
          });
         ```
+
     -   Removed functions - `setStateAndOtherInfoToStorage`, `getAuthorisationURLFromBackend`, `generateStateToSendToOAuthProvider`, `verifyAndGetStateOrThrowError`, `getAuthCodeFromURL`, `getAuthErrorFromURL`, `getAuthStateFromURL`
+
 -   In ThirdPartyEmailpassword recipe,
+
     -   Changed signatures of the functions `getAuthorisationURLWithQueryParamsAndSetState`
+
         ```diff
          import { getAuthorisationURLWithQueryParamsAndSetState } from 'supertokens-auth-react/recipe/thirdpartyemailpassword';
-        
+
          getAuthorisationURLWithQueryParamsAndSetState({
         -  providerId: "google",
         +  thirdPartyId: "google",
         -  authorisationURL: "http://localhost/auth/callback/google",
         +  frontendRedirectURI: "http://localhost/auth/callback/google",
          });
         ```
+
     -   Removed functions - `setStateAndOtherInfoToStorage`, `getAuthorisationURLFromBackend`, `generateStateToSendToOAuthProvider`, `verifyAndGetStateOrThrowError`, `getAuthCodeFromURL`, `getAuthErrorFromURL`, `getAuthStateFromURL`
+
 -   In ThirdPartyPasswordless recipe,
+
     -   Changed signatures of the functions `getThirdPartyAuthorisationURLWithQueryParamsAndSetState`
+
         ```diff
          import { getAuthorisationURLWithQueryParamsAndSetState } from 'supertokens-auth-react/recipe/thirdpartypasswordless';
-        
+
          getAuthorisationURLWithQueryParamsAndSetState({
         -  providerId: "google",
         +  thirdPartyId: "google",
         -  authorisationURL: "http://localhost/auth/callback/google",
         +  frontendRedirectURI: "http://localhost/auth/callback/google",
          });
         ```
+
     -   Removed functions - `setThirdPartyStateAndOtherInfoToStorage`, `getAuthorisationURLFromBackend`, `generateThirdPartyStateToSendToOAuthProvider`, `verifyAndGetThirdPartyStateOrThrowError`, `getThirdPartyAuthCodeFromURL`, `getThirdPartyAuthErrorFromURL`, `getThirdPartyAuthStateFromURL`
 
 ## [0.33.1] - 2023-06-08

diff --git a/examples/for-tests-react-16/src/testContext.js b/examples/for-tests-react-16/src/testContext.js
@@ -13,7 +13,7 @@ export function getTestContext() {
         mockLoginMethodsForDynamicLogin: localStorage.getItem("mockLoginMethodsForDynamicLogin"),
         staticProviderList: localStorage.getItem("staticProviderList"),
         mockTenantId: localStorage.getItem("mockTenantId"),
-        clientType: localStorage.getItem("clientType"),
+        clientType: localStorage.getItem("clientType") || undefined,
     };
     return ret;
 }

diff --git a/examples/for-tests/src/testContext.js b/examples/for-tests/src/testContext.js
@@ -13,7 +13,7 @@ export function getTestContext() {
         mockLoginMethodsForDynamicLogin: localStorage.getItem("mockLoginMethodsForDynamicLogin"),
         staticProviderList: localStorage.getItem("staticProviderList"),
         mockTenantId: localStorage.getItem("mockTenantId"),
-        clientType: localStorage.getItem("clientType"),
+        clientType: localStorage.getItem("clientType") || undefined,
     };
     return ret;
 }

diff --git a/lib/build/thirdparty-shared.js b/lib/build/thirdparty-shared.js
diff --git a/lib/build/thirdparty-shared2.js b/lib/build/thirdparty-shared2.js
diff --git a/lib/build/version.d.ts b/lib/build/version.d.ts
diff --git a/lib/ts/recipe/thirdparty/components/features/signInAndUp/index.tsx b/lib/ts/recipe/thirdparty/components/features/signInAndUp/index.tsx
@@ -92,7 +92,9 @@ export function useChildProps(recipe: Recipe | undefined): ThirdPartySignInUpChi
             if (dynamicLoginMethods.loaded === false) {
                 throw new Error("Component requiring dynamicLoginMethods rendered without FeatureWrapper.");
             } else {
-                tenantProviders = dynamicLoginMethods.loginMethods.thirdparty.providers;
+                tenantProviders = dynamicLoginMethods.loginMethods.thirdparty.enabled
+                    ? dynamicLoginMethods.loginMethods.thirdparty.providers
+                    : [];
             }
         }
 

diff --git a/lib/ts/recipe/thirdparty/utils.ts b/lib/ts/recipe/thirdparty/utils.ts
@@ -141,8 +141,9 @@ export async function redirectToThirdPartyLogin(input: {
     const loginMethods = await Multitenancy.getInstanceOrThrow().getCurrentDynamicLoginMethods({
         userContext: input.userContext,
     });
+    const tenantProviders = loginMethods?.thirdparty.enabled ? loginMethods.thirdparty.providers : [];
     const providers = mergeProviders({
-        tenantProviders: loginMethods?.thirdparty.providers,
+        tenantProviders,
         clientProviders: input.config.signInAndUpFeature.providers,
     });
 

diff --git a/lib/ts/version.ts b/lib/ts/version.ts
@@ -12,4 +12,4 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-export const package_version = "0.34.1";
+export const package_version = "0.34.2";
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "supertokens-auth-react",
-    "version": "0.34.1",
+    "version": "0.34.2",
     "description": "ReactJS SDK that provides login functionality with SuperTokens.",
     "main": "./index.js",
     "engines": {
@@ -83,7 +83,7 @@
     "peerDependencies": {
         "react": ">=16.8.0",
         "react-dom": ">=16.8.0",
-        "supertokens-web-js": "^0.7.0"
+        "supertokens-web-js": "^0.7.2"
     },
     "scripts": {
         "init": "bash ./init.sh",