@nest-boot/auth 8.0.3-beta.0 → 8.0.3-beta.1
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.
- package/dist/adapters/mikro-orm/create-custom-adapter.js +13 -22
- package/dist/adapters/mikro-orm/create-custom-adapter.js.map +1 -1
- package/dist/adapters/mikro-orm-adapter.js +3 -2
- package/dist/adapters/mikro-orm-adapter.js.map +1 -1
- package/dist/api-key.service.d.ts +1 -1
- package/dist/api-key.service.js +19 -23
- package/dist/api-key.service.js.map +1 -1
- package/dist/auth.middleware.d.ts +1 -0
- package/dist/auth.middleware.js +19 -2
- package/dist/auth.middleware.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/interfaces/scope-policy-options.interface.d.ts +8 -0
- package/dist/interfaces/scope-policy-options.interface.js +2 -0
- package/dist/interfaces/scope-policy-options.interface.js.map +1 -0
- package/dist/policies/create-scope-policy.d.ts +3 -0
- package/dist/policies/create-scope-policy.js +37 -0
- package/dist/policies/create-scope-policy.js.map +1 -0
- package/dist/policies/index.d.ts +2 -0
- package/dist/policies/index.js +3 -0
- package/dist/policies/index.js.map +1 -0
- package/dist/policies/user-scope.policy.d.ts +3 -0
- package/dist/policies/user-scope.policy.js +5 -0
- package/dist/policies/user-scope.policy.js.map +1 -0
- package/dist/policies/workspace-scope.policy.d.ts +3 -0
- package/dist/policies/workspace-scope.policy.js +5 -0
- package/dist/policies/workspace-scope.policy.js.map +1 -0
- package/dist/session.service.js +7 -13
- package/dist/session.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/user-deletion.service.js +3 -10
- package/dist/user-deletion.service.js.map +1 -1
- package/dist/user.service.js +40 -42
- package/dist/user.service.js.map +1 -1
- package/dist/utils/run-auth-query.d.ts +2 -0
- package/dist/utils/run-auth-query.js +21 -0
- package/dist/utils/run-auth-query.js.map +1 -0
- package/dist/workspace.service.d.ts +1 -1
- package/dist/workspace.service.js +60 -53
- package/dist/workspace.service.js.map +1 -1
- package/package.json +11 -12
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { LockMode } from "@mikro-orm/core";
|
|
2
|
-
import {
|
|
3
|
-
import { RowLevelSecurity, RowLevelSecurityMode, } from "@nest-boot/row-level-security";
|
|
2
|
+
import { runAuthQuery } from "../../utils/run-auth-query.js";
|
|
4
3
|
import { createEntityMetadataResolver } from "./entity-metadata-resolver.js";
|
|
5
4
|
import { convertWhereToMikroOrm } from "./where-compiler.js";
|
|
6
5
|
export function createMikroOrmCustomAdapter({ defaultUserRole, em, entities, inTransaction = false, }) {
|
|
@@ -8,22 +7,14 @@ export function createMikroOrmCustomAdapter({ defaultUserRole, em, entities, inT
|
|
|
8
7
|
const resolver = createEntityMetadataResolver(em, entities, context);
|
|
9
8
|
const convertWhere = (model, where) => convertWhereToMikroOrm(where, (field) => resolver.getColumnName(model, field), (field) => resolver.getPropertyName(model, field));
|
|
10
9
|
const findOneForUpdate = async (transactionalEntityManager, model, where) => await transactionalEntityManager.findOne(resolver.getEntityClass(model), convertWhere(model, where), { lockMode: LockMode.PESSIMISTIC_WRITE });
|
|
11
|
-
const runInTransaction = async (callback) => {
|
|
10
|
+
const runInTransaction = async (em, callback) => {
|
|
12
11
|
if (inTransaction)
|
|
13
12
|
return await callback(em);
|
|
14
13
|
return await em.transactional(callback);
|
|
15
14
|
};
|
|
16
|
-
const runUnrestricted = async (callback) =>
|
|
17
|
-
const run = () => {
|
|
18
|
-
RowLevelSecurity.setMode(RowLevelSecurityMode.DISABLED);
|
|
19
|
-
return callback();
|
|
20
|
-
};
|
|
21
|
-
if (RequestContext.isActive())
|
|
22
|
-
return await RequestContext.child(run);
|
|
23
|
-
return await RequestContext.run(new RequestContext({ type: "better-auth-adapter" }), run);
|
|
24
|
-
};
|
|
15
|
+
const runUnrestricted = async (callback) => await runAuthQuery(em, callback);
|
|
25
16
|
return {
|
|
26
|
-
create: async ({ data, model }) => await runUnrestricted(async () => {
|
|
17
|
+
create: async ({ data, model }) => await runUnrestricted(async (em) => {
|
|
27
18
|
const entityClass = resolver.getEntityClass(model);
|
|
28
19
|
const entityData = resolver.toEntityData(model, data);
|
|
29
20
|
if (defaultUserRole &&
|
|
@@ -35,7 +26,7 @@ export function createMikroOrmCustomAdapter({ defaultUserRole, em, entities, inT
|
|
|
35
26
|
await em.persist(entity).flush();
|
|
36
27
|
return resolver.toAdapterRecord(model, entity);
|
|
37
28
|
}),
|
|
38
|
-
update: async ({ model, where, update }) => await runUnrestricted(async () => {
|
|
29
|
+
update: async ({ model, where, update }) => await runUnrestricted(async (em) => {
|
|
39
30
|
const entity = await em.findOne(resolver.getEntityClass(model), convertWhere(model, where));
|
|
40
31
|
if (!entity)
|
|
41
32
|
return null;
|
|
@@ -43,21 +34,21 @@ export function createMikroOrmCustomAdapter({ defaultUserRole, em, entities, inT
|
|
|
43
34
|
await em.flush();
|
|
44
35
|
return resolver.toAdapterRecord(model, entity);
|
|
45
36
|
}),
|
|
46
|
-
updateMany: async ({ model, where, update }) => await runUnrestricted(async () => await em.nativeUpdate(resolver.getEntityClass(model), convertWhere(model, where), resolver.toEntityData(model, update))),
|
|
37
|
+
updateMany: async ({ model, where, update }) => await runUnrestricted(async (em) => await em.nativeUpdate(resolver.getEntityClass(model), convertWhere(model, where), resolver.toEntityData(model, update))),
|
|
47
38
|
delete: async ({ model, where }) => {
|
|
48
|
-
await runUnrestricted(async () => {
|
|
39
|
+
await runUnrestricted(async (em) => {
|
|
49
40
|
await em.nativeDelete(resolver.getEntityClass(model), convertWhere(model, where));
|
|
50
41
|
});
|
|
51
42
|
},
|
|
52
|
-
deleteMany: async ({ model, where }) => await runUnrestricted(async () => await em.nativeDelete(resolver.getEntityClass(model), convertWhere(model, where))),
|
|
53
|
-
consumeOne: async ({ model, where }) => await runUnrestricted(async () => await runInTransaction(async (transactionalEntityManager) => {
|
|
43
|
+
deleteMany: async ({ model, where }) => await runUnrestricted(async (em) => await em.nativeDelete(resolver.getEntityClass(model), convertWhere(model, where))),
|
|
44
|
+
consumeOne: async ({ model, where }) => await runUnrestricted(async (em) => await runInTransaction(em, async (transactionalEntityManager) => {
|
|
54
45
|
const entity = await findOneForUpdate(transactionalEntityManager, model, where);
|
|
55
46
|
if (!entity)
|
|
56
47
|
return null;
|
|
57
48
|
await transactionalEntityManager.remove(entity).flush();
|
|
58
49
|
return resolver.toAdapterRecord(model, entity);
|
|
59
50
|
})),
|
|
60
|
-
incrementOne: async ({ model, where, increment, set }) => await runUnrestricted(async () => await runInTransaction(async (transactionalEntityManager) => {
|
|
51
|
+
incrementOne: async ({ model, where, increment, set }) => await runUnrestricted(async (em) => await runInTransaction(em, async (transactionalEntityManager) => {
|
|
61
52
|
const entity = await findOneForUpdate(transactionalEntityManager, model, where);
|
|
62
53
|
if (!entity)
|
|
63
54
|
return null;
|
|
@@ -75,13 +66,13 @@ export function createMikroOrmCustomAdapter({ defaultUserRole, em, entities, inT
|
|
|
75
66
|
await transactionalEntityManager.flush();
|
|
76
67
|
return resolver.toAdapterRecord(model, entity);
|
|
77
68
|
})),
|
|
78
|
-
findOne: async ({ model, where }) => await runUnrestricted(async () => {
|
|
69
|
+
findOne: async ({ model, where }) => await runUnrestricted(async (em) => {
|
|
79
70
|
const entity = await em.findOne(resolver.getEntityClass(model), convertWhere(model, where));
|
|
80
71
|
return entity
|
|
81
72
|
? resolver.toAdapterRecord(model, entity)
|
|
82
73
|
: null;
|
|
83
74
|
}),
|
|
84
|
-
findMany: async ({ model, where, limit, offset, sortBy }) => await runUnrestricted(async () => {
|
|
75
|
+
findMany: async ({ model, where, limit, offset, sortBy }) => await runUnrestricted(async (em) => {
|
|
85
76
|
const result = await em.findAll(resolver.getEntityClass(model), {
|
|
86
77
|
...(where ? { where: convertWhere(model, where) } : {}),
|
|
87
78
|
limit,
|
|
@@ -99,7 +90,7 @@ export function createMikroOrmCustomAdapter({ defaultUserRole, em, entities, inT
|
|
|
99
90
|
? result
|
|
100
91
|
: adapterRecords;
|
|
101
92
|
}),
|
|
102
|
-
count: async ({ model, where }) => await runUnrestricted(async () => await em.count(resolver.getEntityClass(model), where ? convertWhere(model, where) : undefined)),
|
|
93
|
+
count: async ({ model, where }) => await runUnrestricted(async (em) => await em.count(resolver.getEntityClass(model), where ? convertWhere(model, where) : undefined)),
|
|
103
94
|
};
|
|
104
95
|
};
|
|
105
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-custom-adapter.js","sourceRoot":"","sources":["../../../src/adapters/mikro-orm/create-custom-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"create-custom-adapter.js","sourceRoot":"","sources":["../../../src/adapters/mikro-orm/create-custom-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createAdapterFactory, } from "better-auth/adapters";
|
|
2
|
+
import { runAuthQuery } from "../utils/run-auth-query.js";
|
|
2
3
|
import { createMikroOrmAdapterConfig } from "./mikro-orm/adapter-config.js";
|
|
3
4
|
import { createMikroOrmCustomAdapter } from "./mikro-orm/create-custom-adapter.js";
|
|
4
5
|
export { convertWhereToMikroOrm } from "./mikro-orm/where-compiler.js";
|
|
@@ -8,7 +9,7 @@ export const mikroOrmAdapter = ({ orm, entities, defaultUserRole, debugLogs, })
|
|
|
8
9
|
const adapterFactory = createAdapterFactory({
|
|
9
10
|
config: {
|
|
10
11
|
...adapterConfig,
|
|
11
|
-
transaction: async (callback) => await orm.em.transactional(async (em) => {
|
|
12
|
+
transaction: async (callback) => await runAuthQuery(orm.em, async (authEm) => await authEm.transactional(async (em) => {
|
|
12
13
|
const transactionAdapter = createAdapterFactory({
|
|
13
14
|
config: {
|
|
14
15
|
...adapterConfig,
|
|
@@ -22,7 +23,7 @@ export const mikroOrmAdapter = ({ orm, entities, defaultUserRole, debugLogs, })
|
|
|
22
23
|
}),
|
|
23
24
|
})(options);
|
|
24
25
|
return await callback(transactionAdapter);
|
|
25
|
-
}),
|
|
26
|
+
})),
|
|
26
27
|
},
|
|
27
28
|
adapter: createMikroOrmCustomAdapter({
|
|
28
29
|
defaultUserRole,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mikro-orm-adapter.js","sourceRoot":"","sources":["../../src/adapters/mikro-orm-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oBAAoB,GAErB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAC;AAEnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAavE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC9B,GAAG,EACH,QAAQ,EACR,eAAe,EACf,SAAS,GACa,EAAE,EAAE;IAC1B,OAAO,CAAC,OAA0B,EAAE,EAAE;QACpC,MAAM,aAAa,GAAG,2BAA2B,CAAC,SAAS,CAAC,CAAC;QAC7D,MAAM,cAAc,GAAG,oBAAoB,CAAC;YAC1C,MAAM,EAAE;gBACN,GAAG,aAAa;gBAChB,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAC9B,MAAM,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;oBACtC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;wBAC9C,MAAM,EAAE;4BACN,GAAG,aAAa;4BAChB,WAAW,EAAE,KAAK;yBACnB;wBACD,OAAO,EAAE,2BAA2B,CAAC;4BACnC,eAAe;4BACf,EAAE;4BACF,QAAQ;4BACR,aAAa,EAAE,IAAI;yBACpB,CAAC;qBACH,CAAC,CAAC,OAAO,CAAC,CAAC;oBAEZ,OAAO,MAAM,QAAQ,CAAC,kBAAkB,CAAC,CAAC;gBAC5C,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"mikro-orm-adapter.js","sourceRoot":"","sources":["../../src/adapters/mikro-orm-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oBAAoB,GAErB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAC;AAEnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAavE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC9B,GAAG,EACH,QAAQ,EACR,eAAe,EACf,SAAS,GACa,EAAE,EAAE;IAC1B,OAAO,CAAC,OAA0B,EAAE,EAAE;QACpC,MAAM,aAAa,GAAG,2BAA2B,CAAC,SAAS,CAAC,CAAC;QAC7D,MAAM,cAAc,GAAG,oBAAoB,CAAC;YAC1C,MAAM,EAAE;gBACN,GAAG,aAAa;gBAChB,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAC9B,MAAM,YAAY,CAChB,GAAG,CAAC,EAAE,EACN,KAAK,EAAE,MAAM,EAAE,EAAE,CACf,MAAM,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;oBACtC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;wBAC9C,MAAM,EAAE;4BACN,GAAG,aAAa;4BAChB,WAAW,EAAE,KAAK;yBACnB;wBACD,OAAO,EAAE,2BAA2B,CAAC;4BACnC,eAAe;4BACf,EAAE;4BACF,QAAQ;4BACR,aAAa,EAAE,IAAI;yBACpB,CAAC;qBACH,CAAC,CAAC,OAAO,CAAC,CAAC;oBAEZ,OAAO,MAAM,QAAQ,CAAC,kBAAkB,CAAC,CAAC;gBAC5C,CAAC,CAAC,CACL;aACJ;YACD,OAAO,EAAE,2BAA2B,CAAC;gBACnC,eAAe;gBACf,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,QAAQ;aACT,CAAC;SACH,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -47,7 +47,7 @@ export declare class ApiKeyService<ApiKey extends BaseApiKey = BaseApiKey, User
|
|
|
47
47
|
deleteWorkspaceKey(id: string, workspace: Workspace): Promise<ApiKey>;
|
|
48
48
|
validate(apiKey: string): Promise<ApiKeyValidation<ApiKey, User, Workspace>>;
|
|
49
49
|
recordUsage(apiKey: ApiKey): Promise<ApiKey>;
|
|
50
|
-
runUnrestricted<T>(callback: () => Promise<T>): Promise<T>;
|
|
50
|
+
runUnrestricted<T>(callback: (em: EntityManager) => Promise<T>): Promise<T>;
|
|
51
51
|
private findOne;
|
|
52
52
|
private createKey;
|
|
53
53
|
private updateKey;
|
package/dist/api-key.service.js
CHANGED
|
@@ -14,13 +14,13 @@ var ApiKeyService_1;
|
|
|
14
14
|
import { createHash, randomBytes } from "node:crypto";
|
|
15
15
|
import { EntityManager, Reference, } from "@mikro-orm/core";
|
|
16
16
|
import { RequestContext } from "@nest-boot/request-context";
|
|
17
|
-
import { RowLevelSecurity, RowLevelSecurityMode, } from "@nest-boot/row-level-security";
|
|
18
17
|
import { BadRequestException, ForbiddenException, Inject, Injectable, Logger, NotFoundException, UnauthorizedException, } from "@nestjs/common";
|
|
19
18
|
import { AccessControlService } from "./access-control.service.js";
|
|
20
19
|
import { MODULE_OPTIONS_TOKEN } from "./auth.module-definition.js";
|
|
21
20
|
import { BaseApiKey, BaseWorkspaceMember, } from "./entities/index.js";
|
|
22
21
|
import { DEFAULT_USER_PERMISSIONS, DEFAULT_USER_ROLE, DEFAULT_USER_ROLES, } from "./user.constants.js";
|
|
23
22
|
import { normalizeAuthPermissions, resolveAuthPermissions, } from "./utils/auth-role.util.js";
|
|
23
|
+
import { runAuthQuery } from "./utils/run-auth-query.js";
|
|
24
24
|
import { DEFAULT_WORKSPACE_PERMISSIONS } from "./workspace.constants.js";
|
|
25
25
|
let ApiKeyService = ApiKeyService_1 = class ApiKeyService {
|
|
26
26
|
em;
|
|
@@ -115,20 +115,14 @@ let ApiKeyService = ApiKeyService_1 = class ApiKeyService {
|
|
|
115
115
|
const now = new Date();
|
|
116
116
|
apiKey.lastUsedAt = now;
|
|
117
117
|
apiKey.updatedAt = now;
|
|
118
|
-
await this.runUnrestricted(() =>
|
|
118
|
+
await this.runUnrestricted((em) => em.persist(apiKey).flush());
|
|
119
119
|
return apiKey;
|
|
120
120
|
}
|
|
121
121
|
async runUnrestricted(callback) {
|
|
122
|
-
|
|
123
|
-
RowLevelSecurity.setMode(RowLevelSecurityMode.DISABLED);
|
|
124
|
-
return callback();
|
|
125
|
-
};
|
|
126
|
-
if (RequestContext.isActive())
|
|
127
|
-
return await RequestContext.child(run);
|
|
128
|
-
return await RequestContext.run(new RequestContext({ type: "api-key-persistence" }), run);
|
|
122
|
+
return await runAuthQuery(this.em, callback);
|
|
129
123
|
}
|
|
130
124
|
async findOne(where) {
|
|
131
|
-
return await this.runUnrestricted(async () => await
|
|
125
|
+
return await this.runUnrestricted(async (em) => await em.findOne(this.apiKeyEntity, where, {
|
|
132
126
|
populate: ["owner"],
|
|
133
127
|
}));
|
|
134
128
|
}
|
|
@@ -139,17 +133,20 @@ let ApiKeyService = ApiKeyService_1 = class ApiKeyService {
|
|
|
139
133
|
const prefix = options.prefix ?? process.env.API_KEY_PREFIX ?? "sk";
|
|
140
134
|
this.assertValidPrefix(prefix);
|
|
141
135
|
const plaintextApiKey = `${prefix}${randomBytes(48).toString("base64url")}`;
|
|
142
|
-
const entity = this.
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
136
|
+
const entity = await this.runUnrestricted(async (em) => {
|
|
137
|
+
const entity = em.create(this.apiKeyEntity, {
|
|
138
|
+
enabled: true,
|
|
139
|
+
expiresAt: options.expiresAt ?? null,
|
|
140
|
+
key: this.hashApiKey(plaintextApiKey),
|
|
141
|
+
name: options.name,
|
|
142
|
+
owner,
|
|
143
|
+
permissions,
|
|
144
|
+
prefix,
|
|
145
|
+
start: plaintextApiKey.slice(0, 8),
|
|
146
|
+
});
|
|
147
|
+
await em.persist(entity).flush();
|
|
148
|
+
return entity;
|
|
151
149
|
});
|
|
152
|
-
await this.runUnrestricted(() => this.em.persist(entity).flush());
|
|
153
150
|
this.logger.log("API key created", {
|
|
154
151
|
apiKeyId: entity.id,
|
|
155
152
|
ownerId: owner.id,
|
|
@@ -170,12 +167,11 @@ let ApiKeyService = ApiKeyService_1 = class ApiKeyService {
|
|
|
170
167
|
if (permissions !== undefined) {
|
|
171
168
|
apiKey.permissions = permissions;
|
|
172
169
|
}
|
|
173
|
-
await this.runUnrestricted(() =>
|
|
170
|
+
await this.runUnrestricted((em) => em.persist(apiKey).flush());
|
|
174
171
|
return apiKey;
|
|
175
172
|
}
|
|
176
173
|
async deleteKey(apiKey) {
|
|
177
|
-
this.em.remove(apiKey);
|
|
178
|
-
await this.runUnrestricted(() => this.em.flush());
|
|
174
|
+
await this.runUnrestricted((em) => em.remove(apiKey).flush());
|
|
179
175
|
return apiKey;
|
|
180
176
|
}
|
|
181
177
|
async getOwnedApiKey(id, owner) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key.service.js","sourceRoot":"","sources":["../src/api-key.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"api-key.service.js","sourceRoot":"","sources":["../src/api-key.service.ts"],"names":[],"mappings":"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"}
|
package/dist/auth.middleware.js
CHANGED
|
@@ -18,6 +18,7 @@ import { MODULE_OPTIONS_TOKEN } from "./auth.module-definition.js";
|
|
|
18
18
|
import { BaseAccount, BaseApiKey, BaseSession, BaseUser, BaseVerification, BaseWorkspace, BaseWorkspaceInvitation, BaseWorkspaceMember, } from "./entities/index.js";
|
|
19
19
|
import { SessionService } from "./session.service.js";
|
|
20
20
|
import { extractApiKey } from "./utils/extract-api-key.util.js";
|
|
21
|
+
import { runAuthQuery } from "./utils/run-auth-query.js";
|
|
21
22
|
let AuthMiddleware = class AuthMiddleware {
|
|
22
23
|
options;
|
|
23
24
|
sessionService;
|
|
@@ -37,6 +38,7 @@ let AuthMiddleware = class AuthMiddleware {
|
|
|
37
38
|
if (!hasSession)
|
|
38
39
|
await this.resolveApiKey(req);
|
|
39
40
|
await this.resolveWorkspaceMember();
|
|
41
|
+
this.updateSessionContext();
|
|
40
42
|
next();
|
|
41
43
|
}
|
|
42
44
|
catch (error) {
|
|
@@ -87,11 +89,11 @@ let AuthMiddleware = class AuthMiddleware {
|
|
|
87
89
|
const workspace = RequestContext.get(BaseWorkspace);
|
|
88
90
|
if (!user || !workspace)
|
|
89
91
|
return;
|
|
90
|
-
const member = await this.em.findOne(this.options.entities.workspaceMember, {
|
|
92
|
+
const member = await runAuthQuery(this.em, async (em) => await em.findOne(this.options.entities.workspaceMember, {
|
|
91
93
|
status: "ACTIVE",
|
|
92
94
|
user,
|
|
93
95
|
workspace,
|
|
94
|
-
});
|
|
96
|
+
}));
|
|
95
97
|
if (!member)
|
|
96
98
|
return;
|
|
97
99
|
RequestContext.set(BaseWorkspaceMember, member);
|
|
@@ -99,6 +101,21 @@ let AuthMiddleware = class AuthMiddleware {
|
|
|
99
101
|
setApiKey(apiKey) {
|
|
100
102
|
RequestContext.set(BaseApiKey, apiKey);
|
|
101
103
|
}
|
|
104
|
+
updateSessionContext() {
|
|
105
|
+
const user = RequestContext.get(BaseUser);
|
|
106
|
+
const apiKey = RequestContext.get(BaseApiKey);
|
|
107
|
+
const workspace = RequestContext.get(BaseWorkspace);
|
|
108
|
+
const member = RequestContext.get(BaseWorkspaceMember);
|
|
109
|
+
const authenticated = Boolean(user ?? apiKey);
|
|
110
|
+
const canUseWorkspace = Boolean(member ?? (apiKey && !user));
|
|
111
|
+
this.em.setSessionContext({
|
|
112
|
+
role: authenticated ? "authenticated" : "anonymous",
|
|
113
|
+
variables: {
|
|
114
|
+
"app.user": user?.id ?? "",
|
|
115
|
+
"app.workspace": !authenticated || canUseWorkspace ? (workspace?.id ?? "") : "",
|
|
116
|
+
},
|
|
117
|
+
});
|
|
118
|
+
}
|
|
102
119
|
setUser(user) {
|
|
103
120
|
RequestContext.set(BaseUser, user);
|
|
104
121
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.middleware.js","sourceRoot":"","sources":["../src/auth.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EACL,OAAO,EACP,cAAc,GAEf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,MAAM,EACN,UAAU,EAEV,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,EACL,WAAW,EACX,UAAU,EACV,WAAW,EACX,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.middleware.js","sourceRoot":"","sources":["../src/auth.middleware.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -14,11 +14,13 @@ export * from "./interfaces/auth-role.interface.js";
|
|
|
14
14
|
export * from "./interfaces/auth-service.interface.js";
|
|
15
15
|
export * from "./interfaces/can-options.interface.js";
|
|
16
16
|
export * from "./interfaces/route-argument-metadata-value.interface.js";
|
|
17
|
+
export * from "./interfaces/scope-policy-options.interface.js";
|
|
17
18
|
export * from "./interfaces/serialized-ability-rule.interface.js";
|
|
18
19
|
export * from "./interfaces/session-service.interface.js";
|
|
19
20
|
export * from "./interfaces/user-service.interface.js";
|
|
20
21
|
export * from "./interfaces/workspace-service.interface.js";
|
|
21
22
|
export * from "./permission.constants.js";
|
|
23
|
+
export * from "./policies/index.js";
|
|
22
24
|
export * from "./session.service.js";
|
|
23
25
|
export * from "./types/auth-module-roles.type.js";
|
|
24
26
|
export * from "./types/build-user-ability-callback.type.js";
|
package/dist/index.js
CHANGED
|
@@ -14,11 +14,13 @@ export * from "./interfaces/auth-role.interface.js";
|
|
|
14
14
|
export * from "./interfaces/auth-service.interface.js";
|
|
15
15
|
export * from "./interfaces/can-options.interface.js";
|
|
16
16
|
export * from "./interfaces/route-argument-metadata-value.interface.js";
|
|
17
|
+
export * from "./interfaces/scope-policy-options.interface.js";
|
|
17
18
|
export * from "./interfaces/serialized-ability-rule.interface.js";
|
|
18
19
|
export * from "./interfaces/session-service.interface.js";
|
|
19
20
|
export * from "./interfaces/user-service.interface.js";
|
|
20
21
|
export * from "./interfaces/workspace-service.interface.js";
|
|
21
22
|
export * from "./permission.constants.js";
|
|
23
|
+
export * from "./policies/index.js";
|
|
22
24
|
export * from "./session.service.js";
|
|
23
25
|
export * from "./types/auth-module-roles.type.js";
|
|
24
26
|
export * from "./types/build-user-ability-callback.type.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oCAAoC,CAAC;AACnD,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qCAAqC,CAAC;AACpD,cAAc,wCAAwC,CAAC;AACvD,cAAc,uCAAuC,CAAC;AACtD,cAAc,yDAAyD,CAAC;AACxE,cAAc,mDAAmD,CAAC;AAClE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,wCAAwC,CAAC;AACvD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,mCAAmC,CAAC;AAClD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,kDAAkD,CAAC;AACjE,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qCAAqC,CAAC;AACpD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,yCAAyC,CAAC;AACxD,cAAc,0BAA0B,CAAC;AACzC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oCAAoC,CAAC;AACnD,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qCAAqC,CAAC;AACpD,cAAc,wCAAwC,CAAC;AACvD,cAAc,uCAAuC,CAAC;AACtD,cAAc,yDAAyD,CAAC;AACxE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,mDAAmD,CAAC;AAClE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,wCAAwC,CAAC;AACvD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mCAAmC,CAAC;AAClD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,kDAAkD,CAAC;AACjE,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qCAAqC,CAAC;AACpD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,yCAAyC,CAAC;AACxD,cAAc,0BAA0B,CAAC;AACzC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scope-policy-options.interface.js","sourceRoot":"","sources":["../../src/interfaces/scope-policy-options.interface.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
export function createScopePolicy(scope, options) {
|
|
2
|
+
const type = options.type ?? "bigint";
|
|
3
|
+
const property = options.property ?? scope;
|
|
4
|
+
const command = options.command ?? "all";
|
|
5
|
+
const roles = [...(options.roles ?? ["authenticated"])];
|
|
6
|
+
if (!["bigint", "integer", "uuid", "text"].includes(type)) {
|
|
7
|
+
throw new TypeError(`Unsupported scope policy type: ${type}`);
|
|
8
|
+
}
|
|
9
|
+
if (!["all", "select", "insert", "update", "delete"].includes(command)) {
|
|
10
|
+
throw new TypeError(`Unsupported scope policy command: ${command}`);
|
|
11
|
+
}
|
|
12
|
+
if (!property.trim()) {
|
|
13
|
+
throw new TypeError("Scope policy property must not be empty");
|
|
14
|
+
}
|
|
15
|
+
if (!roles.length || roles.some((role) => !role.trim())) {
|
|
16
|
+
throw new TypeError("Scope policy roles must not be empty");
|
|
17
|
+
}
|
|
18
|
+
const matchesScope = (columns) => {
|
|
19
|
+
if (!Object.hasOwn(columns, property) ||
|
|
20
|
+
typeof columns[property] !== "string" ||
|
|
21
|
+
!columns[property]) {
|
|
22
|
+
throw new TypeError(`Scope policy requires a mapped column for property: ${property}`);
|
|
23
|
+
}
|
|
24
|
+
const column = columns[property].replaceAll('"', '""');
|
|
25
|
+
return `"${column}" = nullif(current_setting('app.${scope}', true), '')::${type}`;
|
|
26
|
+
};
|
|
27
|
+
return {
|
|
28
|
+
...(options.name !== undefined ? { name: options.name } : {}),
|
|
29
|
+
command,
|
|
30
|
+
roles,
|
|
31
|
+
...(command !== "insert" ? { using: matchesScope } : {}),
|
|
32
|
+
...(command === "all" || command === "insert" || command === "update"
|
|
33
|
+
? { check: matchesScope }
|
|
34
|
+
: {}),
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=create-scope-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-scope-policy.js","sourceRoot":"","sources":["../../src/policies/create-scope-policy.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,iBAAiB,CAC/B,KAA2B,EAC3B,OAA2B;IAE3B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC;IACzC,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAExD,IAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,SAAS,CAAC,kCAAkC,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,SAAS,CAAC,qCAAqC,OAAO,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;QACrB,MAAM,IAAI,SAAS,CAAC,yCAAyC,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,YAAY,GAA4C,CAAC,OAAO,EAAE,EAAE;QACxE,IACE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;YACjC,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,QAAQ;YACrC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAClB,CAAC;YACD,MAAM,IAAI,SAAS,CACjB,uDAAuD,QAAQ,EAAE,CAClE,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACvD,OAAO,IAAI,MAAM,mCAAmC,KAAK,kBAAkB,IAAI,EAAE,CAAC;IACpF,CAAC,CAAC;IAEF,OAAO;QACL,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,OAAO;QACP,KAAK;QACL,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,QAAQ;YACnE,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE;YACzB,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/policies/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user-scope.policy.js","sourceRoot":"","sources":["../../src/policies/user-scope.policy.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAU7D,MAAM,UAAU,eAAe,CAAC,UAA8B,EAAE;IAC9D,OAAO,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workspace-scope.policy.js","sourceRoot":"","sources":["../../src/policies/workspace-scope.policy.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAU7D,MAAM,UAAU,oBAAoB,CAClC,UAA8B,EAAE;IAEhC,OAAO,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC"}
|
package/dist/session.service.js
CHANGED
|
@@ -11,12 +11,12 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
13
|
import { EntityManager } from "@mikro-orm/core";
|
|
14
|
-
import { cookies, headers,
|
|
15
|
-
import { RowLevelSecurity, RowLevelSecurityMode, } from "@nest-boot/row-level-security";
|
|
14
|
+
import { cookies, headers, } from "@nest-boot/request-context";
|
|
16
15
|
import { Inject, Injectable } from "@nestjs/common";
|
|
17
16
|
import { makeSignature } from "better-auth/crypto";
|
|
18
17
|
import { AUTH_TOKEN } from "./auth.constants.js";
|
|
19
18
|
import { MODULE_OPTIONS_TOKEN } from "./auth.module-definition.js";
|
|
19
|
+
import { runAuthQuery } from "./utils/run-auth-query.js";
|
|
20
20
|
let SessionService = class SessionService {
|
|
21
21
|
em;
|
|
22
22
|
options;
|
|
@@ -45,9 +45,9 @@ let SessionService = class SessionService {
|
|
|
45
45
|
const data = await this.auth.api.getSession({ headers: requestHeaders });
|
|
46
46
|
if (!data)
|
|
47
47
|
return null;
|
|
48
|
-
const [user, session] = await this.runUnrestricted(async () => await Promise.all([
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
const [user, session] = await this.runUnrestricted(async (em) => await Promise.all([
|
|
49
|
+
em.findOne(this.options.entities.user, { id: data.user.id }),
|
|
50
|
+
em.findOne(this.options.entities.session, {
|
|
51
51
|
token: data.session.token,
|
|
52
52
|
}),
|
|
53
53
|
]));
|
|
@@ -66,7 +66,7 @@ let SessionService = class SessionService {
|
|
|
66
66
|
const data = await this.auth.api.listSessions({ headers: headers() });
|
|
67
67
|
if (data.length === 0)
|
|
68
68
|
return [];
|
|
69
|
-
const sessions = await this.runUnrestricted(async () => await
|
|
69
|
+
const sessions = await this.runUnrestricted(async (em) => await em.find(this.options.entities.session, {
|
|
70
70
|
token: { $in: data.map(({ token }) => token) },
|
|
71
71
|
}));
|
|
72
72
|
const sessionsByToken = new Map(sessions.map((session) => [session.token, session]));
|
|
@@ -104,13 +104,7 @@ let SessionService = class SessionService {
|
|
|
104
104
|
expireCookieAndChunks(cookieStore, authCookies.accountData);
|
|
105
105
|
}
|
|
106
106
|
async runUnrestricted(callback) {
|
|
107
|
-
|
|
108
|
-
RowLevelSecurity.setMode(RowLevelSecurityMode.DISABLED);
|
|
109
|
-
return callback();
|
|
110
|
-
};
|
|
111
|
-
if (RequestContext.isActive())
|
|
112
|
-
return await RequestContext.child(run);
|
|
113
|
-
return await RequestContext.run(new RequestContext({ type: "auth-session" }), run);
|
|
107
|
+
return await runAuthQuery(this.em, callback);
|
|
114
108
|
}
|
|
115
109
|
};
|
|
116
110
|
SessionService = __decorate([
|