namirasoft-payment 1.4.129 → 1.4.130

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/NamirasoftPaymentServer.js +1 -1
  2. package/dist/SubscriptionValidation.d.ts +3 -0
  3. package/dist/SubscriptionValidation.js +7 -1
  4. package/dist/SubscriptionValidation.js.map +1 -1
  5. package/package.json +1 -1
  6. package/src/NamirasoftPaymentServer.ts +1 -1
  7. package/src/SubscriptionValidation.ts +9 -1
package/dist/NamirasoftPaymentServer.js CHANGED
@@ -20,7 +20,7 @@ const NamirasoftPaymentServerTrial_1 = require("./NamirasoftPaymentServerTrial")
20
20
  const NamirasoftPaymentServerValue_1 = require("./NamirasoftPaymentServerValue");
21
21
  class NamirasoftPaymentServer extends namirasoft_account_1.NSABaseServer {
22
22
  constructor(base_url, manager, onError) {
23
- super(base_url, `1.4.129`, manager, onError);
23
+ super(base_url, `1.4.130`, manager, onError);
24
24
  this.healthz = new NamirasoftPaymentServerHealthz_1.NamirasoftPaymentServerHealthz(this);
25
25
  this.metrics = new NamirasoftPaymentServerMetrics_1.NamirasoftPaymentServerMetrics(this);
26
26
  this.value = new NamirasoftPaymentServerValue_1.NamirasoftPaymentServerValue(this);
package/dist/SubscriptionValidation.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { SubscriptionStatus } from "./enum/SubscriptionStatus";
1
2
  import { FreeRow } from "./row/FreeRow";
2
3
  import { SubscriptionPaidRow } from "./row/SubscriptionPaidRow";
3
4
  import { SubscriptionRow } from "./row/SubscriptionRow";
@@ -13,6 +14,8 @@ export declare class SubscriptionValidation {
13
14
  subscription_paids: SubscriptionPaidRow[] | null;
14
15
  free: FreeRow | null;
15
16
  constructor(user_id: string, sales_item_id: string, subscriptions: SubscriptionRow[] | null, subscription_paids: SubscriptionPaidRow[] | null, free: FreeRow | null);
17
+ static getValidStatuses(): SubscriptionStatus[];
18
+ static isValidStatus(status: SubscriptionStatus): boolean;
16
19
  static isSubscribed(validation: SubscriptionValidation, offer_id: string | null): boolean;
17
20
  static isValid(validation: SubscriptionValidation, now?: Date | null): boolean;
18
21
  static getValid(validation: SubscriptionValidation, now?: Date | null): SubscriptionPaidRow | null;
package/dist/SubscriptionValidation.js CHANGED
@@ -21,9 +21,15 @@ class SubscriptionValidation {
21
21
  this.valid_row = SubscriptionValidation.getValid(this, this.date);
22
22
  this.valid_date = SubscriptionValidation.getValidDateTo(this, this.date);
23
23
  }
24
+ static getValidStatuses() {
25
+ return [SubscriptionStatus_1.SubscriptionStatus.Active, SubscriptionStatus_1.SubscriptionStatus.Trialing, SubscriptionStatus_1.SubscriptionStatus.PastDue];
26
+ }
27
+ static isValidStatus(status) {
28
+ return SubscriptionValidation.getValidStatuses().includes(status);
29
+ }
24
30
  static isSubscribed(validation, offer_id) {
25
31
  var _a;
26
- let s = ((_a = validation.subscriptions) !== null && _a !== void 0 ? _a : []).filter(s => s.status === SubscriptionStatus_1.SubscriptionStatus.Active).filter(s => offer_id == null || s.offer_id == offer_id);
32
+ let s = ((_a = validation.subscriptions) !== null && _a !== void 0 ? _a : []).filter(s => SubscriptionValidation.isValidStatus(s.status)).filter(s => offer_id == null || s.offer_id == offer_id);
27
33
  return s.length > 0;
28
34
  }
29
35
  static isValid(validation, now = null) {
package/dist/SubscriptionValidation.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SubscriptionValidation.js","sourceRoot":"","sources":["../src/SubscriptionValidation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SubscriptionValidation.js","sourceRoot":"","sources":["../src/SubscriptionValidation.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.4.129",
11
+ "version": "1.4.130",
12
12
  "author": "Amir Abolhasani",
13
13
  "license": "MIT",
14
14
  "main": "./dist/index.js",
package/src/NamirasoftPaymentServer.ts CHANGED
@@ -57,7 +57,7 @@ export class NamirasoftPaymentServer extends NSABaseServer
57
57
  product: NamirasoftPaymentServerProduct;
58
58
  constructor(base_url: string, manager: TokenManager, onError: (error: Error) => void)
59
59
  {
60
- super(base_url, `1.4.129`, manager, onError);
60
+ super(base_url, `1.4.130`, manager, onError);
61
61
  this.healthz = new NamirasoftPaymentServerHealthz(this);
62
62
  this.metrics = new NamirasoftPaymentServerMetrics(this);
63
63
  this.value = new NamirasoftPaymentServerValue(this);
package/src/SubscriptionValidation.ts CHANGED
@@ -34,9 +34,17 @@ export class SubscriptionValidation
34
34
  this.valid_row = SubscriptionValidation.getValid(this, this.date);
35
35
  this.valid_date = SubscriptionValidation.getValidDateTo(this, this.date);
36
36
  }
37
+ static getValidStatuses()
38
+ {
39
+ return [SubscriptionStatus.Active, SubscriptionStatus.Trialing, SubscriptionStatus.PastDue];
40
+ }
41
+ static isValidStatus(status: SubscriptionStatus)
42
+ {
43
+ return SubscriptionValidation.getValidStatuses().includes(status);
44
+ }
37
45
  static isSubscribed(validation: SubscriptionValidation, offer_id: string | null)
38
46
  {
39
- let s = (validation.subscriptions ?? []).filter(s => s.status === SubscriptionStatus.Active).filter(s => offer_id == null || s.offer_id == offer_id);
47
+ let s = (validation.subscriptions ?? []).filter(s => SubscriptionValidation.isValidStatus(s.status)).filter(s => offer_id == null || s.offer_id == offer_id);
40
48
  return s.length > 0;
41
49
  }
42
50
  static isValid(validation: SubscriptionValidation, now: Date | null = null)