@evershop/evershop 2.1.0 → 2.1.2

package/dist/lib/webpack/prod/createConfigClient.js

@@ -8,10 +8,12 @@ import { createBaseConfig } from '../createBaseConfig.js';
 import { getRouteBuildPath } from '../getRouteBuildPath.js';
 import { getRouteBuildSubPath } from '../getRouteBuildSubPath.js';
 import { isBuildRequired } from '../isBuildRequired.js';
-import { Tailwindcss } from '../plugins/Tailwindcss.js';
+import { InjectTailwindSources } from '../plugins/InjectTailwindSources.js';
+import { getTailwindSources } from '../util/getTailwindSources.js';
 export function createConfigClient(routes) {
     const extenions = getEnabledExtensions();
     const config = createBaseConfig(false);
+    const tailwindSources = getTailwindSources();
     const { plugins } = config;
     const entry = {};
     routes.forEach((route) => {
@@ -61,11 +63,11 @@ export function createConfigClient(routes) {
             inject: false,
             publicPath: '/assets/'
         }));
-        plugins.push(new Tailwindcss(route));
+        //plugins.push(new Tailwindcss(route));
     });
     const loaders = config.module.rules;
     loaders.push({
-        test: /\.(css|scss)$/i,
+        test: /\.css$/i,
         use: [
             MiniCssExtractPlugin.loader,
             {
@@ -74,10 +76,46 @@ export function createConfigClient(routes) {
                     url: false
                 }
             },
+            {
+                loader: 'postcss-loader',
+                options: {
+                    postcssOptions: {
+                        plugins: [
+                            InjectTailwindSources(tailwindSources),
+                            '@tailwindcss/postcss',
+                            'autoprefixer'
+                        ]
+                    }
+                }
+            }
+        ]
+    });
+    loaders.push({
+        test: /\.scss$/i,
+        use: [
+            MiniCssExtractPlugin.loader,
+            {
+                loader: 'css-loader',
+                options: {
+                    url: false
+                }
+            },
+            {
+                loader: 'postcss-loader',
+                options: {
+                    postcssOptions: {
+                        plugins: [
+                            InjectTailwindSources(tailwindSources),
+                            '@tailwindcss/postcss',
+                            'autoprefixer'
+                        ]
+                    }
+                }
+            },
             {
                 loader: 'sass-loader',
                 options: {
-                    sassOptions: { implementation: 'sass' },
+                    implementation: 'sass',
                     api: 'modern'
                 }
             }

package/dist/lib/webpack/prod/createConfigClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"createConfigClient.js","sourceRoot":"","sources":["../../../../src/lib/webpack/prod/createConfigClient.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"createConfigClient.js","sourceRoot":"","sources":["../../../../src/lib/webpack/prod/createConfigClient.js"],"names":[],"mappings":"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"}

package/dist/lib/webpack/util/getTailwindConfig.d.ts

@@ -1 +1,4 @@
+/**
+ * @deprecated This function is deprecated and will be removed in future versions.
+ */
 export function getTailwindConfig(isAdmin?: boolean): Promise<any>;

package/dist/lib/webpack/util/getTailwindConfig.js

@@ -2,6 +2,9 @@ import fs from 'fs';
 import { join } from 'path';
 import { pathToFileURL } from 'url';
 import { getEnabledTheme } from '../../../lib/util/getEnabledTheme.js';
+/**
+ * @deprecated This function is deprecated and will be removed in future versions.
+ */
 export async function getTailwindConfig(isAdmin = false) {
     const defaultTailwindConfig = isAdmin
         ? await import('../../../modules/cms/services/tailwind.admin.config.js')

package/dist/lib/webpack/util/getTailwindConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTailwindConfig.js","sourceRoot":"","sources":["../../../../src/lib/webpack/util/getTailwindConfig.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAEvE,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAO,GAAG,KAAK;IACrD,MAAM,qBAAqB,GAAG,OAAO;QACnC,CAAC,CAAC,MAAM,MAAM,CAAC,wDAAwD,CAAC;QACxE,CAAC,CAAC,MAAM,MAAM,CACV,6DAA6D,CAC9D,CAAC;IAEN,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,wBAAwB;QACxB,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAChC,IACE,KAAK;YACL,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAC7D,CAAC;YACD,cAAc,GAAG,MAAM,MAAM,CAC3B,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAC9D,CAAC;QACJ,CAAC;IACH,CAAC;IACD,oDAAoD;IACpD,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CACxC,qBAAqB,CAAC,OAAO,EAC7B,cAAc,CAAC,OAAO,CACvB,CAAC;IAEF,OAAO,oBAAoB,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"getTailwindConfig.js","sourceRoot":"","sources":["../../../../src/lib/webpack/util/getTailwindConfig.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAEvE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAO,GAAG,KAAK;IACrD,MAAM,qBAAqB,GAAG,OAAO;QACnC,CAAC,CAAC,MAAM,MAAM,CAAC,wDAAwD,CAAC;QACxE,CAAC,CAAC,MAAM,MAAM,CACV,6DAA6D,CAC9D,CAAC;IAEN,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,wBAAwB;QACxB,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAChC,IACE,KAAK;YACL,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAC7D,CAAC;YACD,cAAc,GAAG,MAAM,MAAM,CAC3B,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAC9D,CAAC;QACJ,CAAC;IACH,CAAC;IACD,oDAAoD;IACpD,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CACxC,qBAAqB,CAAC,OAAO,EAC7B,cAAc,CAAC,OAAO,CACvB,CAAC;IAEF,OAAO,oBAAoB,CAAC;AAC9B,CAAC"}

package/dist/lib/webpack/util/getTailwindSources.d.ts

@@ -0,0 +1 @@
+export declare function getTailwindSources(): string[];

package/dist/lib/webpack/util/getTailwindSources.js

@@ -0,0 +1,21 @@
+import path from 'path';
+import { getEnabledExtensions } from '../../../bin/extension/index.js';
+import { CONSTANTS } from '../../helpers.js';
+import { getEnabledTheme } from '../../util/getEnabledTheme.js';
+export function getTailwindSources() {
+    const sources = [];
+    // Add the core source
+    sources.push(path.resolve(CONSTANTS.MODULESPATH, '..', '**/*.{js,jsx,ts,tsx}'));
+    // Add enabled extensions
+    const extensions = getEnabledExtensions();
+    for (const extension of extensions) {
+        sources.push(path.resolve(extension.path, '**/*.{js,jsx,ts,tsx}'));
+    }
+    // Add enabled theme
+    const theme = getEnabledTheme();
+    if (theme) {
+        sources.push(path.resolve(theme.path, '**/*.{js,jsx,ts,tsx}'));
+    }
+    return sources.map((s) => s.replace(/\\/g, '/'));
+}
+//# sourceMappingURL=getTailwindSources.js.map

package/dist/lib/webpack/util/getTailwindSources.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getTailwindSources.js","sourceRoot":"","sources":["../../../../src/lib/webpack/util/getTailwindSources.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,UAAU,kBAAkB;IAChC,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,sBAAsB;IACtB,OAAO,CAAC,IAAI,CACV,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAClE,CAAC;IAEF,yBAAyB;IACzB,MAAM,UAAU,GAAG,oBAAoB,EAAE,CAAC;IAC1C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,oBAAoB;IACpB,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAChC,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;AACnD,CAAC"}

package/dist/lib/webpack/util/parseGraphql.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import JSON5 from 'json5';
 import uniqid from 'uniqid';
 import { isResolvable } from '../../util/isResolvable.js';
-import { generateComponentKey } from './keyGenerator.js';
+import { generateComponentKey } from '../../util/keyGenerator.js';
 import { parseGraphqlByFile } from './parseGraphqlByFile.js';
 export function parseGraphql(modules) {
     let inUsedFragments = [];

package/dist/lib/webpack/util/parseGraphql.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseGraphql.js","sourceRoot":"","sources":["../../../../src/lib/webpack/util/parseGraphql.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"parseGraphql.js","sourceRoot":"","sources":["../../../../src/lib/webpack/util/parseGraphql.js"],"names":[],"mappings":"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"}

package/dist/lib/widget/widgetManager.js

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { warning } from '../log/logger.js';
-import { generateComponentKey } from '../webpack/util/keyGenerator.js';
+import { generateComponentKey } from '../util/keyGenerator.js';
 /**
  * Checks if a given path is a valid and resolvable JavaScript file path.
  * A path is considered valid if it's a string, not empty, exists on the filesystem,

package/dist/lib/widget/widgetManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"widgetManager.js","sourceRoot":"","sources":["../../../src/lib/widget/widgetManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"widgetManager.js","sourceRoot":"","sources":["../../../src/lib/widget/widgetManager.ts"],"names":[],"mappings":"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"}

package/dist/modules/auth/api/refreshUserToken/refreshToken.js

@@ -2,6 +2,7 @@ import { select } from '@evershop/postgres-query-builder';
 import { pool } from '../../../../lib/postgres/connection.js';
 import { INVALID_PAYLOAD, UNAUTHORIZED } from '../../../../lib/util/httpStatus.js';
 import { generateToken, TOKEN_TYPES, verifyRefreshToken } from '../../../../lib/util/jwt.js';
+import { buildAdminUserPayload } from '../../services/buildAdminUserPayload.js';
 export default async (request, response, next) => {
     const { refreshToken } = request.body;
     if (!refreshToken) {
@@ -29,13 +30,10 @@ export default async (request, response, next) => {
                 }
             });
         }
-        // Generate new access token
-        const payload = decoded.user;
-        const newAccessToken = generateToken({
-            user: payload
-        }, TOKEN_TYPES.ADMIN);
+        // Generate new access token using fresh user data
+        const userPayload = buildAdminUserPayload(adminUser);
+        const newAccessToken = generateToken({ user: userPayload }, TOKEN_TYPES.ADMIN);
         return response.json({
-            success: true,
             data: {
                 accessToken: newAccessToken
             }

package/dist/modules/auth/api/refreshUserToken/refreshToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"refreshToken.js","sourceRoot":"","sources":["../../../../../src/modules/auth/api/refreshUserToken/refreshToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAC9D,OAAO,EACL,eAAe,EACf,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,aAAa,EACb,WAAW,EACX,kBAAkB,EACnB,MAAM,6BAA6B,CAAC;AAErC,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAEtC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC;YAC3C,KAAK,EAAE;gBACL,MAAM,EAAE,eAAe;gBACvB,OAAO,EAAE,2BAA2B;aACrC;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,uBAAuB;QACvB,MAAM,OAAO,GAAG,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QACpE,4BAA4B;QAC5B,MAAM,SAAS,GAAG,MAAM,MAAM,EAAE;aAC7B,IAAI,CAAC,YAAY,CAAC;aAClB,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC;aACvD,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;aACrB,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;gBACxC,KAAK,EAAE;oBACL,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,kCAAkC;iBAC5C;aACF,CAAC,CAAC;QACL,CAAC;QAED,4BAA4B;QAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;QAC7B,MAAM,cAAc,GAAG,aAAa,CAClC;YACE,IAAI,EAAE,OAAO;SACd,EACD,WAAW,CAAC,KAAK,CAClB,CAAC;QACF,OAAO,QAAQ,CAAC,IAAI,CAAC;YACnB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACJ,WAAW,EAAE,cAAc;aAC5B;SACF,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YACxC,KAAK,EAAE;gBACL,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,uBAAuB;aAClD;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"refreshToken.js","sourceRoot":"","sources":["../../../../../src/modules/auth/api/refreshUserToken/refreshToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAC9D,OAAO,EACL,eAAe,EACf,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,aAAa,EACb,WAAW,EACX,kBAAkB,EACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAEhF,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAEtC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC;YAC3C,KAAK,EAAE;gBACL,MAAM,EAAE,eAAe;gBACvB,OAAO,EAAE,2BAA2B;aACrC;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,uBAAuB;QACvB,MAAM,OAAO,GAAG,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QACpE,4BAA4B;QAC5B,MAAM,SAAS,GAAG,MAAM,MAAM,EAAE;aAC7B,IAAI,CAAC,YAAY,CAAC;aAClB,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC;aACvD,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;aACrB,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;gBACxC,KAAK,EAAE;oBACL,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,kCAAkC;iBAC5C;aACF,CAAC,CAAC;QACL,CAAC;QAED,kDAAkD;QAClD,MAAM,WAAW,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,cAAc,GAAG,aAAa,CAClC,EAAE,IAAI,EAAE,WAAW,EAAE,EACrB,WAAW,CAAC,KAAK,CAClB,CAAC;QACF,OAAO,QAAQ,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE;gBACJ,WAAW,EAAE,cAAc;aAC5B;SACF,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YACxC,KAAK,EAAE;gBACL,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,uBAAuB;aAClD;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/auth/bootstrap.d.ts

@@ -1,2 +1,2 @@
-declare function _default(): void;
+declare const _default: () => void;
 export default _default;

package/dist/modules/auth/bootstrap.js

@@ -1,25 +1,27 @@
 import { request } from 'express';
-import { hookable } from '../../lib/util/hookable.js';
 import { loginUserWithEmail } from './services/loginUserWithEmail.js';
 import { logoutUser } from './services/logoutUser.js';
 export default () => {
-    request.loginUserWithEmail = async function login(email, password, callback) {
-        await hookable(loginUserWithEmail.bind(this))(email, password);
-        if (this.session) {
-            this.session.save(callback);
-        }
-    };
+    request.loginUserWithEmail =
+        async function login(email, password, callback) {
+            await loginUserWithEmail.bind(this)(email, password);
+            if (this.session) {
+                this.session.save(callback);
+            }
+        };
     request.logoutUser = function logout(callback) {
-        hookable(logoutUser.bind(this))();
+        logoutUser.bind(this)();
         if (this.session) {
             this.session.save(callback);
         }
     };
-    request.isUserLoggedIn = function isUserLoggedIn() {
-        return !!this.session.userID;
-    };
-    request.getCurrentUser = function getCurrentUser() {
-        return this.locals.user;
-    };
+    request.isUserLoggedIn =
+        function isUserLoggedIn() {
+            return !!this.session.userID;
+        };
+    request.getCurrentUser =
+        function getCurrentUser() {
+            return this.locals.user;
+        };
 };
 //# sourceMappingURL=bootstrap.js.map

package/dist/modules/auth/bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/modules/auth/bootstrap.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,eAAe,GAAG,EAAE;IAClB,OAAO,CAAC,kBAAkB,GAAG,KAAK,UAAU,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;QACzE,MAAM,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC/D,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,UAAU,GAAG,SAAS,MAAM,CAAC,QAAQ;QAC3C,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAClC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,cAAc,GAAG,SAAS,cAAc;QAC9C,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC,CAAC;IAEF,OAAO,CAAC,cAAc,GAAG,SAAS,cAAc;QAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/modules/auth/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,eAAe,GAAG,EAAE;IACjB,OAAsC,CAAC,kBAAkB;QACxD,KAAK,UAAU,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;YAC5C,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACrD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC;IAEH,OAAsC,CAAC,UAAU,GAAG,SAAS,MAAM,CAClE,QAAQ;QAER,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC;IAED,OAAsC,CAAC,cAAc;QACpD,SAAS,cAAc;YACrB,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAC/B,CAAC,CAAC;IAEH,OAAsC,CAAC,cAAc;QACpD,SAAS,cAAc;YACrB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC;AACN,CAAC,CAAC"}

package/dist/modules/auth/pages/admin/adminLogin/LoginForm.js

@@ -1,17 +1,15 @@
 import React from 'react';
 import './LoginForm.scss';
 import Area from '@components/common/Area.js';
-import Button from '@components/common/Button.js';
 import { EmailField } from '@components/common/form/EmailField.js';
 import { Form, useFormContext } from '@components/common/form/Form.js';
 import { PasswordField } from '@components/common/form/PasswordField.js';
-import { EnvelopeIcon, LockClosedIcon } from '@heroicons/react/24/outline';
-const SubmitButton = ({ formId }) => {
+import { Button } from '@components/common/ui/Button.js';
+import { LockKeyhole, Mail } from 'lucide-react';
+const SubmitButton = () => {
     const { formState: { isSubmitting } } = useFormContext();
-    return (React.createElement("div", { className: "form-submit-button flex border-t border-divider mt-4 pt-4 justify-between" },
-        React.createElement(Button, { title: "SIGN IN", onAction: () => {
-                document.getElementById(formId).dispatchEvent(new Event('submit', { cancelable: true, bubbles: true }));
-            }, isLoading: isSubmitting })));
+    return (React.createElement("div", { className: "form-submit-button flex border-t border-border mt-4 pt-4 justify-between" },
+        React.createElement(Button, { type: "submit", size: "lg", isLoading: isSubmitting }, "SIGN IN")));
 };
 export default function LoginForm({ authUrl, dashboardUrl }) {
     const [error, setError] = React.useState(null);
@@ -24,17 +22,22 @@ export default function LoginForm({ authUrl, dashboardUrl }) {
         }
     };
     return (React.createElement("div", { className: "admin-login-form" },
+        React.createElement("style", null, `
+        .header {
+          display: none !important;
+        }
+      `),
         React.createElement("div", { className: "flex items-center justify-center mb-7" },
             React.createElement("svg", { width: "60", height: "61", viewBox: "0 0 251 276", fill: "none", xmlns: "http://www.w3.org/2000/svg" },
                 React.createElement("path", { d: "M62.2402 34.2864L0.329313 68.5728L0.131725 137.524L0 206.538L62.306 240.95C96.5546 259.858 124.81 275.363 125.139 275.363C125.468 275.363 142.527 266.035 163.142 254.69C183.691 243.282 211.748 227.841 225.448 220.277L250.278 206.538V191.789V176.978L248.829 177.735C247.973 178.176 219.915 193.617 186.457 212.147C152.933 230.677 125.205 245.677 124.81 245.614C124.349 245.488 102.219 233.387 75.5444 218.639L27.0037 191.853V137.65V83.4471L48.9359 71.346C60.9229 64.7282 82.9211 52.6271 97.7401 44.4337C112.493 36.2402 124.876 29.5594 125.139 29.5594C125.402 29.5594 142.593 38.9504 163.339 50.4212L223.801 83.447L233.337 78.0776L250.278 68.5728L223.801 54.1398C202.857 42.2908 125.6 -0.0629883 124.941 6.10352e-05C124.546 6.10352e-05 96.2912 15.4415 62.2402 34.2864Z", fill: "#008060" }),
                 React.createElement("path", { d: "M188.367 102.796C154.514 121.515 126.325 137.019 125.732 137.146C125.073 137.335 108.542 128.511 87.0045 116.662L49.397 95.8632V110.8L49.4628 125.675L86.0166 145.843C106.105 156.936 123.229 166.264 124.085 166.579C125.402 167.02 134.623 162.167 187.445 132.986C221.43 114.141 249.488 98.5734 249.817 98.3213C250.08 98.0691 250.212 91.3253 250.146 83.321L249.949 68.7618L188.367 102.796Z", fill: "#008060" }),
                 React.createElement("path", { d: "M243.362 126.557C239.74 128.511 211.814 143.953 181.254 160.844C150.694 177.735 125.468 191.537 125.139 191.537C124.81 191.537 107.751 182.21 87.1363 170.865L49.7263 150.192L49.5288 164.688C49.397 175.781 49.5946 179.373 50.1874 179.941C51.4388 181.012 124.349 221.16 125.139 221.16C125.798 221.16 248.763 153.406 249.817 152.524C250.08 152.272 250.212 145.528 250.146 137.461L249.949 122.902L243.362 126.557Z", fill: "#008060" }))),
-        error && React.createElement("div", { className: "text-critical py-2" }, error),
+        error && React.createElement("div", { className: "text-destructive py-2" }, error),
         React.createElement(Form, { action: authUrl, method: "POST", id: "adminLoginForm", onSuccess: onSuccess, submitBtn: false },
-            React.createElement(Area, { id: "adminLoginForm", coreComponents: [
+            React.createElement(Area, { id: "adminLoginForm", className: "space-y-3", coreComponents: [
                     {
                         component: {
-                            default: (React.createElement(EmailField, { prefixIcon: React.createElement(EnvelopeIcon, { className: "h-5 w-5" }), label: "Email", name: "email", placeholder: "Email", required: true, validation: {
+                            default: (React.createElement(EmailField, { prefixIcon: React.createElement(Mail, { className: "h-5 w-5" }), label: "Email", name: "email", placeholder: "Email", required: true, validation: {
                                     required: 'Email is required'
                                 } }))
                         },
@@ -42,7 +45,7 @@ export default function LoginForm({ authUrl, dashboardUrl }) {
                     },
                     {
                         component: {
-                            default: (React.createElement(PasswordField, { prefixIcon: React.createElement(LockClosedIcon, { className: "h-5 w-5" }), label: "Password", name: "password", placeholder: "Password", required: true, validation: {
+                            default: (React.createElement(PasswordField, { prefixIcon: React.createElement(LockKeyhole, { className: "h-5 w-5" }), label: "Password", name: "password", placeholder: "Password", required: true, validation: {
                                     required: 'Password is required'
                                 }, showToggle: true }))
                         },
@@ -50,11 +53,11 @@ export default function LoginForm({ authUrl, dashboardUrl }) {
                     },
                     {
                         component: {
-                            default: React.createElement(SubmitButton, { formId: "adminLoginForm" })
+                            default: React.createElement(SubmitButton, null)
                         },
                         sortOrder: 30
                     }
-                ], noOuter: true }))));
+                ] }))));
 }
 export const layout = {
     areaId: 'content',

package/dist/modules/auth/pages/admin/adminLogin/LoginForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoginForm.js","sourceRoot":"","sources":["../../../../../../src/modules/auth/pages/admin/adminLogin/LoginForm.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"LoginForm.js","sourceRoot":"","sources":["../../../../../../src/modules/auth/pages/admin/adminLogin/LoginForm.tsx"],"names":[],"mappings":"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"}

package/dist/modules/auth/pages/admin/adminLogin/LoginForm.scss

@@ -1,7 +1,4 @@
-.header {
-  display: none !important;
-}
-#app {
+body.adminLogin {
   .content-wrapper {
     margin-top: 0;
   }

package/dist/modules/auth/pages/admin/all/AdminUser.js

@@ -1,13 +1,9 @@
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from '@components/common/ui/DropdownMenu.js';
+import { LogOut } from 'lucide-react';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { toast } from 'react-toastify';
-import './AdminUser.scss';
 export default function AdminUser({ adminUser, logoutUrl, loginPage }) {
-    const [showLogout, setShowLogout] = React.useState(false);
-    const show = (e) => {
-        e.preventDefault();
-        setShowLogout(!showLogout);
-    };
     const logout = async () => {
         const response = await fetch(logoutUrl, {
             method: 'GET',
@@ -26,22 +22,25 @@ export default function AdminUser({ adminUser, logoutUrl, loginPage }) {
         return null;
     }
     const { fullName } = adminUser;
-    return (React.createElement("div", { className: "admin-user flex flex-grow justify-end items-center" },
+    return (React.createElement("div", { className: "admin-user flex grow justify-end items-center" },
         React.createElement("div", { className: "flex justify-items-start gap-2 justify-center" },
-            React.createElement("div", { className: "relative" },
-                React.createElement("a", { className: "first-letter", href: "#", onClick: (e) => show(e) }, fullName[0]),
-                showLogout && (React.createElement("div", { className: "logout bg-background shadow p-5" },
-                    React.createElement("div", null,
-                        React.createElement("div", null,
-                            "Hello ",
-                            React.createElement("span", { className: "text-primary" },
-                                fullName,
-                                "!")),
-                        React.createElement("div", { className: "mt-2" },
-                            React.createElement("a", { className: "text-critical", href: "#", onClick: (e) => {
-                                    e.preventDefault();
-                                    logout();
-                                } }, "Logout")))))))));
+            React.createElement(DropdownMenu, null,
+                React.createElement(DropdownMenuTrigger, null,
+                    React.createElement("button", { className: "w-[2.188rem] h-[2.188rem] flex items-center justify-center rounded-full bg-primary/45 font-semibold border-2 border-primary cursor-pointer hover:bg-primary/60 transition-colors", onClick: (e) => e.preventDefault() }, fullName[0])),
+                React.createElement(DropdownMenuContent, { align: "end", className: "w-45" },
+                    React.createElement(DropdownMenuLabel, { className: "text-base font-normal" },
+                        "Hello ",
+                        React.createElement("span", { className: "text-primary" },
+                            fullName,
+                            "!")),
+                    React.createElement(DropdownMenuSeparator, null),
+                    React.createElement(DropdownMenuItem, { className: "text-destructive focus:bg-destructive/10 focus:text-destructive cursor-pointer", onClick: (e) => {
+                            e.preventDefault();
+                            logout();
+                        } },
+                        React.createElement("div", { className: "flex justify-start items-center gap-2" },
+                            React.createElement(LogOut, { className: "w-4 h-4" }),
+                            React.createElement("span", null, "Logout"))))))));
 }
 AdminUser.propTypes = {
     adminUser: PropTypes.shape({

package/dist/modules/auth/pages/admin/all/AdminUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"AdminUser.js","sourceRoot":"","sources":["../../../../../../src/modules/auth/pages/admin/all/AdminUser.jsx"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,kBAAkB,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IACnE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,EAAE;QACjB,CAAC,CAAC,cAAc,EAAE,CAAC;QACnB,aAAa,CAAC,CAAC,UAAU,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;QACxB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE;YACtC,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC,CAAC;QACH,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAC/B,OAAO,CACL,6BAAK,SAAS,EAAC,oDAAoD;QACjE,6BAAK,SAAS,EAAC,+CAA+C;YAC5D,6BAAK,SAAS,EAAC,UAAU;gBACvB,2BAAG,SAAS,EAAC,cAAc,EAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IACzD,QAAQ,CAAC,CAAC,CAAC,CACV;gBACH,UAAU,IAAI,CACb,6BAAK,SAAS,EAAC,iCAAiC;oBAC9C;wBACE;;4BACQ,8BAAM,SAAS,EAAC,cAAc;gCAAE,QAAQ;oCAAS,CACnD;wBACN,6BAAK,SAAS,EAAC,MAAM;4BACnB,2BACE,SAAS,EAAC,eAAe,EACzB,IAAI,EAAC,GAAG,EACR,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oCACb,CAAC,CAAC,cAAc,EAAE,CAAC;oCACnB,MAAM,EAAE,CAAC;gCACX,CAAC,aAGC,CACA,CACF,CACF,CACP,CACG,CACF,CACF,CACP,CAAC;AACJ,CAAC;AAED,SAAS,CAAC,SAAS,GAAG;IACpB,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC;QACzB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;QAClC,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;KACtC,CAAC;IACF,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IACtC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CACvC,CAAC;AAEF,SAAS,CAAC,YAAY,GAAG;IACvB,SAAS,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;CAUpB,CAAC"}
+{"version":3,"file":"AdminUser.js","sourceRoot":"","sources":["../../../../../../src/modules/auth/pages/admin/all/AdminUser.jsx"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IACnE,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;QACxB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE;YACtC,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC,CAAC;QACH,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAC/B,OAAO,CACL,6BAAK,SAAS,EAAC,+CAA+C;QAC5D,6BAAK,SAAS,EAAC,+CAA+C;YAC5D,oBAAC,YAAY;gBACX,oBAAC,mBAAmB;oBAClB,gCACE,SAAS,EAAC,kLAAkL,EAC5L,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,IAEjC,QAAQ,CAAC,CAAC,CAAC,CACL,CACW;gBACtB,oBAAC,mBAAmB,IAAC,KAAK,EAAC,KAAK,EAAC,SAAS,EAAC,MAAM;oBAC/C,oBAAC,iBAAiB,IAAC,SAAS,EAAC,uBAAuB;;wBAC5C,8BAAM,SAAS,EAAC,cAAc;4BAAE,QAAQ;gCAAS,CACrC;oBACpB,oBAAC,qBAAqB,OAAG;oBACzB,oBAAC,gBAAgB,IACf,SAAS,EAAC,gFAAgF,EAC1F,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;4BACb,CAAC,CAAC,cAAc,EAAE,CAAC;4BACnB,MAAM,EAAE,CAAC;wBACX,CAAC;wBAED,6BAAK,SAAS,EAAC,uCAAuC;4BACpD,oBAAC,MAAM,IAAC,SAAS,EAAC,SAAS,GAAG;4BAC9B,2CAAmB,CACf,CACW,CACC,CACT,CACX,CACF,CACP,CAAC;AACJ,CAAC;AAED,SAAS,CAAC,SAAS,GAAG;IACpB,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC;QACzB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;QAClC,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;KACtC,CAAC;IACF,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IACtC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CACvC,CAAC;AAEF,SAAS,CAAC,YAAY,GAAG;IACvB,SAAS,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;CAUpB,CAAC"}

package/dist/modules/auth/services/buildAdminUserPayload.d.ts

@@ -0,0 +1,10 @@
+import type { AdminUserRow } from '../../../types/db/index.js';
+import type { CurrentUser } from '../../../types/request.js';
+/**
+ * Builds a safe CurrentUser payload from a raw AdminUserRow.
+ * Uses an explicit allowlist to ensure sensitive fields (e.g. password)
+ * are never included in JWT payloads or request locals.
+ */
+export declare function buildAdminUserPayload(adminUser: AdminUserRow & {
+    roles?: string;
+}): CurrentUser;

package/dist/modules/auth/services/buildAdminUserPayload.js

@@ -0,0 +1,19 @@
+/**
+ * Builds a safe CurrentUser payload from a raw AdminUserRow.
+ * Uses an explicit allowlist to ensure sensitive fields (e.g. password)
+ * are never included in JWT payloads or request locals.
+ */
+export function buildAdminUserPayload(adminUser) {
+    var _a;
+    return {
+        admin_user_id: adminUser.admin_user_id,
+        uuid: adminUser.uuid,
+        email: adminUser.email,
+        full_name: (_a = adminUser.full_name) !== null && _a !== void 0 ? _a : '',
+        status: adminUser.status ? 1 : 0,
+        roles: adminUser.roles || '*',
+        created_at: adminUser.created_at,
+        updated_at: adminUser.updated_at
+    };
+}
+//# sourceMappingURL=buildAdminUserPayload.js.map

package/dist/modules/auth/services/buildAdminUserPayload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildAdminUserPayload.js","sourceRoot":"","sources":["../../../../src/modules/auth/services/buildAdminUserPayload.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CACnC,SAA4C;;IAE5C,OAAO;QACL,aAAa,EAAE,SAAS,CAAC,aAAa;QACtC,IAAI,EAAE,SAAS,CAAC,IAAI;QACpB,KAAK,EAAE,SAAS,CAAC,KAAK;QACtB,SAAS,EAAE,MAAA,SAAS,CAAC,SAAS,mCAAI,EAAE;QACpC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,KAAK,EAAE,SAAS,CAAC,KAAK,IAAI,GAAG;QAC7B,UAAU,EAAE,SAAS,CAAC,UAAU;QAChC,UAAU,EAAE,SAAS,CAAC,UAAU;KACjC,CAAC;AACJ,CAAC"}

package/dist/modules/auth/services/loginUserWithEmail.d.ts

@@ -1,7 +1,3 @@
-/**
- * This function will login the admin user with email and password. This function must be accessed from the request object (request.loginUserWithEmail(email, password, callback))
- * @param {string} email
- * @param {string} password
- */
-declare function loginUserWithEmail(email: string, password: string): Promise<void>;
-export { loginUserWithEmail };
+export declare function loginUserWithEmail(this: any, email: string, password: string): Promise<void>;
+export declare function hookBeforeLoginUserWithEmail(callback: (this: any, email: string, password: string) => void | Promise<void>, priority?: number): void;
+export declare function hookAfterLoginUserWithEmail(callback: (this: any, email: string, password: string) => void | Promise<void>, priority?: number): void;

package/dist/modules/auth/services/loginUserWithEmail.js

@@ -1,12 +1,15 @@
 import { select } from '@evershop/postgres-query-builder';
 import { pool } from '../../../lib/postgres/connection.js';
+import { hookable, hookBefore, hookAfter } from '../../../lib/util/hookable.js';
 import { comparePassword } from '../../../lib/util/passwordHelper.js';
+import { buildAdminUserPayload } from './buildAdminUserPayload.js';
 /**
  * This function will login the admin user with email and password. This function must be accessed from the request object (request.loginUserWithEmail(email, password, callback))
  * @param {string} email
  * @param {string} password
  */
-async function loginUserWithEmail(email, password) {
+// Named function expression so .name === 'loginUserWithEmail' for the hookable key
+const _loginUserWithEmail = async function loginUserWithEmail(email, password) {
     // Escape the email to prevent SQL injection
     const userEmail = email.replace(/%/g, '\\%');
     const user = await select()
@@ -21,10 +24,16 @@ async function loginUserWithEmail(email, password) {
     if (this.session) {
         this.session.userID = user.admin_user_id;
     }
-    // Delete the password field
-    delete user.password;
-    // Save the user in the request
-    this.locals.user = user;
+    // Save the user in the request using a safe payload (no password)
+    this.locals.user = buildAdminUserPayload(user);
+};
+export async function loginUserWithEmail(email, password) {
+    await hookable(_loginUserWithEmail.bind(this))(email, password);
+}
+export function hookBeforeLoginUserWithEmail(callback, priority = 10) {
+    hookBefore('loginUserWithEmail', callback, priority);
+}
+export function hookAfterLoginUserWithEmail(callback, priority = 10) {
+    hookAfter('loginUserWithEmail', callback, priority);
 }
-export { loginUserWithEmail };
 //# sourceMappingURL=loginUserWithEmail.js.map