normalize beforeLoginConfirmation to support both single function and array formats

Author: SerVitasik

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

@@ -85,7 +85,7 @@ 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);
 
-    for (const hook of listify(Array.isArray(beforeLoginConfirmation) ? beforeLoginConfirmation : [beforeLoginConfirmation])) {
+    for (const hook of listify(beforeLoginConfirmation)) {
       const resp = await hook({ 
         adminUser, 
         response,