@lobb-js/lobb-ext-auth 0.4.1 → 0.6.0

package/README.md

@@ -1 +1,2 @@
 # @lobb-js/lobb-ext-auth
+

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/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/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

@@ -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,7 @@ export const usersCollection: CollectionConfig = {
     role: {
       type: "string",
       length: 255,
-      validators: {
-        required: true,
-      },
+      required: true,
     },
   },
 };

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/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/workflows/baseWorkflow.ts

@@ -1,9 +1,30 @@
 import type { Workflow } from "@lobb-js/core";
 import type { Context } from "hono";
-import type { User } from "../config/extensionConfigSchema.ts";
+import type { ExtensionConfig, User } from "../config/extensionConfigSchema.ts";
 import { generateRandomId, getBearerToken } from "../utils.ts";
 import { verify } from "argon2";
 
+export function getBaseWorkflows(_extensionConfig: ExtensionConfig): Workflow[] {
+  return [
+  {
+    name: "auth_preventAdminUserDeletion",
+    eventName: "core.store.preDeleteOne",
+    handler: async (input, ctx) => {
+      if (input.collectionName !== "auth_users") return;
+      if (input.triggeredBy !== "API") return;
+
+      if (Number(input.id) === 1) {
+        throw new ctx.LobbError({
+          code: "FORBIDDEN",
+          message: "The admin user cannot be deleted.",
+        });
+      }
+    },
+  },
+  ...baseWorkflows,
+  ];
+}
+
 export const baseWorkflows: Workflow[] = [
   {
     name: "auth_BearerTokenHandler",

package/extensions/auth/workflows/index.ts

@@ -2,10 +2,10 @@ import type { Workflow } from "@lobb-js/core";
 import type { ExtensionConfig } from "../config/extensionConfigSchema.ts";
 import { getPoliciesWorkflows } from "./policiesWorkflows.ts";
 import { meAliasWorkflows } from "./meAliasWorkflows.ts";
-import { baseWorkflows } from "./baseWorkflow.ts";
+import { getBaseWorkflows } from "./baseWorkflow.ts";
 export function getWorkflows(extensionConfig: ExtensionConfig): Workflow[] {
   return [
-    ...baseWorkflows,
+    ...getBaseWorkflows(extensionConfig),
 
     // TODO: think about putting the below workflows above at the beggining
     // this will give us the ability to specify which roles have the ability to login, register etc

package/package.json

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