@lobb-js/lobb-ext-auth 0.5.0 → 0.7.0

package/dist/auth.js

@@ -31,7 +31,8 @@ export class Auth {
         this.utils.lobb.setHeaders({
             Authorization: `Bearer ${session.access_token.token}`,
         });
-        this.utils.location.navigate("/studio");
+        const redirectTo = new URLSearchParams(window.location.search).get("redirect");
+        this.utils.location.navigate(redirectTo || "/studio");
     }
     async logout() {
         await this.utils.lobb.request({
@@ -39,6 +40,13 @@ export class Auth {
             route: "/api/extensions/auth/logout",
         });
         localStorage.removeItem("lobb_session");
-        this.utils.location.navigate("/studio/extensions/auth/login_page");
+        const currentPath = window.location.pathname;
+        const loginPath = "/studio/extensions/auth/login_page";
+        if (currentPath !== loginPath && currentPath !== "/studio") {
+            this.utils.location.navigate(`${loginPath}?redirect=${encodeURIComponent(currentPath)}`);
+        }
+        else {
+            this.utils.location.navigate(loginPath);
+        }
     }
 }

package/dist/onStartup.js

@@ -17,5 +17,11 @@ export async function onStartup(utils) {
         utils.ctx.extensions.auth.session = session;
         return;
     }
+    // Allow public paths without login
+    const publicPaths = utils.ctx.meta?.extensions?.auth?.studio?.publicPaths ?? [];
+    const currentPath = window.location.pathname;
+    if (publicPaths.some(p => currentPath.startsWith(p))) {
+        return;
+    }
     await auth.logout();
 }

package/extensions/auth/collections/activityFeed.ts

@@ -12,42 +12,32 @@ export const activityFeedCollection: CollectionConfig = {
         collection: "auth_users",
         field: "id",
       },
-      validators: {
-        required: true,
-      },
+      required: true,
     },
     action: {
       type: "string",
       length: 255,
-      validators: {
-        required: true,
-        enum: [
-          "create",
-          "read",
-          "update",
-          "delete",
-        ],
-      },
+      required: true,
+      enum: [
+        "create",
+        "read",
+        "update",
+        "delete",
+      ],
     },
     collection: {
       type: "string",
       length: 255,
-      validators: {
-        required: true,
-      },
+      required: true,
     },
     item_id: {
       type: "string",
       length: 255,
-      validators: {
-        required: true,
-      },
+      required: true,
     },
     created_at: {
       type: "datetime",
-      pre_processors: {
-        default: "{{ now }}",
-      },
+      default: "{{ now }}",
     },
   },
 };

package/extensions/auth/collections/collections.ts

@@ -12,6 +12,16 @@ export function collections(
   collectionsSchemas["auth_users"] = usersCollection;
   collectionsSchemas["auth_sessions"] = sessionsCollection;
 
+  // Convert the role field to an enum based on configured roles
+  const roleNames = Object.keys(extensionConfig.roles ?? {}).filter(r => r !== "public");
+  if (roleNames.length > 0) {
+    const usersFields = (collectionsSchemas["auth_users"] as { fields: Record<string, any> }).fields;
+    usersFields.role = {
+      ...usersFields.role,
+      enum: [{ value: "admin" }, ...roleNames.map(r => ({ value: r }))],
+    };
+  }
+
   // adding the additional fields and indexes if the extend_users property exists
   if (extensionConfig.extend_users) {
     collectionsSchemas["auth_users"].indexes = {

package/extensions/auth/collections/sessions.ts

@@ -12,23 +12,16 @@ export const sessionsCollection: CollectionConfig = {
         collection: "auth_users",
         field: "id",
       },
-      validators: {
-        required: true,
-      },
+      required: true,
     },
     token: {
       type: "string",
       length: 255,
-      validators: {
-        maxLength: 255,
-        required: true,
-      },
+      required: true,
     },
     expires_at: {
       type: "datetime",
-      validators: {
-        required: true,
-      },
+      required: true,
     },
   },
 };

package/extensions/auth/collections/users.ts

@@ -1,7 +1,7 @@
-import type { CollectionConfig } from "@lobb-js/core";
+import type { NormalCollectionConfig } from "@lobb-js/core";
 import { hash } from "argon2";
 
-export const usersCollection: CollectionConfig = {
+export const usersCollection: NormalCollectionConfig = {
   indexes: {
     auth_users_email_index: {
       unique: true,
@@ -19,20 +19,12 @@ export const usersCollection: CollectionConfig = {
     email: {
       type: "string",
       length: 255,
-      validators: {
-        validator: {
-          name: "isEmail",
-        },
-        maxLength: 255,
-        required: true,
-      },
+      required: true,
     },
     password: {
       type: "string",
       length: 255,
-      validators: {
-        required: true,
-      },
+      required: true,
       hooks: {
         beforeCreate: async ({ data }) => await hash(data.password),
         beforeUpdate: async ({ data }) => data.password ? await hash(data.password) : undefined,
@@ -46,9 +38,8 @@ export const usersCollection: CollectionConfig = {
     role: {
       type: "string",
       length: 255,
-      validators: {
-        required: true,
-      },
+      required: true,
+      enum: []
     },
   },
 };

package/extensions/auth/config/extensionConfigSchema.ts

@@ -45,4 +45,7 @@ export type ExtensionConfig = {
     indexes?: CollectionConfig["indexes"];
     fields?: Omit<CollectionConfig["fields"], "id">;
   };
+  studio?: {
+    publicPaths?: string[];
+  };
 };

package/extensions/auth/meta/meta.ts

@@ -6,6 +6,7 @@ export async function meta(lobb: Lobb, extensionConfig: ExtensionConfig) {
   const meta: any = {};
 
   meta["dashboard_access_roles"] = config.dashboard_access_roles ?? ["admin"];
+  meta["studio"] = { publicPaths: config.studio?.publicPaths ?? [] };
 
   return meta;
 }

package/extensions/auth/studio/auth.ts

@@ -43,7 +43,8 @@ export class Auth {
     this.utils.lobb.setHeaders({
       Authorization: `Bearer ${session.access_token.token}`,
     });
-    this.utils.location.navigate("/studio");
+    const redirectTo = new URLSearchParams(window.location.search).get("redirect");
+    this.utils.location.navigate(redirectTo || "/studio");
   }
 
   public async logout() {
@@ -52,6 +53,12 @@ export class Auth {
       route: "/api/extensions/auth/logout",
     });
     localStorage.removeItem("lobb_session");
-    this.utils.location.navigate("/studio/extensions/auth/login_page");
+    const currentPath = window.location.pathname;
+    const loginPath = "/studio/extensions/auth/login_page";
+    if (currentPath !== loginPath && currentPath !== "/studio") {
+      this.utils.location.navigate(`${loginPath}?redirect=${encodeURIComponent(currentPath)}`);
+    } else {
+      this.utils.location.navigate(loginPath);
+    }
   }
 }

package/extensions/auth/studio/onStartup.ts

@@ -21,5 +21,13 @@ export async function onStartup(utils: ExtensionUtils) {
         utils.ctx.extensions.auth.session = session;
         return;
     }
+
+    // Allow public paths without login
+    const publicPaths: string[] = utils.ctx.meta?.extensions?.auth?.studio?.publicPaths ?? [];
+    const currentPath = window.location.pathname;
+    if (publicPaths.some(p => currentPath.startsWith(p))) {
+        return;
+    }
+
     await auth.logout()
 }

package/extensions/auth/tests/configs/auth_with_extend_users.ts

@@ -44,9 +44,7 @@ export const authWithExtendUsersConfig: Config = {
           language: {
             type: "string",
             length: 255,
-            validators: {
-              enum: ["en", "ar", "tr"],
-            },
+            enum: ["en", "ar", "tr"],
           },
         },
       },

package/extensions/auth/tests/configs/social_blog.ts

@@ -120,9 +120,7 @@ export const socialBlogConfig: Config = {
         title: {
           type: "string",
           length: 255,
-          validators: {
-            required: true,
-          },
+          required: true,
         },
         description: {
           type: "string",
@@ -130,25 +128,17 @@ export const socialBlogConfig: Config = {
         },
         body: {
           type: "text",
-          validators: {
-            required: true,
-          },
+          required: true,
         },
         status: {
           type: "string",
           length: 255,
-          pre_processors: {
-            default: "private",
-          },
-          validators: {
-            enum: ["public", "private"],
-          },
+          default: "private",
+          enum: ["public", "private"],
         },
         author_id: {
           type: "integer",
-          validators: {
-            required: true,
-          },
+          required: true,
         },
       },
     },

package/extensions/auth/tests/middlewares/publicPreventBasic.test.ts

@@ -38,7 +38,7 @@ describe("Prevent Guard For Public Users", () => {
 
     expect(
       result.message,
-    ).toEqual("Your role is not recognized by the system.");
+    ).toEqual("You do not have permission to perform this action.");
     expect(response.status).toEqual(403);
   });
 
@@ -54,7 +54,7 @@ describe("Prevent Guard For Public Users", () => {
 
     expect(
       result.message,
-    ).toEqual("Your role is not recognized by the system.");
+    ).toEqual("You do not have permission to perform this action.");
     expect(response.status).toEqual(403);
   });
 
@@ -81,7 +81,7 @@ describe("Prevent Guard For Public Users", () => {
     ).toEqual({
         status: 403,
         code: "FORBIDDEN",
-        message: "Your role is not recognized by the system.",
+        message: "You do not have permission to perform this action.",
     });
     expect(response.status).toEqual(403);
   });
@@ -100,7 +100,7 @@ describe("Prevent Guard For Public Users", () => {
       result,
     ).toEqual({
         code: "FORBIDDEN",
-        message: "Your role is not recognized by the system.",
+        message: "You do not have permission to perform this action.",
         status: 403,
     });
     expect(response.status).toEqual(403);

package/extensions/auth/workflows/utils.ts

@@ -40,6 +40,12 @@ export function handlePolicy({
   const currentRole = config.roles?.[role];
 
   if (typeof currentRole === "undefined") {
+    if (role === "public") {
+      throw new ctx.LobbError({
+        code: "FORBIDDEN",
+        message: "You do not have permission to perform this action.",
+      });
+    }
     throw new ctx.LobbError({
       code: "FORBIDDEN",
       message: "Your role is not recognized by the system.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobb-js/lobb-ext-auth",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "license": "UNLICENSED",
   "type": "module",
   "publishConfig": {
@@ -33,12 +33,12 @@
     "package": "svelte-package --input extensions/auth/studio"
   },
   "dependencies": {
-    "@lobb-js/core": "^0.22.0",
+    "@lobb-js/core": "^0.27.0",
     "argon2": "^0.40.3",
     "hono": "^4.7.0"
   },
   "devDependencies": {
-    "@lobb-js/studio": "^0.16.0",
+    "@lobb-js/studio": "^0.24.1",
     "@lucide/svelte": "^0.563.1",
     "@playwright/test": "^1.58.2",
     "@sveltejs/adapter-node": "^5.5.4",