@revisium/core 2.10.0 → 2.11.0-alpha.2
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/ee/billing/usage/usage.service.js +8 -9
- package/dist/ee/billing/usage/usage.service.js.map +1 -1
- package/dist/ee/billing/usage-reporter.service.js +9 -1
- package/dist/ee/billing/usage-reporter.service.js.map +1 -1
- package/dist/package.json +6 -3
- package/dist/src/configure-http-app.d.ts +7 -0
- package/dist/src/configure-http-app.js +78 -0
- package/dist/src/configure-http-app.js.map +1 -0
- package/dist/src/core/shared/shared.module.js +1 -2
- package/dist/src/core/shared/shared.module.js.map +1 -1
- package/dist/src/features/auth/auth.module.js +2 -0
- package/dist/src/features/auth/auth.module.js.map +1 -1
- package/dist/src/features/auth/commands/auth-api.service.d.ts +3 -1
- package/dist/src/features/auth/commands/auth-api.service.js +8 -4
- package/dist/src/features/auth/commands/auth-api.service.js.map +1 -1
- package/dist/src/features/auth/commands/handlers/check-project-permission.handler.js +2 -2
- package/dist/src/features/auth/commands/handlers/check-project-permission.handler.js.map +1 -1
- package/dist/src/features/organization/commands/handlers/add-user-to-organization.handler.d.ts +3 -1
- package/dist/src/features/organization/commands/handlers/add-user-to-organization.handler.js +5 -2
- package/dist/src/features/organization/commands/handlers/add-user-to-organization.handler.js.map +1 -1
- package/dist/src/features/organization/commands/handlers/remove-user-from-organization.handler.d.ts +3 -1
- package/dist/src/features/organization/commands/handlers/remove-user-from-organization.handler.js +6 -2
- package/dist/src/features/organization/commands/handlers/remove-user-from-organization.handler.js.map +1 -1
- package/dist/src/features/project/commands/handlers/add-user-to-project.handler.d.ts +3 -1
- package/dist/src/features/project/commands/handlers/add-user-to-project.handler.js +6 -2
- package/dist/src/features/project/commands/handlers/add-user-to-project.handler.js.map +1 -1
- package/dist/src/features/project/commands/handlers/delete-project.handler.d.ts +3 -1
- package/dist/src/features/project/commands/handlers/delete-project.handler.js +6 -2
- package/dist/src/features/project/commands/handlers/delete-project.handler.js.map +1 -1
- package/dist/src/features/project/commands/handlers/remove-user-from-project.handler.d.ts +3 -1
- package/dist/src/features/project/commands/handlers/remove-user-from-project.handler.js +6 -2
- package/dist/src/features/project/commands/handlers/remove-user-from-project.handler.js.map +1 -1
- package/dist/src/features/project/commands/handlers/update-user-project-role.handler.d.ts +3 -1
- package/dist/src/features/project/commands/handlers/update-user-project-role.handler.js +6 -2
- package/dist/src/features/project/commands/handlers/update-user-project-role.handler.js.map +1 -1
- package/dist/src/features/project/project-api.service.d.ts +5 -2
- package/dist/src/features/project/project-api.service.js +15 -2
- package/dist/src/features/project/project-api.service.js.map +1 -1
- package/dist/src/features/project/queries/handlers/find-project-identity.handler.d.ts +12 -0
- package/dist/src/features/project/queries/handlers/find-project-identity.handler.js +113 -0
- package/dist/src/features/project/queries/handlers/find-project-identity.handler.js.map +1 -0
- package/dist/src/features/project/queries/handlers/index.d.ts +2 -1
- package/dist/src/features/project/queries/handlers/index.js +2 -0
- package/dist/src/features/project/queries/handlers/index.js.map +1 -1
- package/dist/src/features/project/queries/impl/find-project-identity.query.d.ts +21 -0
- package/dist/src/features/project/queries/impl/find-project-identity.query.js +10 -0
- package/dist/src/features/project/queries/impl/find-project-identity.query.js.map +1 -0
- package/dist/src/features/project/queries/impl/index.d.ts +1 -0
- package/dist/src/features/project/queries/impl/index.js +1 -0
- package/dist/src/features/project/queries/impl/index.js.map +1 -1
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.js +3 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/infrastructure/cache/constants/project-cache.constants.d.ts +7 -0
- package/dist/src/infrastructure/cache/constants/project-cache.constants.js +11 -0
- package/dist/src/infrastructure/cache/constants/project-cache.constants.js.map +1 -0
- package/dist/src/infrastructure/cache/revisium-cache.module.js +3 -0
- package/dist/src/infrastructure/cache/revisium-cache.module.js.map +1 -1
- package/dist/src/infrastructure/cache/services/auth-cache.service.d.ts +7 -1
- package/dist/src/infrastructure/cache/services/auth-cache.service.js +9 -7
- package/dist/src/infrastructure/cache/services/auth-cache.service.js.map +1 -1
- package/dist/src/infrastructure/cache/services/project-cache.service.d.ts +15 -0
- package/dist/src/infrastructure/cache/services/project-cache.service.js +40 -0
- package/dist/src/infrastructure/cache/services/project-cache.service.js.map +1 -0
- package/dist/src/infrastructure/health/notification.check.d.ts +16 -5
- package/dist/src/infrastructure/health/notification.check.js +66 -11
- package/dist/src/infrastructure/health/notification.check.js.map +1 -1
- package/dist/src/main.js +4 -52
- package/dist/src/main.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +6 -3
|
@@ -14,6 +14,7 @@ const common_1 = require("@nestjs/common");
|
|
|
14
14
|
const engine_1 = require("@revisium/engine");
|
|
15
15
|
const sql_1 = require("../../../src/__generated__/client/sql");
|
|
16
16
|
const limits_interface_1 = require("../../../src/features/billing/limits.interface");
|
|
17
|
+
const system_tables_consts_1 = require("../../../src/features/share/system-tables.consts");
|
|
17
18
|
const prisma_service_1 = require("../../../src/infrastructure/database/prisma.service");
|
|
18
19
|
const transaction_prisma_service_1 = require("../../../src/infrastructure/database/transaction-prisma.service");
|
|
19
20
|
const build_metric_1 = require("./build-metric");
|
|
@@ -59,10 +60,10 @@ let UsageService = class UsageService {
|
|
|
59
60
|
return this.countRowsInTable(context.revisionId, context.tableId);
|
|
60
61
|
}
|
|
61
62
|
case limits_interface_1.LimitMetric.TABLES_PER_REVISION: {
|
|
62
|
-
if (!context?.
|
|
63
|
-
throw new Error('TABLES_PER_REVISION requires
|
|
63
|
+
if (!context?.revisionId) {
|
|
64
|
+
throw new Error('TABLES_PER_REVISION requires revisionId in context');
|
|
64
65
|
}
|
|
65
|
-
return this.countTablesInRevision(context.
|
|
66
|
+
return this.countTablesInRevision(context.revisionId);
|
|
66
67
|
}
|
|
67
68
|
case limits_interface_1.LimitMetric.BRANCHES_PER_PROJECT: {
|
|
68
69
|
if (!context?.projectId) {
|
|
@@ -124,15 +125,13 @@ let UsageService = class UsageService {
|
|
|
124
125
|
});
|
|
125
126
|
return table?._count.rows ?? 0;
|
|
126
127
|
}
|
|
127
|
-
async countTablesInRevision(
|
|
128
|
-
|
|
128
|
+
async countTablesInRevision(revisionId) {
|
|
129
|
+
return this.db.table.count({
|
|
129
130
|
where: {
|
|
130
|
-
|
|
131
|
-
|
|
131
|
+
revisions: { some: { id: revisionId } },
|
|
132
|
+
NOT: { id: { startsWith: system_tables_consts_1.SYSTEM_TABLE_PREFIX } },
|
|
132
133
|
},
|
|
133
|
-
select: { _count: { select: { tables: true } } },
|
|
134
134
|
});
|
|
135
|
-
return revision?._count.tables ?? 0;
|
|
136
135
|
}
|
|
137
136
|
async countBranchesInProject(projectId) {
|
|
138
137
|
return this.db.branch.count({ where: { projectId } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.service.js","sourceRoot":"","sources":["../../../../ee/billing/usage/usage.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAoD;AACpD,+DAAmE;AACnE,qFAAoE;AACpE,wFAA2E;AAC3E,gHAAkG;AAClG,iDAA6C;AAsBtC,IAAM,YAAY,GAAlB,MAAM,YAAY;IACvB,YACmB,MAAqB,EACrB,kBAA4C,EAC5C,MAAwB;QAFxB,WAAM,GAAN,MAAM,CAAe;QACrB,uBAAkB,GAAlB,kBAAkB,CAA0B;QAC5C,WAAM,GAAN,MAAM,CAAkB;IACxC,CAAC;IAEJ,IAAY,EAAE;QACZ,OAAO,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,cAAsB,EACtB,UAKQ;QAER,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrE,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,8BAAW,CAAC,YAAY,CAAC;YAC3D,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,8BAAW,CAAC,QAAQ,CAAC;YACvD,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,8BAAW,CAAC,KAAK,CAAC;YACpD,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,8BAAW,CAAC,aAAa,CAAC;SAC7D,CAAC,CAAC;QAEH,OAAO;YACL,WAAW,EAAE,IAAA,0BAAW,EAAC,WAAW,EAAE,UAAU,EAAE,YAAY,CAAC;YAC/D,QAAQ,EAAE,IAAA,0BAAW,EAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC;YACrD,KAAK,EAAE,IAAA,0BAAW,EAAC,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC;YAC5C,YAAY,EAAE,IAAA,0BAAW,EAAC,YAAY,EAAE,UAAU,EAAE,aAAa,CAAC;SACnE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,cAAsB,EACtB,MAAmB,EACnB,OAAuE;QAEvE,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,8BAAW,CAAC,YAAY;gBAC3B,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAC/C,KAAK,8BAAW,CAAC,QAAQ;gBACvB,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;YAC5C,KAAK,8BAAW,CAAC,KAAK;gBACpB,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YACzC,KAAK,8BAAW,CAAC,aAAa;gBAC5B,OAAO,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;YAChD,KAAK,8BAAW,CAAC,SAAS;gBACxB,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;YAC5C,KAAK,8BAAW,CAAC,cAAc,CAAC,CAAC,CAAC;gBAChC,IAAI,CAAC,OAAO,EAAE,UAAU,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;oBAC9C,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;gBACJ,CAAC;gBACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACpE,CAAC;YACD,KAAK,8BAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC;gBACrC,IAAI,CAAC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"usage.service.js","sourceRoot":"","sources":["../../../../ee/billing/usage/usage.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,8 +35,15 @@ let UsageReporterService = UsageReporterService_1 = class UsageReporterService {
|
|
|
35
35
|
select: { id: true },
|
|
36
36
|
});
|
|
37
37
|
let reported = 0;
|
|
38
|
+
let skippedNoSubscription = 0;
|
|
39
|
+
let failed = 0;
|
|
38
40
|
for (const org of orgs) {
|
|
39
41
|
try {
|
|
42
|
+
const subscription = await this.billingClient.getSubscription(org.id);
|
|
43
|
+
if (!subscription) {
|
|
44
|
+
skippedNoSubscription++;
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
40
47
|
const [rowVersions, projects, seats, storageBytes] = await Promise.all([
|
|
41
48
|
this.usageService.computeUsage(org.id, limits_interface_1.LimitMetric.ROW_VERSIONS),
|
|
42
49
|
this.usageService.computeUsage(org.id, limits_interface_1.LimitMetric.PROJECTS),
|
|
@@ -52,10 +59,11 @@ let UsageReporterService = UsageReporterService_1 = class UsageReporterService {
|
|
|
52
59
|
reported++;
|
|
53
60
|
}
|
|
54
61
|
catch (error) {
|
|
62
|
+
failed++;
|
|
55
63
|
this.logger.warn(`Failed to report usage for org=${org.id}: ${error instanceof Error ? error.message : error}`);
|
|
56
64
|
}
|
|
57
65
|
}
|
|
58
|
-
this.logger.log(`Usage
|
|
66
|
+
this.logger.log(`Usage reporting completed: reported=${reported}, skipped_no_subscription=${skippedNoSubscription}, failed=${failed}, total=${orgs.length}`);
|
|
59
67
|
}
|
|
60
68
|
};
|
|
61
69
|
exports.UsageReporterService = UsageReporterService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-reporter.service.js","sourceRoot":"","sources":["../../../ee/billing/usage-reporter.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,+CAAwD;AACxD,kFAAoE;AACpE,qFAA2E;AAC3E,yEAGoC;AACpC,yDAAqD;AAG9C,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAG/B,YACmB,MAAqB,EACrB,YAA0B,EAE3C,aAA8C;QAH7B,WAAM,GAAN,MAAM,CAAe;QACrB,iBAAY,GAAZ,YAAY,CAAc;QAE1B,kBAAa,GAAb,aAAa,CAAgB;QAN/B,WAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;IAO7D,CAAC;IAGE,AAAN,KAAK,CAAC,cAAc;QAClB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;YACnC,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC;YACnD,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACrB,CAAC,CAAC;QAEH,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC;gBACH,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBACrE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,8BAAW,CAAC,YAAY,CAAC;oBAChE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,8BAAW,CAAC,QAAQ,CAAC;oBAC5D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,8BAAW,CAAC,KAAK,CAAC;oBACzD,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,8BAAW,CAAC,aAAa,CAAC;iBAClE,CAAC,CAAC;gBAEH,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE;oBAC3C,YAAY,EAAE,WAAW;oBACzB,QAAQ;oBACR,KAAK;oBACL,aAAa,EAAE,YAAY;iBAC5B,CAAC,CAAC;gBACH,QAAQ,EAAE,CAAC;YACb,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,kCAAkC,GAAG,CAAC,EAAE,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9F,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,
|
|
1
|
+
{"version":3,"file":"usage-reporter.service.js","sourceRoot":"","sources":["../../../ee/billing/usage-reporter.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,+CAAwD;AACxD,kFAAoE;AACpE,qFAA2E;AAC3E,yEAGoC;AACpC,yDAAqD;AAG9C,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAG/B,YACmB,MAAqB,EACrB,YAA0B,EAE3C,aAA8C;QAH7B,WAAM,GAAN,MAAM,CAAe;QACrB,iBAAY,GAAZ,YAAY,CAAc;QAE1B,kBAAa,GAAb,aAAa,CAAgB;QAN/B,WAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;IAO7D,CAAC;IAGE,AAAN,KAAK,CAAC,cAAc;QAClB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;YACnC,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC;YACnD,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACrB,CAAC,CAAC;QAEH,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,qBAAqB,GAAG,CAAC,CAAC;QAC9B,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACtE,IAAI,CAAC,YAAY,EAAE,CAAC;oBAClB,qBAAqB,EAAE,CAAC;oBACxB,SAAS;gBACX,CAAC;gBAED,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBACrE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,8BAAW,CAAC,YAAY,CAAC;oBAChE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,8BAAW,CAAC,QAAQ,CAAC;oBAC5D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,8BAAW,CAAC,KAAK,CAAC;oBACzD,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,8BAAW,CAAC,aAAa,CAAC;iBAClE,CAAC,CAAC;gBAEH,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE;oBAC3C,YAAY,EAAE,WAAW;oBACzB,QAAQ;oBACR,KAAK;oBACL,aAAa,EAAE,YAAY;iBAC5B,CAAC,CAAC;gBACH,QAAQ,EAAE,CAAC;YACb,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,EAAE,CAAC;gBACT,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,kCAAkC,GAAG,CAAC,EAAE,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9F,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,uCAAuC,QAAQ,6BAA6B,qBAAqB,YAAY,MAAM,WAAW,IAAI,CAAC,MAAM,EAAE,CAC5I,CAAC;IACJ,CAAC;CACF,CAAA;AAzDY,oDAAoB;AAWzB;IADL,IAAA,eAAI,EAAC,yBAAc,CAAC,UAAU,CAAC;;;;0DA8C/B;+BAxDU,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,eAAM,EAAC,+CAAoB,CAAC,CAAA;qCAFJ,8BAAa;QACP,4BAAY;GALlC,oBAAoB,CAyDhC"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@revisium/core",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.11.0-alpha.2",
|
|
4
4
|
"description": "Revisium is a tool (UI/API) inspired by JSON (JSON Schema) and Git, designed to provide a flexible and low-level headless CMS solution.",
|
|
5
5
|
"private": false,
|
|
6
6
|
"homepage": "https://revisium.io",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"test:watch": "NODE_ENV=test jest --watch",
|
|
39
39
|
"test:cov": "NODE_ENV=test jest --maxWorkers=4 --forceExit --coverage --silent",
|
|
40
40
|
"test:debug": "NODE_ENV=test node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
|
|
41
|
-
"tsc": "tsc -p tsconfig.json",
|
|
41
|
+
"tsc": "tsc -p tsconfig.json --noEmit",
|
|
42
42
|
"docker:test-container-up": "docker compose -f docker-compose-test.yml -p revisium-core-test up -d && sleep 1 && dotenv -e .env.test npm run prisma:migrate:deploy && dotenv -e .env.test npm run seed",
|
|
43
43
|
"docker:test-container-down": "docker compose -f docker-compose-test.yml -p revisium-core-test down --volumes",
|
|
44
44
|
"version:minor": "npm version minor --no-git-tag-version",
|
|
@@ -147,9 +147,12 @@
|
|
|
147
147
|
"schema-utils": {
|
|
148
148
|
"ajv": "^8.18.0"
|
|
149
149
|
},
|
|
150
|
+
"fast-uri": "^3.1.2",
|
|
151
|
+
"fast-xml-builder": "^1.2.0",
|
|
150
152
|
"file-type": "^21.3.2",
|
|
151
|
-
"hono": "^4.12.
|
|
153
|
+
"hono": "^4.12.18",
|
|
152
154
|
"@hono/node-server": "^1.19.13",
|
|
155
|
+
"ip-address": "^10.2.0",
|
|
153
156
|
"lodash": "^4.18.1",
|
|
154
157
|
"path-to-regexp": "^8.4.0",
|
|
155
158
|
"picomatch": "^4.0.4",
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { ConfigService } from '@nestjs/config';
|
|
2
|
+
import type { NestExpressApplication } from '@nestjs/platform-express';
|
|
3
|
+
export interface ConfigureHttpAppOptions {
|
|
4
|
+
useCompression?: boolean;
|
|
5
|
+
noStoreExceptPathPrefixes?: string[];
|
|
6
|
+
}
|
|
7
|
+
export declare function configureHttpApp(app: NestExpressApplication, options?: ConfigureHttpAppOptions): ConfigService;
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.configureHttpApp = configureHttpApp;
|
|
7
|
+
const common_1 = require("@nestjs/common");
|
|
8
|
+
const config_1 = require("@nestjs/config");
|
|
9
|
+
const compression_1 = __importDefault(require("compression"));
|
|
10
|
+
const cookie_parser_1 = __importDefault(require("cookie-parser"));
|
|
11
|
+
const DEFAULT_BODY_LIMIT = '10mb';
|
|
12
|
+
const CORS_MAX_AGE_SECONDS = 86400;
|
|
13
|
+
function parseTrustProxy(value) {
|
|
14
|
+
if (value === 'true') {
|
|
15
|
+
return true;
|
|
16
|
+
}
|
|
17
|
+
if (value === 'false') {
|
|
18
|
+
return false;
|
|
19
|
+
}
|
|
20
|
+
if (/^\d+$/.test(value)) {
|
|
21
|
+
return Number(value);
|
|
22
|
+
}
|
|
23
|
+
return value;
|
|
24
|
+
}
|
|
25
|
+
function configureTrustProxy(app, config) {
|
|
26
|
+
const trustProxy = config.get('TRUST_PROXY');
|
|
27
|
+
if (trustProxy !== undefined && trustProxy !== '') {
|
|
28
|
+
const value = parseTrustProxy(trustProxy);
|
|
29
|
+
app.set('trust proxy', value);
|
|
30
|
+
common_1.Logger.log(`Express 'trust proxy' set to ${JSON.stringify(value)}`, 'Bootstrap');
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
function configureNoStoreHeaders(app, exceptPathPrefixes) {
|
|
34
|
+
if (exceptPathPrefixes === undefined) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
app.use((req, res, next) => {
|
|
38
|
+
if (!exceptPathPrefixes.some((prefix) => req.path.startsWith(prefix))) {
|
|
39
|
+
res.setHeader('Cache-Control', 'no-store');
|
|
40
|
+
}
|
|
41
|
+
next();
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
function getCorsOriginSetting(config) {
|
|
45
|
+
const corsOrigins = config
|
|
46
|
+
.get('CORS_ORIGIN')
|
|
47
|
+
?.split(',')
|
|
48
|
+
.map((origin) => origin.trim())
|
|
49
|
+
.filter(Boolean);
|
|
50
|
+
const isProduction = config.get('NODE_ENV') === 'production';
|
|
51
|
+
if (!corsOrigins || corsOrigins.length === 0) {
|
|
52
|
+
if (isProduction) {
|
|
53
|
+
common_1.Logger.warn('CORS_ORIGIN is not set in production - cross-origin requests will be refused. ' +
|
|
54
|
+
'Set CORS_ORIGIN to an explicit allowlist if the admin UI is served from a different origin than core.', 'Bootstrap');
|
|
55
|
+
}
|
|
56
|
+
return !isProduction;
|
|
57
|
+
}
|
|
58
|
+
return corsOrigins;
|
|
59
|
+
}
|
|
60
|
+
function configureHttpApp(app, options = {}) {
|
|
61
|
+
const config = app.get(config_1.ConfigService);
|
|
62
|
+
const bodyLimit = config.get('BODY_LIMIT') ?? DEFAULT_BODY_LIMIT;
|
|
63
|
+
configureTrustProxy(app, config);
|
|
64
|
+
app.useBodyParser('json', { limit: bodyLimit });
|
|
65
|
+
if (options.useCompression) {
|
|
66
|
+
app.use((0, compression_1.default)());
|
|
67
|
+
}
|
|
68
|
+
app.use((0, cookie_parser_1.default)());
|
|
69
|
+
configureNoStoreHeaders(app, options.noStoreExceptPathPrefixes);
|
|
70
|
+
app.enableCors({
|
|
71
|
+
maxAge: CORS_MAX_AGE_SECONDS,
|
|
72
|
+
credentials: true,
|
|
73
|
+
origin: getCorsOriginSetting(config),
|
|
74
|
+
});
|
|
75
|
+
app.useGlobalPipes(new common_1.ValidationPipe({ transform: true }));
|
|
76
|
+
return config;
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=configure-http-app.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configure-http-app.js","sourceRoot":"","sources":["../../src/configure-http-app.ts"],"names":[],"mappings":";;;;;AAiFA,4CAuBC;AAxGD,2CAAwD;AACxD,2CAA+C;AAE/C,8DAAsC;AACtC,kEAAyC;AAGzC,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,oBAAoB,GAAG,KAAK,CAAC;AAOnC,SAAS,eAAe,CAAC,KAAa;IACpC,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,mBAAmB,CAC1B,GAA2B,EAC3B,MAAqB;IAErB,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAS,aAAa,CAAC,CAAC;IACrD,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,EAAE,EAAE,CAAC;QAClD,MAAM,KAAK,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;QAC1C,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QAC9B,eAAM,CAAC,GAAG,CACR,gCAAgC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EACvD,WAAW,CACZ,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAC9B,GAA2B,EAC3B,kBAAwC;IAExC,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;QACrC,OAAO;IACT,CAAC;IAED,GAAG,CAAC,GAAG,CAAC,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAC1D,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YACtE,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAqB;IACjD,MAAM,WAAW,GAAG,MAAM;SACvB,GAAG,CAAS,aAAa,CAAC;QAC3B,EAAE,KAAK,CAAC,GAAG,CAAC;SACX,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;SAC9B,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAS,UAAU,CAAC,KAAK,YAAY,CAAC;IAErE,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7C,IAAI,YAAY,EAAE,CAAC;YACjB,eAAM,CAAC,IAAI,CACT,gFAAgF;gBAC9E,uGAAuG,EACzG,WAAW,CACZ,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,YAAY,CAAC;IACvB,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAgB,gBAAgB,CAC9B,GAA2B,EAC3B,UAAmC,EAAE;IAErC,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,sBAAa,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAS,YAAY,CAAC,IAAI,kBAAkB,CAAC;IAEzE,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAEjC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAChD,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,GAAG,CAAC,GAAG,CAAC,IAAA,qBAAW,GAAE,CAAC,CAAC;IACzB,CAAC;IACD,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAC;IACxB,uBAAuB,CAAC,GAAG,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAChE,GAAG,CAAC,UAAU,CAAC;QACb,MAAM,EAAE,oBAAoB;QAC5B,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE,oBAAoB,CAAC,MAAM,CAAC;KACrC,CAAC,CAAC;IACH,GAAG,CAAC,cAAc,CAAC,IAAI,uBAAc,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAE5D,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.SharedModule = void 0;
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
|
-
const billing_module_1 = require("../../features/billing/billing.module");
|
|
12
11
|
const database_module_1 = require("../../infrastructure/database/database.module");
|
|
13
12
|
const notification_module_1 = require("../../infrastructure/notification/notification.module");
|
|
14
13
|
const billing_check_service_1 = require("./billing-check.service");
|
|
@@ -18,7 +17,7 @@ let SharedModule = class SharedModule {
|
|
|
18
17
|
exports.SharedModule = SharedModule;
|
|
19
18
|
exports.SharedModule = SharedModule = __decorate([
|
|
20
19
|
(0, common_1.Module)({
|
|
21
|
-
imports: [database_module_1.DatabaseModule, notification_module_1.NotificationModule
|
|
20
|
+
imports: [database_module_1.DatabaseModule, notification_module_1.NotificationModule],
|
|
22
21
|
providers: [billing_check_service_1.BillingCheckService, endpoint_notifier_service_1.EndpointNotifierService],
|
|
23
22
|
exports: [billing_check_service_1.BillingCheckService, endpoint_notifier_service_1.EndpointNotifierService],
|
|
24
23
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.module.js","sourceRoot":"","sources":["../../../../src/core/shared/shared.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"shared.module.js","sourceRoot":"","sources":["../../../../src/core/shared/shared.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,mFAA6E;AAC7E,+FAAyF;AACzF,mEAA8D;AAC9D,2EAAsE;AAY/D,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,oCAAY;uBAAZ,YAAY;IALxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,gCAAc,EAAE,wCAAkB,CAAC;QAC7C,SAAS,EAAE,CAAC,2CAAmB,EAAE,mDAAuB,CAAC;QACzD,OAAO,EAAE,CAAC,2CAAmB,EAAE,mDAAuB,CAAC;KACxD,CAAC;GACW,YAAY,CAAG"}
|
|
@@ -13,6 +13,7 @@ const cqrs_1 = require("@nestjs/cqrs");
|
|
|
13
13
|
const jwt_1 = require("@nestjs/jwt");
|
|
14
14
|
const passport_1 = require("@nestjs/passport");
|
|
15
15
|
const api_key_module_1 = require("../api-key/api-key.module");
|
|
16
|
+
const project_module_1 = require("../project/project.module");
|
|
16
17
|
const auth_service_1 = require("./auth.service");
|
|
17
18
|
const casl_ability_factory_1 = require("./casl-ability.factory");
|
|
18
19
|
const commands_1 = require("./commands");
|
|
@@ -44,6 +45,7 @@ exports.AuthModule = AuthModule = __decorate([
|
|
|
44
45
|
}),
|
|
45
46
|
email_module_1.EmailModule,
|
|
46
47
|
api_key_module_1.ApiKeyModule,
|
|
48
|
+
project_module_1.ProjectModule,
|
|
47
49
|
],
|
|
48
50
|
providers: [
|
|
49
51
|
auth_api_service_1.AuthApiService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../../../src/features/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAC9C,uCAA0C;AAC1C,qCAAwC;AACxC,+CAAkD;AAClD,8DAAmE;AACnE,iDAA6D;AAC7D,iEAA4E;AAC5E,yCAA2D;AAC3D,kEAA6E;AAC7E,iEAA2E;AAC3E,iEAA4E;AAC5E,4EAAuF;AACvF,0FAKqE;AACrE,4FAKsE;AACtE,6DAAwE;AACxE,uDAAkE;AAClE,8DAA0E;AAC1E,4EAAuF;AACvF,0DAAsE;AACtE,mFAA6E;AAC7E,0EAAoE;
|
|
1
|
+
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../../../src/features/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAC9C,uCAA0C;AAC1C,qCAAwC;AACxC,+CAAkD;AAClD,8DAAmE;AACnE,8DAAoE;AACpE,iDAA6D;AAC7D,iEAA4E;AAC5E,yCAA2D;AAC3D,kEAA6E;AAC7E,iEAA2E;AAC3E,iEAA4E;AAC5E,4EAAuF;AACvF,0FAKqE;AACrE,4FAKsE;AACtE,6DAAwE;AACxE,uDAAkE;AAClE,8DAA0E;AAC1E,4EAAuF;AACvF,0DAAsE;AACtE,mFAA6E;AAC7E,0EAAoE;AAuD7D,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IArDtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,iBAAU;YACV,gCAAc;YACd,qBAAY;YACZ,yBAAc;YACd,eAAS,CAAC,QAAQ,CAAC;gBACjB,MAAM,EAAE,IAAI;aACb,CAAC;YACF,0BAAW;YACX,6BAAY;YACZ,8BAAa;SACd;QACD,SAAS,EAAE;YACT,iCAAc;YACd,0BAAW;YACX,0BAAW;YACX,qCAAgB;YAChB,yCAAkB;YAClB,wCAAiB;YACjB,yCAAkB;YAClB,+BAAa;YACb,6CAAoB;YACpB,8BAAa;YACb,2CAAmB;YACnB,kDAAsB;YACtB,0DAA8B;YAC9B,gDAAoB;YACpB,wDAA4B;YAC5B,gDAAqB;YACrB,wDAA6B;YAC7B,8CAAmB;YACnB,sDAA2B;YAC3B,GAAG,wBAAa;SACjB;QACD,OAAO,EAAE;YACP,0BAAW;YACX,yCAAkB;YAClB,wCAAiB;YACjB,iCAAc;YACd,qCAAgB;YAChB,+BAAa;YACb,6CAAoB;YACpB,8BAAa;YACb,2CAAmB;YACnB,yCAAkB;YAClB,kDAAsB;YACtB,0DAA8B;YAC9B,gDAAqB;YACrB,wDAA6B;YAC7B,6BAAY;SACb;KACF,CAAC;GACW,UAAU,CAAG"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { CommandBus } from '@nestjs/cqrs';
|
|
2
2
|
import { AuthService } from '../../../features/auth/auth.service';
|
|
3
3
|
import { CheckOrganizationPermissionCommandData, CheckProjectPermissionCommandData, CheckSystemPermissionCommandData, ConfirmEmailCodeCommandData, ConfirmEmailCodeCommandReturnType, CreateUserCommandData, LoginCommandData, LoginCommandReturnType, LoginGithubCommandData, LoginGithubCommandReturnType, LoginGoogleCommandData, LoginGoogleCommandReturnType, SignUpCommandData } from '../../../features/auth/commands/impl';
|
|
4
|
+
import { ProjectApiService } from '../../../features/project/project-api.service';
|
|
4
5
|
import { AuthCacheService } from '../../../infrastructure/cache/services/auth-cache.service';
|
|
5
6
|
export declare class AuthApiService {
|
|
6
7
|
private readonly commandBus;
|
|
7
8
|
private readonly authCache;
|
|
8
9
|
private readonly authService;
|
|
9
|
-
|
|
10
|
+
private readonly projectApi;
|
|
11
|
+
constructor(commandBus: CommandBus, authCache: AuthCacheService, authService: AuthService, projectApi: ProjectApiService);
|
|
10
12
|
issueAccessTokenForUserId(userId: string): Promise<import("../../../features/auth/auth.service").AccessTokenResult>;
|
|
11
13
|
checkSystemPermission(data: CheckSystemPermissionCommandData): Promise<boolean>;
|
|
12
14
|
checkOrganizationPermission(data: CheckOrganizationPermissionCommandData): Promise<boolean>;
|
|
@@ -14,12 +14,14 @@ const common_1 = require("@nestjs/common");
|
|
|
14
14
|
const cqrs_1 = require("@nestjs/cqrs");
|
|
15
15
|
const auth_service_1 = require("../auth.service");
|
|
16
16
|
const impl_1 = require("./impl");
|
|
17
|
+
const project_api_service_1 = require("../../project/project-api.service");
|
|
17
18
|
const auth_cache_service_1 = require("../../../infrastructure/cache/services/auth-cache.service");
|
|
18
19
|
let AuthApiService = class AuthApiService {
|
|
19
|
-
constructor(commandBus, authCache, authService) {
|
|
20
|
+
constructor(commandBus, authCache, authService, projectApi) {
|
|
20
21
|
this.commandBus = commandBus;
|
|
21
22
|
this.authCache = authCache;
|
|
22
23
|
this.authService = authService;
|
|
24
|
+
this.projectApi = projectApi;
|
|
23
25
|
}
|
|
24
26
|
issueAccessTokenForUserId(userId) {
|
|
25
27
|
return this.authService.issueAccessTokenForUserId(userId);
|
|
@@ -34,8 +36,9 @@ let AuthApiService = class AuthApiService {
|
|
|
34
36
|
return this.commandBus.execute(new impl_1.CheckOrganizationPermissionCommand(data));
|
|
35
37
|
});
|
|
36
38
|
}
|
|
37
|
-
checkProjectPermission(data) {
|
|
38
|
-
|
|
39
|
+
async checkProjectPermission(data) {
|
|
40
|
+
const resolvedProject = await this.projectApi.resolveProject(data);
|
|
41
|
+
return this.authCache.projectPermissionCheck(data, resolvedProject ?? undefined, () => {
|
|
39
42
|
return this.commandBus.execute(new impl_1.CheckProjectPermissionCommand(data));
|
|
40
43
|
});
|
|
41
44
|
}
|
|
@@ -63,6 +66,7 @@ exports.AuthApiService = AuthApiService = __decorate([
|
|
|
63
66
|
(0, common_1.Injectable)(),
|
|
64
67
|
__metadata("design:paramtypes", [cqrs_1.CommandBus,
|
|
65
68
|
auth_cache_service_1.AuthCacheService,
|
|
66
|
-
auth_service_1.AuthService
|
|
69
|
+
auth_service_1.AuthService,
|
|
70
|
+
project_api_service_1.ProjectApiService])
|
|
67
71
|
], AuthApiService);
|
|
68
72
|
//# sourceMappingURL=auth-api.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-api.service.js","sourceRoot":"","sources":["../../../../../src/features/auth/commands/auth-api.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAA0C;AAC1C,kDAA6D;AAC7D,iCA4ByC;AACzC,kGAAwF;AAGjF,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACmB,UAAsB,EACtB,SAA2B,EAC3B,WAAwB;
|
|
1
|
+
{"version":3,"file":"auth-api.service.js","sourceRoot":"","sources":["../../../../../src/features/auth/commands/auth-api.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAA0C;AAC1C,kDAA6D;AAC7D,iCA4ByC;AACzC,2EAA6E;AAC7E,kGAAwF;AAGjF,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACmB,UAAsB,EACtB,SAA2B,EAC3B,WAAwB,EACxB,UAA6B;QAH7B,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAkB;QAC3B,gBAAW,GAAX,WAAW,CAAa;QACxB,eAAU,GAAV,UAAU,CAAmB;IAC7C,CAAC;IAEG,yBAAyB,CAAC,MAAc;QAC7C,OAAO,IAAI,CAAC,WAAW,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAEM,qBAAqB,CAAC,IAAsC;QACjE,OAAO,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE;YACrD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,mCAA4B,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,2BAA2B,CAChC,IAA4C;QAE5C,OAAO,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,IAAI,EAAE,GAAG,EAAE;YAC3D,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,yCAAkC,CAAC,IAAI,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,IAAuC;QACzE,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAEnE,OAAO,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAC1C,IAAI,EACJ,eAAe,IAAI,SAAS,EAC5B,GAAG,EAAE;YACH,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,oCAA6B,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,CAAC,CACF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,IAAsB;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAC5B,IAAI,mBAAY,CAAC,IAAI,CAAC,CACvB,CAAC;IACJ,CAAC;IAEM,WAAW,CAChB,IAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,yBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IAEM,WAAW,CAChB,IAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,yBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IAEM,UAAU,CAAC,IAA2B;QAC3C,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,wBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,IAAuB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAC5B,IAAI,oBAAa,CAAC,IAAI,CAAC,CACxB,CAAC;IACJ,CAAC;IAEM,gBAAgB,CAAC,IAAiC;QACvD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAG5B,IAAI,8BAAuB,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;CACF,CAAA;AA1FY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAGoB,iBAAU;QACX,qCAAgB;QACd,0BAAW;QACZ,uCAAiB;GALrC,cAAc,CA0F1B"}
|
|
@@ -121,7 +121,7 @@ let CheckProjectPermissionHandler = class CheckProjectPermissionHandler {
|
|
|
121
121
|
},
|
|
122
122
|
},
|
|
123
123
|
});
|
|
124
|
-
if (!endpoint) {
|
|
124
|
+
if (!endpoint || endpoint.revision.branch.project.isDeleted) {
|
|
125
125
|
throw new common_1.NotFoundException('Endpoint not found');
|
|
126
126
|
}
|
|
127
127
|
return endpoint.revision.branch.project;
|
|
@@ -137,7 +137,7 @@ let CheckProjectPermissionHandler = class CheckProjectPermissionHandler {
|
|
|
137
137
|
},
|
|
138
138
|
},
|
|
139
139
|
});
|
|
140
|
-
if (!revision) {
|
|
140
|
+
if (!revision || revision.branch.project.isDeleted) {
|
|
141
141
|
throw new common_1.NotFoundException('Revision not found');
|
|
142
142
|
}
|
|
143
143
|
return revision.branch.project;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-project-permission.handler.js","sourceRoot":"","sources":["../../../../../../src/features/auth/commands/handlers/check-project-permission.handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"check-project-permission.handler.js","sourceRoot":"","sources":["../../../../../../src/features/auth/commands/handlers/check-project-permission.handler.ts"],"names":[],"mappings":"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"}
|
package/dist/src/features/organization/commands/handlers/add-user-to-organization.handler.d.ts
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { ICommandHandler } from '@nestjs/cqrs';
|
|
2
2
|
import { ILimitsService } from '../../../../features/billing/limits.interface';
|
|
3
3
|
import { IdService } from '@revisium/engine';
|
|
4
|
+
import { AuthCacheService } from '../../../../infrastructure/cache/services/auth-cache.service';
|
|
4
5
|
import { PrismaService } from '../../../../infrastructure/database/prisma.service';
|
|
5
6
|
import { AddUserToOrganizationCommand, AddUserToOrganizationCommandReturnType } from '../../../../features/organization/commands/impl';
|
|
6
7
|
export declare class AddUserToOrganizationHandler implements ICommandHandler<AddUserToOrganizationCommand, AddUserToOrganizationCommandReturnType> {
|
|
7
8
|
private readonly prisma;
|
|
8
9
|
private readonly idService;
|
|
9
10
|
private readonly limitsService;
|
|
10
|
-
|
|
11
|
+
private readonly authCache;
|
|
12
|
+
constructor(prisma: PrismaService, idService: IdService, limitsService: ILimitsService, authCache: AuthCacheService);
|
|
11
13
|
execute({ data }: AddUserToOrganizationCommand): Promise<boolean>;
|
|
12
14
|
private upsertUserOrganization;
|
|
13
15
|
private getExistingUserOrganization;
|
package/dist/src/features/organization/commands/handlers/add-user-to-organization.handler.js
CHANGED
|
@@ -19,13 +19,15 @@ const limits_interface_1 = require("../../../billing/limits.interface");
|
|
|
19
19
|
const limit_exceeded_exception_1 = require("../../../billing/limit-exceeded.exception");
|
|
20
20
|
const consts_1 = require("../../../auth/consts");
|
|
21
21
|
const engine_1 = require("@revisium/engine");
|
|
22
|
+
const auth_cache_service_1 = require("../../../../infrastructure/cache/services/auth-cache.service");
|
|
22
23
|
const prisma_service_1 = require("../../../../infrastructure/database/prisma.service");
|
|
23
24
|
const impl_1 = require("../impl");
|
|
24
25
|
let AddUserToOrganizationHandler = class AddUserToOrganizationHandler {
|
|
25
|
-
constructor(prisma, idService, limitsService) {
|
|
26
|
+
constructor(prisma, idService, limitsService, authCache) {
|
|
26
27
|
this.prisma = prisma;
|
|
27
28
|
this.idService = idService;
|
|
28
29
|
this.limitsService = limitsService;
|
|
30
|
+
this.authCache = authCache;
|
|
29
31
|
}
|
|
30
32
|
async execute({ data }) {
|
|
31
33
|
if (!(0, consts_1.isValidOrganizationRole)(data.roleId)) {
|
|
@@ -40,6 +42,7 @@ let AddUserToOrganizationHandler = class AddUserToOrganizationHandler {
|
|
|
40
42
|
}
|
|
41
43
|
const userOrganizationId = existing?.id ?? this.idService.generate();
|
|
42
44
|
await this.upsertUserOrganization(data, userOrganizationId);
|
|
45
|
+
await this.authCache.invalidateUserPermissions(data.userId);
|
|
43
46
|
return true;
|
|
44
47
|
}
|
|
45
48
|
upsertUserOrganization(data, userOrganizationId) {
|
|
@@ -75,6 +78,6 @@ exports.AddUserToOrganizationHandler = AddUserToOrganizationHandler = __decorate
|
|
|
75
78
|
(0, cqrs_1.CommandHandler)(impl_1.AddUserToOrganizationCommand),
|
|
76
79
|
__param(2, (0, common_1.Inject)(limits_interface_1.LIMITS_SERVICE_TOKEN)),
|
|
77
80
|
__metadata("design:paramtypes", [prisma_service_1.PrismaService,
|
|
78
|
-
engine_1.IdService, Object])
|
|
81
|
+
engine_1.IdService, Object, auth_cache_service_1.AuthCacheService])
|
|
79
82
|
], AddUserToOrganizationHandler);
|
|
80
83
|
//# sourceMappingURL=add-user-to-organization.handler.js.map
|
package/dist/src/features/organization/commands/handlers/add-user-to-organization.handler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-user-to-organization.handler.js","sourceRoot":"","sources":["../../../../../../src/features/organization/commands/handlers/add-user-to-organization.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA6D;AAC7D,uCAA+D;AAC/D,wEAI+C;AAC/C,wFAAuF;AACvF,iDAAmE;AACnE,6CAA6C;AAC7C,uFAA2E;AAC3E,kCAGiD;AAG1C,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAIvC,YACmB,MAAqB,EACrB,SAAoB,EAEpB,aAA6B;
|
|
1
|
+
{"version":3,"file":"add-user-to-organization.handler.js","sourceRoot":"","sources":["../../../../../../src/features/organization/commands/handlers/add-user-to-organization.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA6D;AAC7D,uCAA+D;AAC/D,wEAI+C;AAC/C,wFAAuF;AACvF,iDAAmE;AACnE,6CAA6C;AAC7C,qGAAwF;AACxF,uFAA2E;AAC3E,kCAGiD;AAG1C,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAIvC,YACmB,MAAqB,EACrB,SAAoB,EAEpB,aAA6B,EAC7B,SAA2B;QAJ3B,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAW;QAEpB,kBAAa,GAAb,aAAa,CAAgB;QAC7B,cAAS,GAAT,SAAS,CAAkB;IAC3C,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAgC;QACzD,IAAI,CAAC,IAAA,gCAAuB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,4BAAmB,CAAC,0BAA0B,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAG9D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CACrD,IAAI,CAAC,cAAc,EACnB,8BAAW,CAAC,KAAK,EACjB,CAAC,CACF,CAAC;YACF,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;gBACzB,MAAM,IAAI,iDAAsB,CAAC,WAAW,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QAED,MAAM,kBAAkB,GAAG,QAAQ,EAAE,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAErE,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAE5D,MAAM,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE5D,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,sBAAsB,CAC5B,IAA0C,EAC1C,kBAA0B;QAE1B,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC;YACzC,KAAK,EAAE;gBACL,EAAE,EAAE,kBAAkB;aACvB;YACD,MAAM,EAAE;gBACN,EAAE,EAAE,kBAAkB;gBACtB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB;YACD,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACvC,IAA0C;QAE1C,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC;YAC5C,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC;YACD,MAAM,EAAE;gBACN,EAAE,EAAE,IAAI;aACT;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAzEY,oEAA4B;uCAA5B,4BAA4B;IADxC,IAAA,qBAAc,EAAC,mCAA4B,CAAC;IAQxC,WAAA,IAAA,eAAM,EAAC,uCAAoB,CAAC,CAAA;qCAFJ,8BAAa;QACV,kBAAS,UAGT,qCAAgB;GATnC,4BAA4B,CAyExC"}
|
package/dist/src/features/organization/commands/handlers/remove-user-from-organization.handler.d.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { ICommandHandler } from '@nestjs/cqrs';
|
|
2
|
+
import { AuthCacheService } from '../../../../infrastructure/cache/services/auth-cache.service';
|
|
2
3
|
import { PrismaService } from '../../../../infrastructure/database/prisma.service';
|
|
3
4
|
import { RemoveUserFromOrganizationCommand, RemoveUserFromOrganizationCommandReturnType } from '../../../../features/organization/commands/impl';
|
|
4
5
|
export declare class RemoveUserFromOrganizationHandler implements ICommandHandler<RemoveUserFromOrganizationCommand, RemoveUserFromOrganizationCommandReturnType> {
|
|
5
6
|
private readonly prisma;
|
|
6
|
-
|
|
7
|
+
private readonly authCache;
|
|
8
|
+
constructor(prisma: PrismaService, authCache: AuthCacheService);
|
|
7
9
|
execute({ data }: RemoveUserFromOrganizationCommand): Promise<boolean>;
|
|
8
10
|
private removeUserOrganization;
|
|
9
11
|
private getUserOrganization;
|
package/dist/src/features/organization/commands/handlers/remove-user-from-organization.handler.js
CHANGED
|
@@ -13,11 +13,13 @@ exports.RemoveUserFromOrganizationHandler = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const cqrs_1 = require("@nestjs/cqrs");
|
|
15
15
|
const consts_1 = require("../../../auth/consts");
|
|
16
|
+
const auth_cache_service_1 = require("../../../../infrastructure/cache/services/auth-cache.service");
|
|
16
17
|
const prisma_service_1 = require("../../../../infrastructure/database/prisma.service");
|
|
17
18
|
const impl_1 = require("../impl");
|
|
18
19
|
let RemoveUserFromOrganizationHandler = class RemoveUserFromOrganizationHandler {
|
|
19
|
-
constructor(prisma) {
|
|
20
|
+
constructor(prisma, authCache) {
|
|
20
21
|
this.prisma = prisma;
|
|
22
|
+
this.authCache = authCache;
|
|
21
23
|
}
|
|
22
24
|
async execute({ data }) {
|
|
23
25
|
const userOrganization = await this.getUserOrganization(data);
|
|
@@ -30,6 +32,7 @@ let RemoveUserFromOrganizationHandler = class RemoveUserFromOrganizationHandler
|
|
|
30
32
|
throw new common_1.BadRequestException('You cannot remove the last owner of organization');
|
|
31
33
|
}
|
|
32
34
|
await this.removeUserOrganization(userOrganization.id);
|
|
35
|
+
await this.authCache.invalidateUserPermissions(data.userId);
|
|
33
36
|
return true;
|
|
34
37
|
}
|
|
35
38
|
removeUserOrganization(userOrganizationId) {
|
|
@@ -63,6 +66,7 @@ let RemoveUserFromOrganizationHandler = class RemoveUserFromOrganizationHandler
|
|
|
63
66
|
exports.RemoveUserFromOrganizationHandler = RemoveUserFromOrganizationHandler;
|
|
64
67
|
exports.RemoveUserFromOrganizationHandler = RemoveUserFromOrganizationHandler = __decorate([
|
|
65
68
|
(0, cqrs_1.CommandHandler)(impl_1.RemoveUserFromOrganizationCommand),
|
|
66
|
-
__metadata("design:paramtypes", [prisma_service_1.PrismaService
|
|
69
|
+
__metadata("design:paramtypes", [prisma_service_1.PrismaService,
|
|
70
|
+
auth_cache_service_1.AuthCacheService])
|
|
67
71
|
], RemoveUserFromOrganizationHandler);
|
|
68
72
|
//# sourceMappingURL=remove-user-from-organization.handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-user-from-organization.handler.js","sourceRoot":"","sources":["../../../../../../src/features/organization/commands/handlers/remove-user-from-organization.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAqD;AACrD,uCAA+D;AAC/D,iDAAiE;AACjE,uFAA2E;AAC3E,kCAGiD;AAG1C,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAI5C,
|
|
1
|
+
{"version":3,"file":"remove-user-from-organization.handler.js","sourceRoot":"","sources":["../../../../../../src/features/organization/commands/handlers/remove-user-from-organization.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAqD;AACrD,uCAA+D;AAC/D,iDAAiE;AACjE,qGAAwF;AACxF,uFAA2E;AAC3E,kCAGiD;AAG1C,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAI5C,YACmB,MAAqB,EACrB,SAA2B;QAD3B,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAkB;IAC3C,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAqC;QAC9D,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE9D,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,4BAAmB,CAAC,gCAAgC,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,OAAO,GACX,gBAAgB,CAAC,MAAM,KAAK,8BAAqB,CAAC,iBAAiB,CAAC;QAEtE,IACE,OAAO;YACP,CAAC,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,EAChE,CAAC;YACD,MAAM,IAAI,4BAAmB,CAC3B,kDAAkD,CACnD,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAEvD,MAAM,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE5D,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,sBAAsB,CAAC,kBAA0B;QACvD,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC;YACzC,KAAK,EAAE;gBACL,EAAE,EAAE,kBAAkB;aACvB;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC/B,IAA+C;QAE/C,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC;YAC5C,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC;YACD,MAAM,EAAE;gBACN,EAAE,EAAE,IAAI;gBACR,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,cAAsB;QAC3D,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC;YACxC,KAAK,EAAE;gBACL,cAAc;gBACd,MAAM,EAAE,8BAAqB,CAAC,iBAAiB;aAChD;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAlEY,8EAAiC;4CAAjC,iCAAiC;IAD7C,IAAA,qBAAc,EAAC,wCAAiC,CAAC;qCAMrB,8BAAa;QACV,qCAAgB;GANnC,iCAAiC,CAkE7C"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { ICommandHandler } from '@nestjs/cqrs';
|
|
2
2
|
import { IdService } from '@revisium/engine';
|
|
3
|
+
import { AuthCacheService } from '../../../../infrastructure/cache/services/auth-cache.service';
|
|
3
4
|
import { PrismaService } from '../../../../infrastructure/database/prisma.service';
|
|
4
5
|
import { AddUserToProjectCommand, AddUserToProjectCommandReturnType } from '../../../../features/project/commands/impl';
|
|
5
6
|
export declare class AddUserToProjectHandler implements ICommandHandler<AddUserToProjectCommand, AddUserToProjectCommandReturnType> {
|
|
6
7
|
private readonly prisma;
|
|
7
8
|
private readonly idService;
|
|
8
|
-
|
|
9
|
+
private readonly authCache;
|
|
10
|
+
constructor(prisma: PrismaService, idService: IdService, authCache: AuthCacheService);
|
|
9
11
|
execute({ data }: AddUserToProjectCommand): Promise<boolean>;
|
|
10
12
|
private upsertUserProject;
|
|
11
13
|
private getProject;
|
|
@@ -14,12 +14,14 @@ const common_1 = require("@nestjs/common");
|
|
|
14
14
|
const cqrs_1 = require("@nestjs/cqrs");
|
|
15
15
|
const consts_1 = require("../../../auth/consts");
|
|
16
16
|
const engine_1 = require("@revisium/engine");
|
|
17
|
+
const auth_cache_service_1 = require("../../../../infrastructure/cache/services/auth-cache.service");
|
|
17
18
|
const prisma_service_1 = require("../../../../infrastructure/database/prisma.service");
|
|
18
19
|
const impl_1 = require("../impl");
|
|
19
20
|
let AddUserToProjectHandler = class AddUserToProjectHandler {
|
|
20
|
-
constructor(prisma, idService) {
|
|
21
|
+
constructor(prisma, idService, authCache) {
|
|
21
22
|
this.prisma = prisma;
|
|
22
23
|
this.idService = idService;
|
|
24
|
+
this.authCache = authCache;
|
|
23
25
|
}
|
|
24
26
|
async execute({ data }) {
|
|
25
27
|
if (!(0, consts_1.isValidProjectRole)(data.roleId)) {
|
|
@@ -39,6 +41,7 @@ let AddUserToProjectHandler = class AddUserToProjectHandler {
|
|
|
39
41
|
projectId: project.id,
|
|
40
42
|
roleId: data.roleId,
|
|
41
43
|
});
|
|
44
|
+
await this.authCache.invalidateUserPermissions(data.userId);
|
|
42
45
|
return true;
|
|
43
46
|
}
|
|
44
47
|
upsertUserProject(data) {
|
|
@@ -93,6 +96,7 @@ exports.AddUserToProjectHandler = AddUserToProjectHandler;
|
|
|
93
96
|
exports.AddUserToProjectHandler = AddUserToProjectHandler = __decorate([
|
|
94
97
|
(0, cqrs_1.CommandHandler)(impl_1.AddUserToProjectCommand),
|
|
95
98
|
__metadata("design:paramtypes", [prisma_service_1.PrismaService,
|
|
96
|
-
engine_1.IdService
|
|
99
|
+
engine_1.IdService,
|
|
100
|
+
auth_cache_service_1.AuthCacheService])
|
|
97
101
|
], AddUserToProjectHandler);
|
|
98
102
|
//# sourceMappingURL=add-user-to-project.handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-user-to-project.handler.js","sourceRoot":"","sources":["../../../../../../src/features/project/commands/handlers/add-user-to-project.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAqD;AACrD,uCAA+D;AAC/D,iDAAgF;AAChF,6CAA6C;AAC7C,uFAA2E;AAC3E,kCAG4C;AAGrC,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAIlC,YACmB,MAAqB,EACrB,SAAoB;
|
|
1
|
+
{"version":3,"file":"add-user-to-project.handler.js","sourceRoot":"","sources":["../../../../../../src/features/project/commands/handlers/add-user-to-project.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAqD;AACrD,uCAA+D;AAC/D,iDAAgF;AAChF,6CAA6C;AAC7C,qGAAwF;AACxF,uFAA2E;AAC3E,kCAG4C;AAGrC,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAIlC,YACmB,MAAqB,EACrB,SAAoB,EACpB,SAA2B;QAF3B,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAW;QACpB,cAAS,GAAT,SAAS,CAAkB;IAC3C,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAA2B;QACpD,IAAI,CAAC,IAAA,2BAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,4BAAmB,CAAC,qBAAqB,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE5C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,4BAAmB,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,4BAAmB,CAAC,qBAAqB,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,wBAAwB,CACvD,IAAI,CAAC,MAAM,EACX,OAAO,CAAC,EAAE,CACX,CAAC;QAEF,MAAM,IAAI,CAAC,iBAAiB,CAAC;YAC3B,EAAE,EAAE,aAAa;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE5D,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,iBAAiB,CAAC,IAKzB;QACC,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC;YACpC,KAAK,EAAE;gBACL,EAAE,EAAE,IAAI,CAAC,EAAE;aACZ;YACD,MAAM,EAAE;gBACN,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB;YACD,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB;SACF,CAAC,CAAC;IACL,CAAC;IAEO,UAAU,CAAC,IAAqC;QACtD,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;YACnC,KAAK,EAAE;gBACL,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,IAAI,EAAE,IAAI,CAAC,WAAW;gBACtB,SAAS,EAAE,KAAK;aACjB;YACD,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACrB,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,MAAc;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;YAC7C,KAAK,EAAE;gBACL,EAAE,EAAE,MAAM;aACX;YACD,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACrB,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,MAAc,EAAE,SAAiB;QACtE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC;YACrD,KAAK,EAAE;gBACL,MAAM;gBACN,SAAS;aACV;YACD,MAAM,EAAE;gBACN,EAAE,EAAE,IAAI;aACT;SACF,CAAC,CAAC;QAEH,OAAO,MAAM,EAAE,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;IACjD,CAAC;CACF,CAAA;AAnGY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,qBAAc,EAAC,8BAAuB,CAAC;qCAMX,8BAAa;QACV,kBAAS;QACT,qCAAgB;GAPnC,uBAAuB,CAmGnC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ICommandHandler } from '@nestjs/cqrs';
|
|
2
|
+
import { AuthCacheService } from '../../../../infrastructure/cache/services/auth-cache.service';
|
|
2
3
|
import { TransactionPrismaService } from '../../../../infrastructure/database/transaction-prisma.service';
|
|
3
4
|
import { EndpointNotificationService } from '../../../../infrastructure/notification/endpoint-notification.service';
|
|
4
5
|
import { DeleteProjectCommand, DeleteProjectCommandReturnType } from '../../../../features/project/commands/impl';
|
|
@@ -7,7 +8,8 @@ export declare class DeleteProjectHandler implements ICommandHandler<DeleteProje
|
|
|
7
8
|
private readonly transactionPrisma;
|
|
8
9
|
private readonly shareTransactionalQueries;
|
|
9
10
|
private readonly endpointNotification;
|
|
10
|
-
|
|
11
|
+
private readonly authCache;
|
|
12
|
+
constructor(transactionPrisma: TransactionPrismaService, shareTransactionalQueries: ShareTransactionalQueries, endpointNotification: EndpointNotificationService, authCache: AuthCacheService);
|
|
11
13
|
private get transaction();
|
|
12
14
|
execute({ data }: DeleteProjectCommand): Promise<boolean>;
|
|
13
15
|
private transactionHandler;
|