@darraghor/nest-backend-libs 2.32.9 → 2.32.11
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/authorization/models/RequestWithUser.d.ts +1 -1
- package/dist/authorization/services/UserValidation.service.js +1 -1
- package/dist/authorization/services/UserValidation.service.js.map +1 -1
- package/dist/database-postgres/PostgresDatabase.module.js +0 -7
- package/dist/database-postgres/PostgresDatabase.module.js.map +1 -1
- package/dist/database-postgres/PostgresTypeOrmConfigurationProvider.js +7 -7
- package/dist/database-postgres/PostgresTypeOrmConfigurationProvider.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js.map +1 -1
- package/dist/organisation-subscriptions/organisation-subscriptions.module.js +5 -1
- package/dist/organisation-subscriptions/organisation-subscriptions.module.js.map +1 -1
- package/dist/organisation-subscriptions/organisation-subscriptions.service.d.ts +3 -1
- package/dist/organisation-subscriptions/organisation-subscriptions.service.js +38 -7
- package/dist/organisation-subscriptions/organisation-subscriptions.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -64,7 +64,7 @@ let UserValidationService = UserValidationService_1 = class UserValidationServic
|
|
|
64
64
|
return {
|
|
65
65
|
...user,
|
|
66
66
|
permissions: [...permissionsSet],
|
|
67
|
-
|
|
67
|
+
activeSubscriptionProductKeys: [...activePaidForProducts],
|
|
68
68
|
};
|
|
69
69
|
}
|
|
70
70
|
async validateUser(payload, rawAccessToken, invitationId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserValidation.service.js","sourceRoot":"","sources":["../../../src/authorization/services/UserValidation.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"UserValidation.service.js","sourceRoot":"","sources":["../../../src/authorization/services/UserValidation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6DAA6D;AAC7D,OAAO,EACH,mBAAmB,EACnB,UAAU,EACV,MAAM,EACN,iBAAiB,GACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAC,MAAM,SAAS,CAAC;AACrD,OAAO,EAAC,kBAAkB,EAAC,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAC,UAAU,EAAC,MAAM,iDAAiD,CAAC;AAC3E,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,KAAK,EAAC,MAAM,qCAAqC,CAAC;AAC1D,OAAO,EAAC,cAAc,EAAC,MAAM,mDAAmD,CAAC;AACjF,OAAO,EAAC,YAAY,EAAC,MAAM,oDAAoD,CAAC;AAChF,OAAO,EAAC,IAAI,EAAC,MAAM,oCAAoC,CAAC;AACxD,OAAO,EAAC,wBAAwB,EAAC,MAAM,uCAAuC,CAAC;AAKxE,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAIlB;IACA;IAES;IACA;IAPJ,MAAM,GAAG,IAAI,MAAM,CAAC,uBAAqB,CAAC,IAAI,CAAC,CAAC;IACjE,YAEY,cAAgC,EAChC,WAA+B,EAEtB,oBAA4C,EAC5C,MAAgC;QAJzC,mBAAc,GAAd,cAAc,CAAkB;QAChC,gBAAW,GAAX,WAAW,CAAoB;QAEtB,yBAAoB,GAApB,oBAAoB,CAAwB;QAC5C,WAAM,GAAN,MAAM,CAA0B;IAClD,CAAC;IAEJ,KAAK,CAAC,YAAY,CAAC,cAAsB;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE9D,IAAI,MAAM,KAAK,SAAS,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;SAC5D;QAED,IAAI,MAAM,CAAC,cAAc,KAAK,KAAK,EAAE;YACjC,MAAM,IAAI,mBAAmB,CACzB,6EAA6E,CAChF,CAAC;SACL;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,oBAAoB,CAChB,IAAU,EACV,uBAA6C;QAE7C,OAAO,CAAC,KAAK,CAAC,EAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,EAAC,EAAE,gBAAgB,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE;YACX,MAAM,IAAI,KAAK,CACX,uEAAuE,CAC1E,CAAC;SACL;QACD,MAAM,cAAc,GAAG,IAAI,GAAG,CAAS,uBAAuB,IAAI,EAAE,CAAC,CAAC;QAEtE,IACI,IAAI,CAAC,WAAW;YAChB,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EACrD;YACE,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC/B,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;SACpC;QACD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CACjC,IAAI,CAAC,WAAW;YACZ,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,mBAAmB,IAAI,EAAE,CAAC;YAC1D,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;YAC/C,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,IAAI,EAAE,CACzC,CAAC;QAEF,2DAA2D;QAC3D,OAAO;YACH,GAAG,IAAI;YACP,WAAW,EAAE,CAAC,GAAG,cAAc,CAAC;YAChC,6BAA6B,EAAE,CAAC,GAAG,qBAAqB,CAAC;SAC7C,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,YAAY,CACd,OAAoB,EACpB,cAAsB,EACtB,YAAqB;QAErB,IAAI,YAAY,EAAE;YACd,wGAAwG;YACxG,OAAO,IAAI,CAAC,oBAAoB,CAC5B,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,YAAY,CAAC,EAC1D,OAAO,CAAC,WAAW,CACtB,CAAC;SACL;QAED,6CAA6C;QAC7C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE5D,aAAa;QACb,UAAU;QACV,uBAAuB;QACvB,4BAA4B;QAC5B,IACI,SAAS,KAAK,SAAS;YACvB,SAAS,KAAK,IAAI;YAClB,SAAS,EAAE,WAAW,KAAK,SAAS;YACpC,SAAS,EAAE,WAAW,KAAK,IAAI;YAC/B,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,CAAC,EACpC;YACE,OAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;SACpE;QAED,kDAAkD;QAClD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAClD,SAAS,EACT,cAAc,CACjB,CAAC;QACF,OAAO,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACjC,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YAC/B,KAAK,EAAE,EAAC,OAAO,EAAE,EAAC,MAAM,EAAE,MAAM,EAAC,EAAC;YAClC,SAAS,EAAE;gBACP,WAAW,EAAE;oBACT,KAAK,EAAE,IAAI;oBACX,IAAI,EAAE,KAAK;oBACX,YAAY,EAAE,EAAC,mBAAmB,EAAE,IAAI,EAAC;iBAC5C;aACJ;SACJ,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,EAAU;QACjC,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YAC/B,KAAK,EAAE,EAAC,EAAE,EAAC;YACX,SAAS,EAAE;gBACP,WAAW,EAAE;oBACT,KAAK,EAAE,IAAI;oBACX,IAAI,EAAE,KAAK;oBACX,YAAY,EAAE,EAAC,mBAAmB,EAAE,IAAI,EAAC;iBAC5C;aACJ;SACJ,CAAC,CAAC;IACP,CAAC;IACO,KAAK,CAAC,iBAAiB,CAAC,WAAmB;QAC/C,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YACrC,KAAK,EAAE,EAAC,WAAW,EAAE,WAAW,EAAC;YACjC,SAAS,EAAE;gBACP,WAAW,EAAE;oBACT,KAAK,EAAE,IAAI;oBACX,IAAI,EAAE,KAAK;oBACX,YAAY,EAAE,EAAC,mBAAmB,EAAE,IAAI,EAAC;iBAC5C;aACJ;SACJ,CAAC,CAAC;IACP,CAAC;IAED,4DAA4D;IAC5D,KAAK,CAAC,iBAAiB;IACnB,6DAA6D;IAC7D,cAAsB;IACtB,6DAA6D;IAC7D,cAAsB;QAEtB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;YACvD,KAAK,EAAE;gBACH,IAAI,EAAE,cAAc;gBACpB,UAAU,EAAE,MAAM,EAAE;gBACpB,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC;aAC3B;YACD,SAAS,EAAE;gBACP,sBAAsB,EAAE;oBACpB,IAAI,EAAE,IAAI;oBACV,YAAY,EAAE,IAAI;iBACrB;aACJ;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,EAAE;YACb,IAAI,CAAC,MAAM,CAAC,GAAG,CACX;gBACI,cAAc;gBACd,GAAG;aACN,EACD,sBAAsB,CACzB,CAAC;YACF,MAAM,IAAI,iBAAiB,CACvB,+CAA+C,CAClD,CAAC;SACL;QAED,4CAA4C;QAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAE1D,iCAAiC;QACjC,UAAU,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QACnC,sCAAsC;QACtC,MAAM,UAAU,GAAG,UAAU,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAC5D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,CAClC,CAAC;QACF,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;SACxD;QACD,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;QAE/B,IAAI,CAAC,oBAAoB,CACrB,UAAU,CAAC,sBAAsB,CAAC,IAAI,EACtC,SAAS,CACZ,CAAC;QAEF,IAAI;YACA,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACpD;QAAC,OAAO,KAAK,EAAE;YACZ,IACK,KAA4B,CAAC,OAAO,EAAE,QAAQ,CAAC,eAAe,CAAC,EAClE;gBACE,MAAM,IAAI,mBAAmB,CACzB,+CAA+C,CAClD,CAAC;aACL;YACD,MAAM,KAAK,CAAC;SACf;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAC1C,UAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAC5C,CAAC;QACF,IAAI,CAAC,cAAc,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACrC;QACD,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC1B,SAAsB,EACtB,cAAsB;QAEtB,4CAA4C;QAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAE1D,cAAc;QACd,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;QACrC,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC;QAE3B,kCAAkC;QAClC,MAAM,mBAAmB,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/C,mBAAmB,CAAC,IAAI,GAAG,SAAS,CAAC,UAAU;YAC3C,CAAC,CAAC,GAAG,SAAS,CAAC,UAAU,iBAAiB;YAC1C,CAAC,CAAC,iBAAiB,CAAC;QAExB,0BAA0B;QAC1B,MAAM,UAAU,GAAG,IAAI,sBAAsB,EAAE,CAAC;QAChD,UAAU,CAAC,YAAY,GAAG,mBAAmB,CAAC;QAC9C,UAAU,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC;QAE7B,yCAAyC;QACzC,MAAM,IAAI,GAAG,SAAS,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QAEvD,wBAAwB;QACxB,IAAI,CAAC,WAAW,GAAG,CAAC,UAAU,CAAC,CAAC;QAEhC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAE3C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,cAAc,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACrC;QACD,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED,oBAAoB,CAAC,IAAU,EAAE,SAAsB;QACnD,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,cAAc,CAAC;QAC9C,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,WAAW,CAAC;QACxC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC;QACtC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC;IACjD,CAAC;CACJ,CAAA;AArQY,qBAAqB;IADjC,UAAU,EAAE;IAIJ,WAAA,gBAAgB,CAAC,IAAI,CAAC,CAAA;IAGtB,WAAA,gBAAgB,CAAC,UAAU,CAAC,CAAA;qCAFL,UAAU;QACb,kBAAkB;QAEA,UAAU;QACxB,wBAAwB;GAR5C,qBAAqB,CAqQjC;SArQY,qBAAqB"}
|
|
@@ -6,7 +6,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
};
|
|
7
7
|
import { Module } from "@nestjs/common";
|
|
8
8
|
import { TypeOrmModule } from "@nestjs/typeorm";
|
|
9
|
-
import { DataSource } from "typeorm";
|
|
10
9
|
import { DatabaseConfigurationService } from "./PostgresDatabaseConfigurationService.js";
|
|
11
10
|
import { PostgresTypeOrmConfigurationProvider } from "./PostgresTypeOrmConfigurationProvider.js";
|
|
12
11
|
let PostgresDatabaseModule = class PostgresDatabaseModule {
|
|
@@ -16,12 +15,6 @@ PostgresDatabaseModule = __decorate([
|
|
|
16
15
|
imports: [
|
|
17
16
|
TypeOrmModule.forRootAsync({
|
|
18
17
|
useFactory: () => PostgresTypeOrmConfigurationProvider.getNestTypeOrmConfig(),
|
|
19
|
-
dataSourceFactory: async (options) => {
|
|
20
|
-
if (options === undefined) {
|
|
21
|
-
throw new Error("No options provided to dataSourceFactory");
|
|
22
|
-
}
|
|
23
|
-
return await new DataSource(options).initialize();
|
|
24
|
-
},
|
|
25
18
|
}),
|
|
26
19
|
],
|
|
27
20
|
exports: [DatabaseConfigurationService, TypeOrmModule],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresDatabase.module.js","sourceRoot":"","sources":["../../src/database-postgres/PostgresDatabase.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"PostgresDatabase.module.js","sourceRoot":"","sources":["../../src/database-postgres/PostgresDatabase.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,4BAA4B,EAAC,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAC,oCAAoC,EAAC,MAAM,2CAA2C,CAAC;AAYxF,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;CAAG,CAAA;AAAzB,sBAAsB;IAVlC,MAAM,CAAC;QACJ,OAAO,EAAE;YACL,aAAa,CAAC,YAAY,CAAC;gBACvB,UAAU,EAAE,GAAG,EAAE,CACb,oCAAoC,CAAC,oBAAoB,EAAE;aAClE,CAAC;SACL;QACD,OAAO,EAAE,CAAC,4BAA4B,EAAE,aAAa,CAAC;QACtD,SAAS,EAAE,CAAC,4BAA4B,CAAC;KAC5C,CAAC;GACW,sBAAsB,CAAG;SAAzB,sBAAsB"}
|
|
@@ -7,20 +7,20 @@ export class PostgresTypeOrmConfigurationProvider {
|
|
|
7
7
|
* @returns
|
|
8
8
|
*/
|
|
9
9
|
static getTypeOrmConfig() {
|
|
10
|
-
const
|
|
10
|
+
const libraryEntityScanPath = path.resolve(path.join(
|
|
11
11
|
// __dirname,
|
|
12
12
|
process.env.CORE_MODULE_ENTITY_PATH || "..", "**", "*.entity.{ts,js}"));
|
|
13
|
-
const
|
|
13
|
+
const appEntityScanPath = path.resolve(path.join(
|
|
14
14
|
// __dirname,
|
|
15
15
|
process.env.APP_MODULE_ENTITY_PATH || "dist", "**", "*.entity.{ts,js}"));
|
|
16
16
|
const migrationsPath = path.resolve(path.join(
|
|
17
17
|
// __dirname,
|
|
18
18
|
process.env.MIGRATIONS_PATH || "dist", "**", "migrations", "*.{ts,js}"));
|
|
19
19
|
console.log("Using database configuration paths", {
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
appEntityScanPath: appEntityScanPath,
|
|
21
|
+
libraryEntityScanPath: libraryEntityScanPath,
|
|
22
|
+
moduleCurrentDirectory: path.dirname(url.fileURLToPath(import.meta.url)),
|
|
22
23
|
migrationsPath,
|
|
23
|
-
nodeModuleCorePath,
|
|
24
24
|
pwd: process.cwd(),
|
|
25
25
|
});
|
|
26
26
|
// database url is used in dokku
|
|
@@ -32,7 +32,7 @@ export class PostgresTypeOrmConfigurationProvider {
|
|
|
32
32
|
migrationsTableName: "migrations",
|
|
33
33
|
migrationsRun: true,
|
|
34
34
|
synchronize: false,
|
|
35
|
-
entities: [
|
|
35
|
+
entities: [libraryEntityScanPath, appEntityScanPath],
|
|
36
36
|
migrations: [migrationsPath],
|
|
37
37
|
};
|
|
38
38
|
}
|
|
@@ -49,7 +49,7 @@ export class PostgresTypeOrmConfigurationProvider {
|
|
|
49
49
|
migrationsRun: true,
|
|
50
50
|
logging: process.env.APP_POSTGRES_LOGGING === "true",
|
|
51
51
|
synchronize: false,
|
|
52
|
-
entities: [
|
|
52
|
+
entities: [libraryEntityScanPath, appEntityScanPath],
|
|
53
53
|
migrations: [migrationsPath],
|
|
54
54
|
cli: {
|
|
55
55
|
migrationsDir: "src/migrations",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresTypeOrmConfigurationProvider.js","sourceRoot":"","sources":["../../src/database-postgres/PostgresTypeOrmConfigurationProvider.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,MAAM,OAAO,oCAAoC;IAC7C;;;;OAIG;IACI,MAAM,CAAC,gBAAgB;QAC1B,MAAM,
|
|
1
|
+
{"version":3,"file":"PostgresTypeOrmConfigurationProvider.js","sourceRoot":"","sources":["../../src/database-postgres/PostgresTypeOrmConfigurationProvider.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,MAAM,OAAO,oCAAoC;IAC7C;;;;OAIG;IACI,MAAM,CAAC,gBAAgB;QAC1B,MAAM,qBAAqB,GAAG,IAAI,CAAC,OAAO,CACtC,IAAI,CAAC,IAAI;QACL,aAAa;QACb,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,IAAI,EAC3C,IAAI,EACJ,kBAAkB,CACrB,CACJ,CAAC;QAEF,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAClC,IAAI,CAAC,IAAI;QACL,aAAa;QACb,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,MAAM,EAC5C,IAAI,EACJ,kBAAkB,CACrB,CACJ,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAC/B,IAAI,CAAC,IAAI;QACL,aAAa;QACb,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,MAAM,EACrC,IAAI,EACJ,YAAY,EACZ,WAAW,CACd,CACJ,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE;YAC9C,iBAAiB,EAAE,iBAAiB;YACpC,qBAAqB,EAAE,qBAAqB;YAC5C,sBAAsB,EAAE,IAAI,CAAC,OAAO,CAChC,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CACrC;YACD,cAAc;YACd,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;SACrB,CAAC,CAAC;QACH,gCAAgC;QAChC,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;YAC1B,OAAO;gBACH,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gBAC7B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM;gBACpD,mBAAmB,EAAE,YAAY;gBACjC,aAAa,EAAE,IAAI;gBACnB,WAAW,EAAE,KAAK;gBAClB,QAAQ,EAAE,CAAC,qBAAqB,EAAE,iBAAiB,CAAC;gBACpD,UAAU,EAAE,CAAC,cAAc,CAAC;aAC/B,CAAC;SACL;QACD,iDAAiD;QACjD,OAAO;YACH,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACnC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,MAAM,EAAE,EAAE,CAAC;YAClE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YACvC,mBAAmB,EAAE,YAAY;YACjC,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM;YACpD,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,CAAC,qBAAqB,EAAE,iBAAiB,CAAC;YACpD,UAAU,EAAE,CAAC,cAAc,CAAC;YAC5B,GAAG,EAAE;gBACD,aAAa,EAAE,gBAAgB;aAClC;SACiB,CAAC,CAAC,kDAAkD;IAC9E,CAAC;IAEM,MAAM,CAAC,oBAAoB;QAC9B,OAAO;YACH,GAAG,oCAAoC,CAAC,gBAAgB,EAAE;YAC1D,gBAAgB,EAAE,IAAI;SACzB,CAAC;IACN,CAAC;CACJ"}
|
package/dist/index.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ import { TwitterClientService } from "./twitter-client/services/twitter-client.s
|
|
|
15
15
|
import { CoreConfigModule } from "./core-config/CoreConfig.module.js";
|
|
16
16
|
import { CliCommandService } from "./runningCommandLine/CliCommandService.js";
|
|
17
17
|
export { CoreConfigurationService, SmtpEmailClientModule, CoreModule, CoreConfigModule, SwaggerGen, PostgresDatabaseModule as DatabaseModule, PostgresTypeOrmConfigurationProvider as TypeOrmConfigurationProvider, SmtpEmailClient, ValidatedConfigurationService, SqliteDatabaseModule, SqliteDatabaseConfigurationService, TwitterClientService, TwitterAccountModule, EUploadMimeType, RunningCommandLineModule, CliCommandService, };
|
|
18
|
+
export type { RequestUser } from "./authorization/models/RequestWithUser.js";
|
|
18
19
|
export { SuperPowersModule } from "./super-powers/super-powers.module.js";
|
|
19
20
|
export { OrganisationModule } from "./organisation/organisation.module.js";
|
|
20
21
|
export { OrganisationMembershipsService } from "./organisation-memberships/organisation-memberships.service.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,sFAAsF;AAEtF,+CAA+C;AAC/C,OAAO,EAAC,wBAAwB,EAAC,MAAM,mDAAmD,CAAC;AAC3F,OAAO,EAAC,oBAAoB,EAAC,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAC,qBAAqB,EAAC,MAAM,iDAAiD,CAAC;AACtF,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAC,6BAA6B,EAAC,MAAM,kDAAkD,CAAC;AAC/F,OAAO,EAAC,wBAAwB,EAAC,MAAM,2CAA2C,CAAC;AACnF,OAAO,EAAC,sBAAsB,EAAC,MAAM,gDAAgD,CAAC;AACtF,OAAO,EAAC,oCAAoC,EAAC,MAAM,6DAA6D,CAAC;AACjH,OAAO,EAAC,oBAAoB,EAAC,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAC,kCAAkC,EAAC,MAAM,yDAAyD,CAAC;AAC3G,OAAO,EAAC,eAAe,EAAC,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAC,oBAAoB,EAAC,MAAM,qDAAqD,CAAC;AACzF,OAAO,EAAC,gBAAgB,EAAC,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAC,iBAAiB,EAAC,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EACH,wBAAwB,EACxB,qBAAqB,EACrB,UAAU,EACV,gBAAgB,EAChB,UAAU,EACV,sBAAsB,IAAI,cAAc,EACxC,oCAAoC,IAAI,4BAA4B,EACpE,eAAe,EACf,6BAA6B,EAC7B,oBAAoB,EACpB,kCAAkC,EAClC,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EACf,wBAAwB,EACxB,iBAAiB,GACpB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ import { OrganisationSubscriptionsController } from "./organisation-subscription
|
|
|
12
12
|
import { OrganisationSubscriptionRecord } from "./entities/organisation-subscription.entity.js";
|
|
13
13
|
import { PaymentSessionModule } from "../payment-sessions/payment-session.module.js";
|
|
14
14
|
import { AllSubscriptionsController } from "./all-subscriptions.controller.js";
|
|
15
|
+
import { BullModule } from "@nestjs/bull";
|
|
15
16
|
let OrganisationSubscriptionsModule = class OrganisationSubscriptionsModule {
|
|
16
17
|
};
|
|
17
18
|
OrganisationSubscriptionsModule = __decorate([
|
|
@@ -21,6 +22,9 @@ OrganisationSubscriptionsModule = __decorate([
|
|
|
21
22
|
Organisation,
|
|
22
23
|
OrganisationSubscriptionRecord,
|
|
23
24
|
]),
|
|
25
|
+
BullModule.registerQueueAsync({
|
|
26
|
+
name: "subscription-activation-changed",
|
|
27
|
+
}),
|
|
24
28
|
PaymentSessionModule,
|
|
25
29
|
],
|
|
26
30
|
controllers: [
|
|
@@ -28,7 +32,7 @@ OrganisationSubscriptionsModule = __decorate([
|
|
|
28
32
|
AllSubscriptionsController,
|
|
29
33
|
],
|
|
30
34
|
providers: [OrganisationSubscriptionService],
|
|
31
|
-
exports: [OrganisationSubscriptionService],
|
|
35
|
+
exports: [OrganisationSubscriptionService, BullModule],
|
|
32
36
|
})
|
|
33
37
|
], OrganisationSubscriptionsModule);
|
|
34
38
|
export { OrganisationSubscriptionsModule };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organisation-subscriptions.module.js","sourceRoot":"","sources":["../../src/organisation-subscriptions/organisation-subscriptions.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,+BAA+B,EAAC,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAC,YAAY,EAAC,MAAM,iDAAiD,CAAC;AAC7E,OAAO,EAAC,mCAAmC,EAAC,MAAM,4CAA4C,CAAC;AAC/F,OAAO,EAAC,8BAA8B,EAAC,MAAM,gDAAgD,CAAC;AAC9F,OAAO,EAAC,oBAAoB,EAAC,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAC,0BAA0B,EAAC,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"organisation-subscriptions.module.js","sourceRoot":"","sources":["../../src/organisation-subscriptions/organisation-subscriptions.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,+BAA+B,EAAC,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAC,YAAY,EAAC,MAAM,iDAAiD,CAAC;AAC7E,OAAO,EAAC,mCAAmC,EAAC,MAAM,4CAA4C,CAAC;AAC/F,OAAO,EAAC,8BAA8B,EAAC,MAAM,gDAAgD,CAAC;AAC9F,OAAO,EAAC,oBAAoB,EAAC,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAC,0BAA0B,EAAC,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAoBjC,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;CAAG,CAAA;AAAlC,+BAA+B;IAlB3C,MAAM,CAAC;QACJ,OAAO,EAAE;YACL,aAAa,CAAC,UAAU,CAAC;gBACrB,YAAY;gBACZ,8BAA8B;aACjC,CAAC;YACF,UAAU,CAAC,kBAAkB,CAAC;gBAC1B,IAAI,EAAE,iCAAiC;aAC1C,CAAC;YACF,oBAAoB;SACvB;QACD,WAAW,EAAE;YACT,mCAAmC;YACnC,0BAA0B;SAC7B;QACD,SAAS,EAAE,CAAC,+BAA+B,CAAC;QAC5C,OAAO,EAAE,CAAC,+BAA+B,EAAE,UAAU,CAAC;KACzD,CAAC;GACW,+BAA+B,CAAG;SAAlC,+BAA+B"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Queue } from "bull";
|
|
1
2
|
import { Repository } from "typeorm";
|
|
2
3
|
import { Organisation } from "../organisation/entities/organisation.entity.js";
|
|
3
4
|
import { PaymentSessionService } from "../payment-sessions/payment-session.service.js";
|
|
@@ -7,8 +8,9 @@ export declare class OrganisationSubscriptionService {
|
|
|
7
8
|
private orgRepo;
|
|
8
9
|
private orgSubRepository;
|
|
9
10
|
private readonly paymentSessionService;
|
|
11
|
+
private queue;
|
|
10
12
|
private readonly logger;
|
|
11
|
-
constructor(orgRepo: Repository<Organisation>, orgSubRepository: Repository<OrganisationSubscriptionRecord>, paymentSessionService: PaymentSessionService);
|
|
13
|
+
constructor(orgRepo: Repository<Organisation>, orgSubRepository: Repository<OrganisationSubscriptionRecord>, paymentSessionService: PaymentSessionService, queue: Queue);
|
|
12
14
|
private notFoundMessage;
|
|
13
15
|
findAllForOwnerOfOrg(orgId: number, currentUserId: number): Promise<OrganisationSubscriptionRecord[]>;
|
|
14
16
|
findOne(subscriptionUuid: string): Promise<OrganisationSubscriptionRecord>;
|
|
@@ -11,6 +11,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
13
|
var OrganisationSubscriptionService_1;
|
|
14
|
+
import { InjectQueue } from "@nestjs/bull";
|
|
14
15
|
import { Injectable, Logger, NotFoundException } from "@nestjs/common";
|
|
15
16
|
import { InjectRepository } from "@nestjs/typeorm";
|
|
16
17
|
import { Repository } from "typeorm";
|
|
@@ -22,11 +23,13 @@ let OrganisationSubscriptionService = OrganisationSubscriptionService_1 = class
|
|
|
22
23
|
orgRepo;
|
|
23
24
|
orgSubRepository;
|
|
24
25
|
paymentSessionService;
|
|
26
|
+
queue;
|
|
25
27
|
logger = new Logger(OrganisationSubscriptionService_1.name);
|
|
26
|
-
constructor(orgRepo, orgSubRepository, paymentSessionService) {
|
|
28
|
+
constructor(orgRepo, orgSubRepository, paymentSessionService, queue) {
|
|
27
29
|
this.orgRepo = orgRepo;
|
|
28
30
|
this.orgSubRepository = orgSubRepository;
|
|
29
31
|
this.paymentSessionService = paymentSessionService;
|
|
32
|
+
this.queue = queue;
|
|
30
33
|
}
|
|
31
34
|
notFoundMessage = "Organisation not found or you are not owner of it";
|
|
32
35
|
async findAllForOwnerOfOrg(orgId, currentUserId) {
|
|
@@ -87,6 +90,7 @@ let OrganisationSubscriptionService = OrganisationSubscriptionService_1 = class
|
|
|
87
90
|
async save(subRecordDtoCollection, orgId) {
|
|
88
91
|
const results = [];
|
|
89
92
|
for (const subRecord of subRecordDtoCollection) {
|
|
93
|
+
let shouldRaiseEvent = false;
|
|
90
94
|
let existingSubscription = await this.orgSubRepository.findOne({
|
|
91
95
|
where: {
|
|
92
96
|
paymentSystemTransactionId: subRecord.paymentSystemTransactionId,
|
|
@@ -126,6 +130,9 @@ let OrganisationSubscriptionService = OrganisationSubscriptionService_1 = class
|
|
|
126
130
|
throw new NotFoundException("Failed to find organisation. Cannot match this payment to a customer");
|
|
127
131
|
}
|
|
128
132
|
}
|
|
133
|
+
if (existingSubscription.validUntil !== subRecord.validUntil) {
|
|
134
|
+
shouldRaiseEvent = true;
|
|
135
|
+
}
|
|
129
136
|
existingSubscription.paymentSystemMode =
|
|
130
137
|
subRecord.paymentSystemMode;
|
|
131
138
|
existingSubscription.paymentSystemCustomerId =
|
|
@@ -144,25 +151,49 @@ let OrganisationSubscriptionService = OrganisationSubscriptionService_1 = class
|
|
|
144
151
|
existingSubscription.internalSku = subRecord.internalSku;
|
|
145
152
|
const result = await this.orgSubRepository.save(existingSubscription);
|
|
146
153
|
results.push(result);
|
|
154
|
+
if (shouldRaiseEvent) {
|
|
155
|
+
await this.queue.add({
|
|
156
|
+
organisationUuid: result.organisation.uuid,
|
|
157
|
+
subscriptionUuid: result.uuid,
|
|
158
|
+
productKey: result.internalSku,
|
|
159
|
+
active: result.validUntil > new Date(),
|
|
160
|
+
}, {
|
|
161
|
+
timeout: 24 * 60 * 60 * 1000, // 24h
|
|
162
|
+
});
|
|
163
|
+
}
|
|
147
164
|
}
|
|
148
165
|
return results;
|
|
149
166
|
}
|
|
150
167
|
async delete(subUuid) {
|
|
151
|
-
const result = await this.orgSubRepository.
|
|
152
|
-
|
|
168
|
+
const result = await this.orgSubRepository.findOne({
|
|
169
|
+
where: {
|
|
170
|
+
uuid: subUuid,
|
|
171
|
+
},
|
|
172
|
+
relations: {
|
|
173
|
+
organisation: true,
|
|
174
|
+
},
|
|
175
|
+
});
|
|
176
|
+
if (!result) {
|
|
177
|
+
throw new NotFoundException("Subscription not found");
|
|
178
|
+
}
|
|
179
|
+
await this.queue.add({
|
|
180
|
+
organisationUuid: result.organisation.uuid,
|
|
181
|
+
subscriptionUuid: result.uuid,
|
|
182
|
+
productKey: result.internalSku,
|
|
183
|
+
active: false,
|
|
153
184
|
});
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
result.affected > 0);
|
|
185
|
+
await this.orgSubRepository.delete(result);
|
|
186
|
+
return true;
|
|
157
187
|
}
|
|
158
188
|
};
|
|
159
189
|
OrganisationSubscriptionService = OrganisationSubscriptionService_1 = __decorate([
|
|
160
190
|
Injectable(),
|
|
161
191
|
__param(0, InjectRepository(Organisation)),
|
|
162
192
|
__param(1, InjectRepository(OrganisationSubscriptionRecord)),
|
|
193
|
+
__param(3, InjectQueue("subscription-activation-changed")),
|
|
163
194
|
__metadata("design:paramtypes", [Repository,
|
|
164
195
|
Repository,
|
|
165
|
-
PaymentSessionService])
|
|
196
|
+
PaymentSessionService, Object])
|
|
166
197
|
], OrganisationSubscriptionService);
|
|
167
198
|
export { OrganisationSubscriptionService };
|
|
168
199
|
//# sourceMappingURL=organisation-subscriptions.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organisation-subscriptions.service.js","sourceRoot":"","sources":["../../src/organisation-subscriptions/organisation-subscriptions.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"organisation-subscriptions.service.js","sourceRoot":"","sources":["../../src/organisation-subscriptions/organisation-subscriptions.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED