fix: handle tenant not found error (#639)

* fix: handle tenant not found error * fix: pr comments * fix: pr comments
supertokens · Jul 17, 2023 · d2bf8ce · d2bf8ce
1 parent f3f5044
commit d2bf8ce
Show file tree

Hide file tree

Showing 30 changed files with 151 additions and 115 deletions.
diff --git a/lib/build/recipe/multitenancy/api/implementation.js b/lib/build/recipe/multitenancy/api/implementation.js
@@ -40,6 +40,9 @@ function getAPIInterface() {
                     tenantId,
                     userContext,
                 });
+                if (tenantConfigRes === undefined) {
+                    throw new Error("Tenant not found");
+                }
                 const providerInputsFromStatic = options.staticThirdPartyProviders;
                 const providerConfigsFromCore = tenantConfigRes.thirdParty.providers;
                 const mergedProviders = configUtils_1.mergeProvidersFromCoreAndStatic(
@@ -55,6 +58,9 @@ function getAPIInterface() {
                             clientType,
                             userContext
                         );
+                        if (providerInstance === undefined) {
+                            throw new Error("should never come here"); // because creating instance from the merged provider list itself
+                        }
                         finalProviderList.push({
                             id: providerInstance.id,
                             name: providerInstance.config.name,

diff --git a/lib/build/recipe/multitenancy/index.d.ts b/lib/build/recipe/multitenancy/index.d.ts
@@ -30,22 +30,25 @@ export default class Wrapper {
     static getTenant(
         tenantId: string,
         userContext?: any
-    ): Promise<{
-        status: "OK";
-        emailPassword: {
-            enabled: boolean;
-        };
-        passwordless: {
-            enabled: boolean;
-        };
-        thirdParty: {
-            enabled: boolean;
-            providers: ProviderConfig[];
-        };
-        coreConfig: {
-            [key: string]: any;
-        };
-    }>;
+    ): Promise<
+        | {
+              status: "OK";
+              emailPassword: {
+                  enabled: boolean;
+              };
+              passwordless: {
+                  enabled: boolean;
+              };
+              thirdParty: {
+                  enabled: boolean;
+                  providers: ProviderConfig[];
+              };
+              coreConfig: {
+                  [key: string]: any;
+              };
+          }
+        | undefined
+    >;
     static listAllTenants(
         userContext?: any
     ): Promise<{

diff --git a/lib/build/recipe/multitenancy/recipeImplementation.js b/lib/build/recipe/multitenancy/recipeImplementation.js
@@ -75,6 +75,9 @@ function getRecipeInterface(querier) {
                     ),
                     {}
                 );
+                if (response.status === "TENANT_NOT_FOUND_ERROR") {
+                    return undefined;
+                }
                 return response;
             });
         },

diff --git a/lib/build/recipe/multitenancy/types.d.ts b/lib/build/recipe/multitenancy/types.d.ts
@@ -50,22 +50,25 @@ export declare type RecipeInterface = {
     getTenant: (input: {
         tenantId: string;
         userContext: any;
-    }) => Promise<{
-        status: "OK";
-        emailPassword: {
-            enabled: boolean;
-        };
-        passwordless: {
-            enabled: boolean;
-        };
-        thirdParty: {
-            enabled: boolean;
-            providers: ProviderConfig[];
-        };
-        coreConfig: {
-            [key: string]: any;
-        };
-    }>;
+    }) => Promise<
+        | {
+              status: "OK";
+              emailPassword: {
+                  enabled: boolean;
+              };
+              passwordless: {
+                  enabled: boolean;
+              };
+              thirdParty: {
+                  enabled: boolean;
+                  providers: ProviderConfig[];
+              };
+              coreConfig: {
+                  [key: string]: any;
+              };
+          }
+        | undefined
+    >;
     listAllTenants: (input: {
         userContext: any;
     }) => Promise<{

diff --git a/lib/build/recipe/thirdparty/api/authorisationUrl.js b/lib/build/recipe/thirdparty/api/authorisationUrl.js
@@ -78,7 +78,13 @@ function authorisationUrlAPI(apiImplementation, tenantId, options, userContext)
             tenantId,
             userContext,
         });
-        const provider = providerResponse.provider;
+        if (providerResponse === undefined) {
+            throw new error_1.default({
+                type: error_1.default.BAD_INPUT_ERROR,
+                message: `the provider ${thirdPartyId} could not be found in the configuration`,
+            });
+        }
+        const provider = providerResponse;
         let result = yield apiImplementation.authorisationUrlGET({
             provider,
             redirectURIOnProviderDashboard,

diff --git a/lib/build/recipe/thirdparty/api/signinup.js b/lib/build/recipe/thirdparty/api/signinup.js
@@ -90,7 +90,13 @@ function signInUpAPI(apiImplementation, tenantId, options, userContext) {
             clientType,
             userContext,
         });
-        const provider = providerResponse.provider;
+        if (providerResponse === undefined) {
+            throw new error_1.default({
+                type: error_1.default.BAD_INPUT_ERROR,
+                message: `the provider ${thirdPartyId} could not be found in the configuration`,
+            });
+        }
+        const provider = providerResponse;
         let result = yield apiImplementation.signInUpPOST({
             provider,
             redirectURIInfo,

diff --git a/lib/build/recipe/thirdparty/index.d.ts b/lib/build/recipe/thirdparty/index.d.ts
@@ -10,10 +10,7 @@ export default class Wrapper {
         thirdPartyId: string,
         clientType: string | undefined,
         userContext?: any
-    ): Promise<{
-        status: "OK";
-        provider: TypeProvider;
-    }>;
+    ): Promise<TypeProvider | undefined>;
     static manuallyCreateOrUpdateUser(
         tenantId: string,
         thirdPartyId: string,

diff --git a/lib/build/recipe/thirdparty/providers/configUtils.d.ts b/lib/build/recipe/thirdparty/providers/configUtils.d.ts
@@ -15,7 +15,7 @@ export declare function findAndCreateProviderInstance(
     thirdPartyId: string,
     clientType: string | undefined,
     userContext: any
-): Promise<TypeProvider>;
+): Promise<TypeProvider | undefined>;
 export declare function mergeConfig(staticConfig: ProviderConfig, coreConfig: ProviderConfig): ProviderConfig;
 export declare function mergeProvidersFromCoreAndStatic(
     providerConfigsFromCore: ProviderConfig[],

diff --git a/lib/build/recipe/thirdparty/providers/configUtils.js b/lib/build/recipe/thirdparty/providers/configUtils.js
@@ -40,7 +40,6 @@ exports.mergeProvidersFromCoreAndStatic = exports.mergeConfig = exports.findAndC
 const _1 = require(".");
 const custom_1 = __importDefault(require("./custom"));
 const utils_1 = require("./utils");
-const error_1 = __importDefault(require("../error"));
 function getProviderConfigForClient(providerConfig, clientConfig) {
     return Object.assign(Object.assign({}, providerConfig), clientConfig);
 }
@@ -85,10 +84,7 @@ function findAndCreateProviderInstance(providers, thirdPartyId, clientType, user
                 return providerInstance;
             }
         }
-        throw new error_1.default({
-            type: error_1.default.BAD_INPUT_ERROR,
-            message: `the provider ${thirdPartyId} could not be found in the configuration`,
-        });
+        return undefined;
     });
 }
 exports.findAndCreateProviderInstance = findAndCreateProviderInstance;

diff --git a/lib/build/recipe/thirdparty/recipeImplementation.js b/lib/build/recipe/thirdparty/recipeImplementation.js
@@ -121,6 +121,9 @@ function getRecipeImplementation(querier, providers) {
             return __awaiter(this, void 0, void 0, function* () {
                 const mtRecipe = recipe_1.default.getInstanceOrThrowError();
                 const tenantConfig = yield mtRecipe.recipeInterfaceImpl.getTenant({ tenantId, userContext });
+                if (tenantConfig === undefined) {
+                    throw new Error("Tenant not found");
+                }
                 const mergedProviders = configUtils_1.mergeProvidersFromCoreAndStatic(
                     tenantConfig.thirdParty.providers,
                     providers
@@ -131,10 +134,7 @@ function getRecipeImplementation(querier, providers) {
                     clientType,
                     userContext
                 );
-                return {
-                    status: "OK",
-                    provider,
-                };
+                return provider;
             });
         },
     };

diff --git a/lib/build/recipe/thirdparty/types.d.ts b/lib/build/recipe/thirdparty/types.d.ts
@@ -151,10 +151,7 @@ export declare type RecipeInterface = {
         tenantId: string;
         clientType?: string;
         userContext: any;
-    }): Promise<{
-        status: "OK";
-        provider: TypeProvider;
-    }>;
+    }): Promise<TypeProvider | undefined>;
     signInUp(input: {
         thirdPartyId: string;
         thirdPartyUserId: string;

diff --git a/lib/build/recipe/thirdpartyemailpassword/index.d.ts b/lib/build/recipe/thirdpartyemailpassword/index.d.ts
@@ -12,10 +12,7 @@ export default class Wrapper {
         thirdPartyId: string,
         clientType: string | undefined,
         userContext?: any
-    ): Promise<{
-        status: "OK";
-        provider: TypeProvider;
-    }>;
+    ): Promise<TypeProvider | undefined>;
     static thirdPartyManuallyCreateOrUpdateUser(
         tenantId: string,
         thirdPartyId: string,

diff --git a/lib/build/recipe/thirdpartyemailpassword/types.d.ts b/lib/build/recipe/thirdpartyemailpassword/types.d.ts
@@ -90,10 +90,7 @@ export declare type RecipeInterface = {
         clientType?: string;
         tenantId: string;
         userContext: any;
-    }): Promise<{
-        status: "OK";
-        provider: TypeProvider;
-    }>;
+    }): Promise<TypeProvider | undefined>;
     thirdPartySignInUp(input: {
         thirdPartyId: string;
         thirdPartyUserId: string;

diff --git a/lib/build/recipe/thirdpartypasswordless/index.d.ts b/lib/build/recipe/thirdpartypasswordless/index.d.ts
@@ -19,10 +19,7 @@ export default class Wrapper {
         thirdPartyId: string,
         clientType: string | undefined,
         userContext?: any
-    ): Promise<{
-        status: "OK";
-        provider: TypeProvider;
-    }>;
+    ): Promise<TypeProvider | undefined>;
     static thirdPartyManuallyCreateOrUpdateUser(
         tenantId: string,
         thirdPartyId: string,

diff --git a/lib/build/recipe/thirdpartypasswordless/types.d.ts b/lib/build/recipe/thirdpartypasswordless/types.d.ts
@@ -176,10 +176,7 @@ export declare type RecipeInterface = {
         clientType?: string;
         tenantId: string;
         userContext: any;
-    }): Promise<{
-        status: "OK";
-        provider: TypeProvider;
-    }>;
+    }): Promise<TypeProvider | undefined>;
     createCode: (
         input: (
             | {

diff --git a/lib/ts/recipe/multitenancy/api/implementation.ts b/lib/ts/recipe/multitenancy/api/implementation.ts
@@ -9,6 +9,10 @@ export default function getAPIInterface(): APIInterface {
                 userContext,
             });
 
+            if (tenantConfigRes === undefined) {
+                throw new Error("Tenant not found");
+            }
+
             const providerInputsFromStatic = options.staticThirdPartyProviders;
             const providerConfigsFromCore = tenantConfigRes.thirdParty.providers;
 
@@ -27,6 +31,11 @@ export default function getAPIInterface(): APIInterface {
                         clientType,
                         userContext
                     );
+
+                    if (providerInstance === undefined) {
+                        throw new Error("should never come here"); // because creating instance from the merged provider list itself
+                    }
+
                     finalProviderList.push({
                         id: providerInstance.id,
                         name: providerInstance.config.name,

diff --git a/lib/ts/recipe/multitenancy/index.ts b/lib/ts/recipe/multitenancy/index.ts
@@ -59,20 +59,23 @@ export default class Wrapper {
     static async getTenant(
         tenantId: string,
         userContext?: any
-    ): Promise<{
-        status: "OK";
-        emailPassword: {
-            enabled: boolean;
-        };
-        passwordless: {
-            enabled: boolean;
-        };
-        thirdParty: {
-            enabled: boolean;
-            providers: ProviderConfig[];
-        };
-        coreConfig: { [key: string]: any };
-    }> {
+    ): Promise<
+        | {
+              status: "OK";
+              emailPassword: {
+                  enabled: boolean;
+              };
+              passwordless: {
+                  enabled: boolean;
+              };
+              thirdParty: {
+                  enabled: boolean;
+                  providers: ProviderConfig[];
+              };
+              coreConfig: { [key: string]: any };
+          }
+        | undefined
+    > {
         const recipeInstance = Recipe.getInstanceOrThrowError();
         return recipeInstance.recipeInterfaceImpl.getTenant({
             tenantId,

diff --git a/lib/ts/recipe/multitenancy/recipeImplementation.ts b/lib/ts/recipe/multitenancy/recipeImplementation.ts
@@ -34,6 +34,10 @@ export default function getRecipeInterface(querier: Querier): RecipeInterface {
                 {}
             );
 
+            if (response.status === "TENANT_NOT_FOUND_ERROR") {
+                return undefined;
+            }
+
             return response;
         },
 

diff --git a/lib/ts/recipe/multitenancy/types.ts b/lib/ts/recipe/multitenancy/types.ts
@@ -69,20 +69,23 @@ export type RecipeInterface = {
     getTenant: (input: {
         tenantId: string;
         userContext: any;
-    }) => Promise<{
-        status: "OK";
-        emailPassword: {
-            enabled: boolean;
-        };
-        passwordless: {
-            enabled: boolean;
-        };
-        thirdParty: {
-            enabled: boolean;
-            providers: ProviderConfig[];
-        };
-        coreConfig: { [key: string]: any };
-    }>;
+    }) => Promise<
+        | {
+              status: "OK";
+              emailPassword: {
+                  enabled: boolean;
+              };
+              passwordless: {
+                  enabled: boolean;
+              };
+              thirdParty: {
+                  enabled: boolean;
+                  providers: ProviderConfig[];
+              };
+              coreConfig: { [key: string]: any };
+          }
+        | undefined
+    >;
     listAllTenants: (input: {
         userContext: any;
     }) => Promise<{

diff --git a/lib/ts/recipe/thirdparty/api/authorisationUrl.ts b/lib/ts/recipe/thirdparty/api/authorisationUrl.ts
@@ -52,7 +52,14 @@ export default async function authorisationUrlAPI(
         userContext,
     });
 
-    const provider = providerResponse.provider;
+    if (providerResponse === undefined) {
+        throw new STError({
+            type: STError.BAD_INPUT_ERROR,
+            message: `the provider ${thirdPartyId} could not be found in the configuration`,
+        });
+    }
+
+    const provider = providerResponse;
     let result = await apiImplementation.authorisationUrlGET({
         provider,
         redirectURIOnProviderDashboard,