adminizer 4.2.0-build.65 → 4.2.0-build.67

package/lib/Adminizer.js

@@ -70,30 +70,33 @@ export class Adminizer {
     }
     getMiddleware() {
         return (req, res, next) => {
-            // If a routePrefix is configured, only handle requests that match it.
             try {
                 const prefix = (this.config && this.config.routePrefix) ? String(this.config.routePrefix) : '';
                 const normalizedPrefix = prefix.replace(/\/+/g, '/').replace(/\/+$/g, '');
                 if (normalizedPrefix) {
                     const url = req.url || req.originalUrl || '';
-                    if (!(url === normalizedPrefix || url.startsWith(normalizedPrefix + '/') || url.startsWith('/public'))) {
-                        // Not an admin route — pass to next middleware
+                    const conditions = [
+                        url === normalizedPrefix,
+                        url.startsWith(normalizedPrefix + '/')
+                    ];
+                    if (process.env.IS_SAILS === undefined) {
+                        conditions.push(url.startsWith('/public'));
+                    }
+                    if (!conditions.some(condition => condition)) {
                         return typeof next === 'function' ? next() : undefined;
                     }
                 }
             }
             catch (e) {
-                // If anything goes wrong while checking, fall back to handling the request
+                // fall back to handling the request
             }
             this.app(req, res, (err) => {
                 if (err) {
-                    // eslint-disable-next-line no-console
                     console.error("Error in Adminizer", err);
                     res.writeHead(500, { 'Content-Type': 'text/plain' });
                     res.end('Internal Server Error');
                 }
                 else {
-                    // If Adminizer didn't handle the route, let the rest of the stack try
                     if (typeof next === 'function') {
                         return next();
                     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.2.0-build.65",
+  "version": "4.2.0-build.67",
   "main": "index.js",
   "exports": {
     ".": "./index.js",

package/system/bindInertia.js

@@ -17,6 +17,7 @@ export function bindInertia(adminizer) {
                     <script type="module" src="/@vite/client"></script>
                     <script type="module" src="/src/assets/js/app.tsx"></script>
                     <script>window.routePrefix = "${adminizer.config.routePrefix}"</script>
+                    <script>window.isSails = ${process.env.IS_SAILS ? 'true' : 'false'};</script>
                     `;
         }
         else {
@@ -57,11 +58,14 @@ export function bindInertia(adminizer) {
             });
             // Route prefix script
             const routePrefixScript = `<script>window.routePrefix = "${adminizer.config.routePrefix}";</script>`;
+            // For Sails JS
+            const isSails = `<script>window.isSails = ${process.env.IS_SAILS ? 'true' : 'false'};</script>`;
             return `
                 ${preloadLinks.join('\n')}
                 ${stylesheets.join('\n')}
                 ${scripts.join('\n')}
                 ${routePrefixScript}
+                ${isSails}
         `;
         }
     };

package/system/bindMediaManager.js

@@ -15,7 +15,8 @@ export default function bindMediaManager(adminizer) {
         }
     });
     // Bind media manager public folder
-    adminizer.app.use(`/public`, serveStatic(adminizer.config.mediamanager.fileStoragePath));
+    if (!process.env.IS_SAILS)
+        adminizer.app.use(`/public`, serveStatic(adminizer.config.mediamanager.fileStoragePath));
     // Bind file icons
     adminizer.app.use(`${adminizer.config.routePrefix}/fileicons`, serveStatic(path.join(import.meta.dirname, '../fileicons')));
 }