Merge pull request #298 from devforth/AdminForth/711

chore: change  requestes resource in index.ts.hbs

Author: SerVitasik

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

@@ -3,6 +3,7 @@ import AdminForth from 'adminforth';
 import usersResource from "./resources/adminuser.js";
 import { fileURLToPath } from 'url';
 import path from 'path';
+import { Filters } from 'adminforth';
 
 const ADMIN_BASE_URL = '';
 
@@ -16,7 +17,7 @@ export const admin = new AdminForth({
     loginBackgroundImage: 'https://images.unsplash.com/photo-1534239697798-120952b76f2b?q=80&w=3389&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D',
     loginBackgroundPosition: '1/2',
     loginPromptHTML: async () => { 
-      const adminforthUserExists = await admin.resource("users").count(Filters.EQ('email', 'adminforth')) > 0;
+      const adminforthUserExists = await admin.resource("adminuser").count(Filters.EQ('email', 'adminforth')) > 0;
       if (adminforthUserExists) {
         return "Please use <b>adminforth</b> as username and <b>adminforth</b> as password"
       }

adminforth/modules/restApi.ts

@@ -194,6 +194,18 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
         },
     })
 
+    server.endpoint({
+      noAuth: true,
+      method: 'GET',
+      path: '/get_login_form_config',
+      handler: async ({ tr }) => {
+        const loginPromptHTML = await getLoginPromptHTML(this.adminforth.config.auth.loginPromptHTML);
+        return {
+          loginPromptHTML: await tr(loginPromptHTML, 'system.loginPromptHTML'),
+        }
+      }
+    })
+
     server.endpoint({
       noAuth: true,
       method: 'GET',
@@ -210,8 +222,6 @@ 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);
 
-        const loginPromptHTML = await getLoginPromptHTML(this.adminforth.config.auth.loginPromptHTML);
-
         return {
           brandName: this.adminforth.config.customization.brandName,
           usernameFieldName: usernameColumn.label,
@@ -220,7 +230,6 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
           removeBackgroundBlendMode: this.adminforth.config.auth.removeBackgroundBlendMode,
           title: this.adminforth.config.customization?.title,
           demoCredentials: this.adminforth.config.auth.demoCredentials,
-          loginPromptHTML: await tr(loginPromptHTML, 'system.loginPromptHTML'),
           loginPageInjections: this.adminforth.config.customization.loginPageInjections,
           globalInjections: {
             everyPageBottom: this.adminforth.config.customization.globalInjections.everyPageBottom,
@@ -295,7 +304,6 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
 
         const announcementBadge: AnnouncementBadgeResponse = this.adminforth.config.customization.announcementBadge?.(adminUser);
 
-        const loginPromptHTML = await getLoginPromptHTML(this.adminforth.config.auth.loginPromptHTML);
 
 
         const publicPart = {
@@ -306,7 +314,6 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
           removeBackgroundBlendMode: this.adminforth.config.auth.removeBackgroundBlendMode,
           title: this.adminforth.config.customization?.title,
           demoCredentials: this.adminforth.config.auth.demoCredentials,
-          loginPromptHTML: await tr(loginPromptHTML, 'system.loginPromptHTML'),
           loginPageInjections: this.adminforth.config.customization.loginPageInjections,
           rememberMeDays: this.adminforth.config.auth.rememberMeDays,
           singleTheme: this.adminforth.config.customization.singleTheme,

adminforth/spa/src/views/LoginView.vue

@@ -102,14 +102,14 @@
                           </div>
                         </div>
 
-                        <div v-if="coreStore.config?.loginPromptHTML"
+                        <div v-if="loginPromptHTML"
                           class="flex items-center p-4 mb-4 text-sm text-gray-800 rounded-lg bg-gray-50 dark:bg-gray-800 dark:text-gray-400" role="alert"
                         >
                           <svg class="flex-shrink-0 inline w-4 h-4 me-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
                             <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"/>
                           </svg>
                           <span class="sr-only">{{ $t('Info') }}</span>
-                          <div v-html="coreStore.config?.loginPromptHTML"></div>
+                          <div v-html="loginPromptHTML"></div>
                         </div>
                         <Button @click="login" :loader="inProgress" :disabled="inProgress" class="w-full">
                           {{ $t('Login to your account') }}
@@ -148,7 +148,7 @@ const password = ref('');
 const route = useRoute();
 const router = useRouter();
 const inProgress = ref(false);
-
+const loginPromptHTML = ref()
 const coreStore = useCoreStore();
 const user = useUserStore();
 
@@ -160,8 +160,13 @@ const backgroundPosition = computed(() => {
   return coreStore.config?.loginBackgroundPosition || '1/2';
 });
 
-async function loadPublicConfig() {
-  await coreStore.getPublicConfig();
+
+async function getLoginFormConfig() {
+  const response = await callAdminForthApi({
+    path: '/get_login_form_config',
+    method: 'GET',
+  });
+  loginPromptHTML.value = response.loginPromptHTML;
 }
 
 onBeforeMount(() => {
@@ -177,7 +182,7 @@ onBeforeMount(() => {
 })
 
 onMounted(async () => {
-  loadPublicConfig();
+  getLoginFormConfig();
     if (coreStore.config?.demoCredentials) {
       const [demoUsername, demoPassword] = coreStore.config.demoCredentials.split(':');
       username.value = demoUsername;