Merge pull request #224 from devforth/beforeLoginConfirmation-fix

fix: Support both single function and array for beforeLoginConfirmation

Author: ivictbor

adminforth/modules/configValidator.ts

@@ -942,8 +942,16 @@ export default class ConfigValidator implements IConfigValidator {
         throw new Error(`Resource with id "${newConfig.auth.usersResourceId}" not found. ${similar ? `Did you mean "${similar}"?` : ''}`);
       }
 
-      if (!newConfig.auth.beforeLoginConfirmation) {
-        newConfig.auth.beforeLoginConfirmation = [];
+      // normalize beforeLoginConfirmation hooks
+      const blc = this.inputConfig.auth.beforeLoginConfirmation;
+      if (!Array.isArray(blc)) {
+        if (blc) {
+          newConfig.auth.beforeLoginConfirmation = [blc];
+        } else {
+          newConfig.auth.beforeLoginConfirmation = [];
+        }
+      } else {
+        newConfig.auth.beforeLoginConfirmation = blc;
       }
     }
 

adminforth/modules/restApi.ts

@@ -84,22 +84,21 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
 
   async processLoginCallbacks(adminUser: AdminUser, toReturn: { redirectTo?: string, allowedLogin:boolean, error?: string }, response: any, extra: HttpExtra) {
     const beforeLoginConfirmation = this.adminforth.config.auth.beforeLoginConfirmation as (BeforeLoginConfirmationFunction[] | undefined);
-    if (beforeLoginConfirmation?.length){
-      for (const hook of beforeLoginConfirmation) {
-        const resp = await hook({ 
-          adminUser, 
-          response,
-          adminforth: this.adminforth,
-          extra,
-        });
-        
-        if (resp?.body?.redirectTo || resp?.error) {
-          // delete all items from toReturn and add these:
-          toReturn.redirectTo = resp?.body?.redirectTo;
-          toReturn.allowedLogin = resp?.body?.allowedLogin;
-          toReturn.error = resp?.error;
-          break;
-        }
+
+    for (const hook of listify(beforeLoginConfirmation)) {
+      const resp = await hook({ 
+        adminUser, 
+        response,
+        adminforth: this.adminforth,
+        extra,
+      });
+      
+      if (resp?.body?.redirectTo || resp?.error) {
+        // delete all items from toReturn and add these:
+        toReturn.redirectTo = resp?.body?.redirectTo;
+        toReturn.allowedLogin = resp?.body?.allowedLogin;
+        toReturn.error = resp?.error;
+        break;
       }
     }
   }