fix: add possibility to pass void functions to the loginPromptHTML

Author: yaroslav8765

adminforth/commands/createApp/templates/index.ts.hbs

@@ -20,7 +20,6 @@ export const admin = new AdminForth({
       if (adminforthUserExists) {
         return "Please use <b>adminforth</b> as username and <b>adminforth</b> as password"
       }
-      return "";
     },
   },
   customization: {

adminforth/modules/restApi.ts

@@ -210,12 +210,7 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
         const resource = this.adminforth.config.resources.find((res) => res.resourceId === this.adminforth.config.auth.usersResourceId);
         const usernameColumn = resource.columns.find((col) => col.name === usernameField);
 
-        let loginPromptHTML;
-        if(typeof this.adminforth.config.auth.loginPromptHTML === 'function') {
-          loginPromptHTML = await this.adminforth.config.auth.loginPromptHTML();
-        } else {
-          loginPromptHTML = this.adminforth.config.auth.loginPromptHTML;
-        }
+        let loginPromptHTML = await getLoginPromptHTML(this.adminforth.config.auth.loginPromptHTML);
 
         return {
           brandName: this.adminforth.config.customization.brandName,
@@ -234,7 +229,17 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
       },
     });
 
-    
+    async function getLoginPromptHTML(prompt) {
+        if(typeof prompt === 'function') {
+          const result = await prompt();
+          if(result !== undefined){
+            return result;
+          }
+          return "";
+        } else {
+          return prompt;
+        }
+    }
     server.endpoint({
       method: 'GET',
       path: '/get_base_config',
@@ -298,12 +303,7 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
 
         const announcementBadge: AnnouncementBadgeResponse = this.adminforth.config.customization.announcementBadge?.(adminUser);
 
-        let loginPromptHTML;
-        if(typeof this.adminforth.config.auth.loginPromptHTML === 'function') {
-          loginPromptHTML = await this.adminforth.config.auth.loginPromptHTML();
-        } else {
-          loginPromptHTML = this.adminforth.config.auth.loginPromptHTML;
-        }
+        let loginPromptHTML = await getLoginPromptHTML(this.adminforth.config.auth.loginPromptHTML);
 
 
         const publicPart = {

adminforth/types/Back.ts

@@ -956,7 +956,7 @@ export interface AdminForthInputConfig {
       /**
        * Any prompt to show users on login. Supports HTML.
        */
-      loginPromptHTML?: string | (() => string | Promise<string>)
+      loginPromptHTML?: string | (() => string | void | undefined | Promise<string | void | undefined>) | undefined 
 
       /**
        * Remember me days for "Remember Me" checkbox on login page.

adminforth/types/Common.ts

@@ -1057,7 +1057,7 @@ export interface AdminForthConfigForFrontend {
   loginBackgroundPosition: string,
   title?: string,
   demoCredentials?: string,
-  loginPromptHTML?: string | (() => string | Promise<string>)
+  loginPromptHTML?: string | (() => string | Promise<string> | void | Promise<void> | Promise<undefined>) | undefined 
   loginPageInjections: {
     underInputs: Array<AdminForthComponentDeclaration>,
     panelHeader: Array<AdminForthComponentDeclaration>,