@dextinity/cms-api 10.13.0-canary-20261103114401 → 10.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/dam/files/file-warning.service.d.ts.map +1 -1
- package/lib/dam/files/file-warning.service.js +2 -1
- package/lib/dam/files/file-warning.service.js.map +1 -1
- package/lib/dam/files/license-validity.d.ts +1 -1
- package/lib/dam/files/license-validity.d.ts.map +1 -1
- package/lib/dam/files/license-validity.js +6 -2
- package/lib/dam/files/license-validity.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-warning.service.d.ts","sourceRoot":"","sources":["../../../src/dam/files/file-warning.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAe,MAAM,uBAAuB,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAE,8BAA8B,EAAE,MAAM,qDAAqD,CAAC;AACrG,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"file-warning.service.d.ts","sourceRoot":"","sources":["../../../src/dam/files/file-warning.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAe,MAAM,uBAAuB,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAE,8BAA8B,EAAE,MAAM,qDAAqD,CAAC;AACrG,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,qBACa,kBAAmB,YAAW,8BAA8B,CAAC,aAAa,CAAC;IAE5D,OAAO,CAAC,QAAQ,CAAC,MAAM;IAC3C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBADO,MAAM,EAAE,SAAS,EACrC,aAAa,EAAE,aAAa;IAG1C,kBAAkB;;;;;IA0CnB,cAAc,CAAC,MAAM,EAAE,aAAa;CA4C7C"}
|
|
@@ -16,6 +16,7 @@ exports.FileWarningService = void 0;
|
|
|
16
16
|
const postgresql_1 = require("@mikro-orm/postgresql");
|
|
17
17
|
const common_1 = require("@nestjs/common");
|
|
18
18
|
const dam_constants_1 = require("../dam.constants");
|
|
19
|
+
const license_embeddable_1 = require("./entities/license.embeddable");
|
|
19
20
|
let FileWarningService = class FileWarningService {
|
|
20
21
|
constructor(config, entityManager) {
|
|
21
22
|
this.config = config;
|
|
@@ -66,7 +67,7 @@ let FileWarningService = class FileWarningService {
|
|
|
66
67
|
if (!this.config.enableLicenseFeature) {
|
|
67
68
|
return warnings;
|
|
68
69
|
} // license feature not enabled, no warnings
|
|
69
|
-
if (entity.license?.durationTo) {
|
|
70
|
+
if (entity.license?.durationTo && entity.license.type !== license_embeddable_1.LicenseType.ROYALTY_FREE) {
|
|
70
71
|
const soonToExpireDate = new Date();
|
|
71
72
|
soonToExpireDate.setDate(soonToExpireDate.getDate() + 30);
|
|
72
73
|
if (entity.license.durationTo < new Date()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-warning.service.js","sourceRoot":"","sources":["../../../src/dam/files/file-warning.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAAmE;AACnE,2CAAoD;AAKpD,oDAA8C;
|
|
1
|
+
{"version":3,"file":"file-warning.service.js","sourceRoot":"","sources":["../../../src/dam/files/file-warning.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type License } from "./entities/license.embeddable";
|
|
2
2
|
export declare function getLicenseExpirationDate(license: License): Date | undefined;
|
|
3
3
|
export declare function hasLicenseExpired(license: License, now?: Date): boolean;
|
|
4
4
|
export declare function isLicenseNotValidYet(license: License, now?: Date): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license-validity.d.ts","sourceRoot":"","sources":["../../../src/dam/files/license-validity.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"license-validity.d.ts","sourceRoot":"","sources":["../../../src/dam/files/license-validity.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,OAAO,EAAe,MAAM,+BAA+B,CAAC;AAQ1E,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAK3E;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,GAAE,IAAiB,GAAG,OAAO,CAInF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,GAAE,IAAiB,GAAG,OAAO,CAMtF;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,GAAE,IAAiB,GAAG,OAAO,CAEhF"}
|
|
@@ -5,10 +5,14 @@ exports.hasLicenseExpired = hasLicenseExpired;
|
|
|
5
5
|
exports.isLicenseNotValidYet = isLicenseNotValidYet;
|
|
6
6
|
exports.isLicenseValid = isLicenseValid;
|
|
7
7
|
const date_fns_1 = require("date-fns");
|
|
8
|
+
const license_embeddable_1 = require("./entities/license.embeddable");
|
|
9
|
+
function isDurationApplicable(license) {
|
|
10
|
+
return license.type !== license_embeddable_1.LicenseType.ROYALTY_FREE;
|
|
11
|
+
}
|
|
8
12
|
// if durationTo = '2023-02-27T00:00:00.000Z' then the license is still valid on 27.02.2023
|
|
9
13
|
// and expires at '2023-02-28T00:00:00.000Z'
|
|
10
14
|
function getLicenseExpirationDate(license) {
|
|
11
|
-
if (license.durationTo) {
|
|
15
|
+
if (isDurationApplicable(license) && license.durationTo) {
|
|
12
16
|
return (0, date_fns_1.add)(license.durationTo, { days: 1 });
|
|
13
17
|
}
|
|
14
18
|
return undefined;
|
|
@@ -18,7 +22,7 @@ function hasLicenseExpired(license, now = new Date()) {
|
|
|
18
22
|
return expirationDate !== undefined && (0, date_fns_1.isAfter)(now, expirationDate);
|
|
19
23
|
}
|
|
20
24
|
function isLicenseNotValidYet(license, now = new Date()) {
|
|
21
|
-
if (!license.durationFrom) {
|
|
25
|
+
if (!isDurationApplicable(license) || !license.durationFrom) {
|
|
22
26
|
return false;
|
|
23
27
|
}
|
|
24
28
|
return (0, date_fns_1.isBefore)(now, license.durationFrom);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license-validity.js","sourceRoot":"","sources":["../../../src/dam/files/license-validity.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"license-validity.js","sourceRoot":"","sources":["../../../src/dam/files/license-validity.ts"],"names":[],"mappings":";;AAUA,4DAKC;AAED,8CAIC;AAED,oDAMC;AAED,wCAEC;AAjCD,uCAAkD;AAElD,sEAA0E;AAE1E,SAAS,oBAAoB,CAAC,OAAgB;IAC1C,OAAO,OAAO,CAAC,IAAI,KAAK,gCAAW,CAAC,YAAY,CAAC;AACrD,CAAC;AAED,2FAA2F;AAC3F,4CAA4C;AAC5C,SAAgB,wBAAwB,CAAC,OAAgB;IACrD,IAAI,oBAAoB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACtD,OAAO,IAAA,cAAG,EAAC,OAAO,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAgB,iBAAiB,CAAC,OAAgB,EAAE,MAAY,IAAI,IAAI,EAAE;IACtE,MAAM,cAAc,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAEzD,OAAO,cAAc,KAAK,SAAS,IAAI,IAAA,kBAAO,EAAC,GAAG,EAAE,cAAc,CAAC,CAAC;AACxE,CAAC;AAED,SAAgB,oBAAoB,CAAC,OAAgB,EAAE,MAAY,IAAI,IAAI,EAAE;IACzE,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAC1D,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,IAAA,mBAAQ,EAAC,GAAG,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;AAC/C,CAAC;AAED,SAAgB,cAAc,CAAC,OAAgB,EAAE,MAAY,IAAI,IAAI,EAAE;IACnE,OAAO,CAAC,oBAAoB,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;AACnF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dextinity/cms-api",
|
|
3
|
-
"version": "10.13.0
|
|
3
|
+
"version": "10.13.0",
|
|
4
4
|
"description": "Dextinity CMS API package",
|
|
5
5
|
"repository": {
|
|
6
6
|
"directory": "packages/api/cms-api",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
63
|
"@aws-sdk/types": "^3.975.0",
|
|
64
|
-
"@dextinity/eslint-config": "10.13.0
|
|
64
|
+
"@dextinity/eslint-config": "10.13.0",
|
|
65
65
|
"@golevelup/ts-vitest": "^4.0.1",
|
|
66
66
|
"@kubernetes/client-node": "^1.4.0",
|
|
67
67
|
"@mikro-orm/core": "^6.6.17",
|