zyket 1.2.8 → 1.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zyket",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/services/auth/index.js

@@ -37,6 +37,11 @@ module.exports = class AuthService extends Service {
     if (originsAdded) {
       this.#container.get('logger').info('Added TRUSTED_ORIGINS to .env file');
     }
+
+    const betterAuthUrlAdded = EnvManager.addEnvVariable(envPath, 'BETTER_AUTH_URL', 'http://localhost:3000');
+    if (betterAuthUrlAdded) {
+      this.#container.get('logger').info('Added BETTER_AUTH_URL to .env file');
+    }
   }
 
   #getDatabaseConnection() {
@@ -183,6 +188,7 @@ module.exports = class AuthService extends Service {
         expiresIn: 60 * 60 * 24 * 7,
         updateAge: 60 * 60 * 24
       },
+      baseURL: process.env.BETTER_AUTH_URL || 'http://localhost:3000',
       secret: process.env.AUTH_SECRET || 'your-secret-key-change-in-production',
       trustedOrigins: process.env.TRUSTED_ORIGINS?.split(',') || ['http://localhost:5173', 'http://localhost:6632']
     })

package/src/services/cache/index.js

@@ -11,7 +11,9 @@ module.exports = class Cache extends Service {
   constructor(container, url) {
     super("cache");
     this.#container = container;
-    this.#useRedis = !!url && url !== '';
+    // Check if URL is a valid Redis URL (starts with redis://)
+    // Empty string, 'memory', or 'in-memory' will use in-memory cache
+    this.#useRedis = !!url && url.startsWith('redis://');
     
     if (this.#useRedis) {
       this.#client = createClient({ url });

package/src/services/index.js

@@ -8,8 +8,7 @@ const EventService = require("./events");
 
 const eventsActivated = process.env.DISABLE_EVENTS !== 'true';
 const databaseActivated = !!process.env.DATABASE_URL;
-const cacheActivated = !!process.env.CACHE_URL;
-const bullmqActivated = !!process.env.CACHE_URL && process.env.DISABLE_BULLMQ !== 'true';
+const bullmqActivated = process.env.DISABLE_BULLMQ !== 'true';
 const s3Activated = process.env.S3_ENDPOINT && process.env.S3_ACCESS_KEY && process.env.S3_SECRET_KEY;
 const schedulerActivated = process.env.DISABLE_SCHEDULER !== 'true';
 const socketActivated = process.env.DISABLE_SOCKET !== 'true';
@@ -21,7 +20,7 @@ module.exports = [
   ["template-manager", require("./template-manager"), []],
   eventsActivated ? ["events", EventService, ["@service_container"]] : null,
   databaseActivated ? ["database", Database, ["@service_container", process.env.DATABASE_URL]] : null,
-  cacheActivated ? ["cache", Cache, ["@service_container", process.env.CACHE_URL]] : null,
+  ["cache", Cache, ["@service_container", process.env.CACHE_URL || '']],
   s3Activated ? ["s3", S3, ["@service_container", process.env.S3_ENDPOINT, process.env.S3_PORT, process.env.S3_USE_SSL === "true", process.env.S3_ACCESS_KEY, process.env.S3_SECRET_KEY]] : null,
   schedulerActivated ? ["scheduler", Scheduler, ["@service_container"]] : null,
   bullmqActivated ? ["bullmq", require("./bullmq"), ["@service_container"]] : null,

package/src/templates/default/frontend/src/hooks/useLayout.jsx

@@ -3,7 +3,7 @@ import { Route } from 'react-router-dom';
 
 export default function useLayout(routeList) {
   
-  const routes = routesJSON.map((route, index) => {
+  const routes = routeList.map((route, index) => {
     const middlewares = route.middlewares ? [...route.middlewares].reverse() : [];
     let element = <route.component />;
     middlewares.forEach((middleware) => {

package/src/templates/default/frontend/src/layouts/auth/routes.js

@@ -2,16 +2,16 @@ import AuthView from "../../views/auth";
 import AuthRegisterView from "../../views/auth/register";
 import NotLoggedMiddleware from "../../middlewares/NotLoggedMiddleware";
 
-module.exports = [
+export default [
   {
     name: "Auth",
-    path: "/auth",
+    path: "/",
     component: AuthView,
     middlewares: [NotLoggedMiddleware],
   },
   {
     name: "Auth Register",
-    path: "/auth/register",
+    path: "/register",
     component: AuthRegisterView,
     middlewares: [NotLoggedMiddleware],
   }

package/src/templates/default/frontend/src/layouts/landing/index.jsx

@@ -1,5 +1,6 @@
 import { Navigate, Routes, Route, Link } from "react-router-dom";
 import useLayout from "../../hooks/useLayout";
+import layoutRoutes from "./routes";
 
 export default function LandingLayout() {
   const { routes } = useLayout(layoutRoutes)

package/src/templates/default/frontend/src/layouts/landing/routes.js

@@ -1,6 +1,6 @@
 import LandingView from "../../views/landing";
 
-module.exports = [
+export default [
   {
     name: "Landing",
     path: "/",

package/src/templates/default/frontend/src/layouts/panel/index.jsx

@@ -1,11 +1,10 @@
 import { Navigate, Routes, Route, Link, useLocation } from "react-router-dom";
 import useLayout from "../../hooks/useLayout";
-import PanelDashboardView from "../../views/panel/dashboard";
 import layoutRoutes from "./routes";
 
 export default function PanelLayout() {
   const location = useLocation();
-  const { routes } = useLayout();
+  const { routes } = useLayout(layoutRoutes);
 
   const navItems = [
     { name: "Dashboard", path: "/panel/dashboard", icon: "📊" },

package/src/templates/default/frontend/src/layouts/panel/routes.js

@@ -1,10 +1,10 @@
 import PanelDashboardView from "../../views/panel/dashboard";
 import LoggedMiddleware from "../../middlewares/LoggedMiddleware";
 
-module.exports = [
+export default [
   {
     name: "Panel Dashboard",
-    path: "/panel/dashboard",
+    path: "/dashboard",
     component: PanelDashboardView,
     middlewares: [LoggedMiddleware],
   }

package/src/utils/EnvManager.js

@@ -13,8 +13,7 @@ module.exports = class EnvManager {
 
   static getDefaultSecrets() {
     const header = `# Zyket Environment Configuration
-# Leave CACHE_URL empty to use in-memory cache, or set to redis://localhost:6379 for Redis
-
+# CACHE_URL: Leave empty or set to 'memory' for in-memory cache, or 'redis://localhost:6379' for Redis
 `;
     const envsToCreate = {
       DEBUG: true,