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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/auth.js +10 -2
  2. package/extensions/auth/collections/activityFeed.ts +11 -21
  3. package/extensions/auth/collections/sessions.ts +3 -10
  4. package/extensions/auth/collections/users.ts +3 -13
  5. package/extensions/auth/studio/auth.ts +9 -2
  6. package/extensions/auth/tests/configs/auth_with_extend_users.ts +1 -3
  7. package/extensions/auth/tests/configs/social_blog.ts +5 -15
  8. package/package.json +3 -3
package/dist/auth.js CHANGED
@@ -31,7 +31,8 @@ export class Auth {
31
31
  this.utils.lobb.setHeaders({
32
32
  Authorization: `Bearer ${session.access_token.token}`,
33
33
  });
34
- this.utils.location.navigate("/studio");
34
+ const redirectTo = new URLSearchParams(window.location.search).get("redirect");
35
+ this.utils.location.navigate(redirectTo || "/studio");
35
36
  }
36
37
  async logout() {
37
38
  await this.utils.lobb.request({
@@ -39,6 +40,13 @@ export class Auth {
39
40
  route: "/api/extensions/auth/logout",
40
41
  });
41
42
  localStorage.removeItem("lobb_session");
42
- this.utils.location.navigate("/studio/extensions/auth/login_page");
43
+ const currentPath = window.location.pathname;
44
+ const loginPath = "/studio/extensions/auth/login_page";
45
+ if (currentPath !== loginPath && currentPath !== "/studio") {
46
+ this.utils.location.navigate(`${loginPath}?redirect=${encodeURIComponent(currentPath)}`);
47
+ }
48
+ else {
49
+ this.utils.location.navigate(loginPath);
50
+ }
43
51
  }
44
52
  }
package/extensions/auth/collections/activityFeed.ts CHANGED
@@ -12,42 +12,32 @@ export const activityFeedCollection: CollectionConfig = {
12
12
  collection: "auth_users",
13
13
  field: "id",
14
14
  },
15
- validators: {
16
- required: true,
17
- },
15
+ required: true,
18
16
  },
19
17
  action: {
20
18
  type: "string",
21
19
  length: 255,
22
- validators: {
23
- required: true,
24
- enum: [
25
- "create",
26
- "read",
27
- "update",
28
- "delete",
29
- ],
30
- },
20
+ required: true,
21
+ enum: [
22
+ "create",
23
+ "read",
24
+ "update",
25
+ "delete",
26
+ ],
31
27
  },
32
28
  collection: {
33
29
  type: "string",
34
30
  length: 255,
35
- validators: {
36
- required: true,
37
- },
31
+ required: true,
38
32
  },
39
33
  item_id: {
40
34
  type: "string",
41
35
  length: 255,
42
- validators: {
43
- required: true,
44
- },
36
+ required: true,
45
37
  },
46
38
  created_at: {
47
39
  type: "datetime",
48
- pre_processors: {
49
- default: "{{ now }}",
50
- },
40
+ default: "{{ now }}",
51
41
  },
52
42
  },
53
43
  };
package/extensions/auth/collections/sessions.ts CHANGED
@@ -12,23 +12,16 @@ export const sessionsCollection: CollectionConfig = {
12
12
  collection: "auth_users",
13
13
  field: "id",
14
14
  },
15
- validators: {
16
- required: true,
17
- },
15
+ required: true,
18
16
  },
19
17
  token: {
20
18
  type: "string",
21
19
  length: 255,
22
- validators: {
23
- maxLength: 255,
24
- required: true,
25
- },
20
+ required: true,
26
21
  },
27
22
  expires_at: {
28
23
  type: "datetime",
29
- validators: {
30
- required: true,
31
- },
24
+ required: true,
32
25
  },
33
26
  },
34
27
  };
package/extensions/auth/collections/users.ts CHANGED
@@ -19,20 +19,12 @@ export const usersCollection: CollectionConfig = {
19
19
  email: {
20
20
  type: "string",
21
21
  length: 255,
22
- validators: {
23
- validator: {
24
- name: "isEmail",
25
- },
26
- maxLength: 255,
27
- required: true,
28
- },
22
+ required: true,
29
23
  },
30
24
  password: {
31
25
  type: "string",
32
26
  length: 255,
33
- validators: {
34
- required: true,
35
- },
27
+ required: true,
36
28
  hooks: {
37
29
  beforeCreate: async ({ data }) => await hash(data.password),
38
30
  beforeUpdate: async ({ data }) => data.password ? await hash(data.password) : undefined,
@@ -46,9 +38,7 @@ export const usersCollection: CollectionConfig = {
46
38
  role: {
47
39
  type: "string",
48
40
  length: 255,
49
- validators: {
50
- required: true,
51
- },
41
+ required: true,
52
42
  },
53
43
  },
54
44
  };
package/extensions/auth/studio/auth.ts CHANGED
@@ -43,7 +43,8 @@ export class Auth {
43
43
  this.utils.lobb.setHeaders({
44
44
  Authorization: `Bearer ${session.access_token.token}`,
45
45
  });
46
- this.utils.location.navigate("/studio");
46
+ const redirectTo = new URLSearchParams(window.location.search).get("redirect");
47
+ this.utils.location.navigate(redirectTo || "/studio");
47
48
  }
48
49
 
49
50
  public async logout() {
@@ -52,6 +53,12 @@ export class Auth {
52
53
  route: "/api/extensions/auth/logout",
53
54
  });
54
55
  localStorage.removeItem("lobb_session");
55
- this.utils.location.navigate("/studio/extensions/auth/login_page");
56
+ const currentPath = window.location.pathname;
57
+ const loginPath = "/studio/extensions/auth/login_page";
58
+ if (currentPath !== loginPath && currentPath !== "/studio") {
59
+ this.utils.location.navigate(`${loginPath}?redirect=${encodeURIComponent(currentPath)}`);
60
+ } else {
61
+ this.utils.location.navigate(loginPath);
62
+ }
56
63
  }
57
64
  }
package/extensions/auth/tests/configs/auth_with_extend_users.ts CHANGED
@@ -44,9 +44,7 @@ export const authWithExtendUsersConfig: Config = {
44
44
  language: {
45
45
  type: "string",
46
46
  length: 255,
47
- validators: {
48
- enum: ["en", "ar", "tr"],
49
- },
47
+ enum: ["en", "ar", "tr"],
50
48
  },
51
49
  },
52
50
  },
package/extensions/auth/tests/configs/social_blog.ts CHANGED
@@ -120,9 +120,7 @@ export const socialBlogConfig: Config = {
120
120
  title: {
121
121
  type: "string",
122
122
  length: 255,
123
- validators: {
124
- required: true,
125
- },
123
+ required: true,
126
124
  },
127
125
  description: {
128
126
  type: "string",
@@ -130,25 +128,17 @@ export const socialBlogConfig: Config = {
130
128
  },
131
129
  body: {
132
130
  type: "text",
133
- validators: {
134
- required: true,
135
- },
131
+ required: true,
136
132
  },
137
133
  status: {
138
134
  type: "string",
139
135
  length: 255,
140
- pre_processors: {
141
- default: "private",
142
- },
143
- validators: {
144
- enum: ["public", "private"],
145
- },
136
+ default: "private",
137
+ enum: ["public", "private"],
146
138
  },
147
139
  author_id: {
148
140
  type: "integer",
149
- validators: {
150
- required: true,
151
- },
141
+ required: true,
152
142
  },
153
143
  },
154
144
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lobb-js/lobb-ext-auth",
3
- "version": "0.5.0",
3
+ "version": "0.6.0",
4
4
  "license": "UNLICENSED",
5
5
  "type": "module",
6
6
  "publishConfig": {
@@ -33,12 +33,12 @@
33
33
  "package": "svelte-package --input extensions/auth/studio"
34
34
  },
35
35
  "dependencies": {
36
- "@lobb-js/core": "^0.22.0",
36
+ "@lobb-js/core": "^0.26.2",
37
37
  "argon2": "^0.40.3",
38
38
  "hono": "^4.7.0"
39
39
  },
40
40
  "devDependencies": {
41
- "@lobb-js/studio": "^0.16.0",
41
+ "@lobb-js/studio": "^0.24.1",
42
42
  "@lucide/svelte": "^0.563.1",
43
43
  "@playwright/test": "^1.58.2",
44
44
  "@sveltejs/adapter-node": "^5.5.4",