@xsolla/payment-client-core 0.1.14-test11 → 0.1.14-test13

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.
@@ -17,17 +17,53 @@ export class SavePaymentMethodStatusService {
17
17
  this.nextActionService = nextActionService;
18
18
  }
19
19
  async getStatus(params) {
20
+ console.log('getStatus', params);
20
21
  this.statusRequestService.setRequestParams(params);
21
- this.startWaitingStatusUpdates(params.invoice);
22
+ // todo: get account
23
+ const accountData = await this.getPaymentAccountData(params.invoice);
24
+ // this.startWaitingStatusUpdates(params.invoice);
22
25
  this.statusRequestService.request();
23
26
  const statusResponse = await firstValueFrom(this.statusRequestService.response$);
24
- if (!this.savePaymentMethodStatus) {
27
+ // const savingFailedOrCancel = statusResponse.status?.titleClass === TitleClass.cancel || statusResponse.status?.titleClass === TitleClass.cancelUser;
28
+ // const savingSuccessful = statusResponse.status?.titleClass === TitleClass.done && accountData?.new_account;
29
+ if (!accountData) {
30
+ this.startWaitingStatusUpdates(params.invoice);
25
31
  statusResponse.status.statusState = StatusEnum.processing;
26
32
  }
33
+ // if (!this.savingFailedOrCancel(statusResponse?.status) && !this.savingSuccessful(accountData, statusResponse?.status)) {
34
+ // // todo is proccessing
35
+ //
36
+ // this.startWaitingStatusUpdates(params.invoice);
37
+ // statusResponse.status.statusState = StatusEnum.processing;
38
+ // }
27
39
  statusResponse.status.isSavePaymentAccount = true;
28
40
  return statusResponse.status;
41
+ // if (!this.savePaymentMethodStatus) {
42
+ // statusResponse.status.statusState = StatusEnum.processing;
43
+ // }
44
+ // statusResponse.status.isSavePaymentAccount = true;
45
+ // return statusResponse.status;
46
+ }
47
+ savingFailedOrCancel(status) {
48
+ return status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;
49
+ }
50
+ savingSuccessful(accountData, status) {
51
+ return !!(status?.titleClass === TitleClass.done && accountData?.new_account);
52
+ }
53
+ getPaymentAccountData(invoice) {
54
+ return this.savedPaymentAccountChangesService
55
+ .request(invoice);
56
+ // .then((accountChanges: SavedPaymentAccountChanges) => {
57
+ // if (accountChanges) {
58
+ // this.handleSavingStatus(status, accountChanges.new_account);
59
+ // }
60
+ // });
29
61
  }
30
62
  startWaitingStatusUpdates(invoice) {
63
+ if (this.listenStatusSubscription) {
64
+ this.listenStatusSubscription.unsubscribe();
65
+ this.listenStatusService.stopListening();
66
+ }
31
67
  this.listenStatusService.listen(invoice);
32
68
  this.listenStatusSubscription = this.listenStatusService.statusUpdated$
33
69
  .subscribe(({ statusResponse }) => {
@@ -44,20 +80,22 @@ export class SavePaymentMethodStatusService {
44
80
  .request(status.invoice)
45
81
  .then((accountChanges) => {
46
82
  if (accountChanges) {
47
- this.handleSavingStatus(status, accountChanges.new_account);
83
+ this.handleSavingStatus(status, accountChanges);
48
84
  }
49
85
  });
50
86
  }
51
87
  handleSavingStatus(status, account) {
52
- this.listenStatusService.stopListening();
53
- this.listenStatusSubscription.unsubscribe();
54
- const updatingIsProcessing = status?.titleClass !== TitleClass.cancel && status?.titleClass !== TitleClass.cancelUser && !account;
55
- if (updatingIsProcessing) {
88
+ // const savingFailedOrCancel = status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;
89
+ //
90
+ // const savingSuccessful = status?.titleClass === TitleClass.done && account;
91
+ if (!this.savingFailedOrCancel(status) && !this.savingSuccessful(account, status)) {
56
92
  return;
57
93
  }
58
- const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;
94
+ this.listenStatusService.stopListening();
95
+ this.listenStatusSubscription.unsubscribe();
96
+ // const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;
59
97
  const isSavePaymentMethod = true;
60
- this.savePaymentMethodStatus = paymentAccountWasSaved ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
98
+ this.savePaymentMethodStatus = this.savingFailedOrCancel(status) ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
61
99
  this.nextActionService.emitFlowUpdates(new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus));
62
100
  }
63
101
  }
@@ -69,4 +107,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
69
107
  providedIn: 'root'
70
108
  }]
71
109
  }], ctorParameters: function () { return [{ type: i1.StatusRequestService }, { type: i2.ListenStatusService }, { type: i3.SavedPaymentAccountChangesService }, { type: i4.NextActionService }]; } });
72
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"save-payment-method-status.service.js","sourceRoot":"","sources":["../../../../../../../../packages/payment-client-core/src/lib/core/payment/status/save-payment-method-status/save-payment-method-status.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { StatusRequestParams } from '../status-request/status-request-params.interface';\nimport { Status } from '../status.interface';\nimport { firstValueFrom, skip, Subscription } from 'rxjs';\nimport { StatusRequestService } from '../status-request/status-request.service';\nimport { StatusUpdatedAction } from '../../actions/status-updated/status-updated.action.class';\nimport { ListenStatusService } from '../listen-status/listen-status.service';\nimport { SavedPaymentAccountChanges } from './api/saved-payment-account-changes.interface';\nimport { SavedPaymentAccountChangesService } from './api/saved-payment-account-changes.service';\nimport { SavedPaymentAccount } from './api/saved-payment-account.interface';\nimport { TitleClass } from '../title-class.enum';\nimport { NextActionService } from '../../actions/next-action.service';\nimport { StatusEnum } from '../status.enum';\nimport { SavePaymentMethodStatus } from './save-payment-method-status.enum';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class SavePaymentMethodStatusService {\n  private savePaymentMethodStatus?: SavePaymentMethodStatus;\n  private listenStatusSubscription!: Subscription;\n\n  public constructor(\n    private readonly statusRequestService: StatusRequestService,\n    private readonly listenStatusService: ListenStatusService,\n    private readonly savedPaymentAccountChangesService: SavedPaymentAccountChangesService,\n    private readonly nextActionService: NextActionService) { }\n  public async getStatus(params: StatusRequestParams): Promise<Status> {\n\n    this.statusRequestService.setRequestParams(params);\n\n    this.startWaitingStatusUpdates(params.invoice);\n\n    this.statusRequestService.request();\n\n    const statusResponse = await firstValueFrom(\n      this.statusRequestService.response$\n    );\n\n    if (!this.savePaymentMethodStatus) {\n      statusResponse.status.statusState = StatusEnum.processing;\n    }\n    statusResponse.status.isSavePaymentAccount = true;\n    return statusResponse.status;\n  }\n\n  private startWaitingStatusUpdates(invoice: number): void {\n    this.listenStatusService.listen(invoice);\n\n    this.listenStatusSubscription = this.listenStatusService.statusUpdated$\n      .subscribe(({ statusResponse }) => {\n\n        if (statusResponse.status) {\n          this.loadNewPaymentAccountData(statusResponse.status)\n        }\n      });\n  }\n\n  private loadNewPaymentAccountData(status: Status): void {\n    if (!status.invoice) {\n      return;\n    }\n    void this.savedPaymentAccountChangesService\n      .request(status.invoice)\n      .then((accountChanges: SavedPaymentAccountChanges) => {\n        if (accountChanges) {\n          this.handleSavingStatus(status, accountChanges.new_account);\n        }\n      });\n  }\n\n  private handleSavingStatus(\n    status: Status,\n    account: SavedPaymentAccount | null\n  ): void {\n    this.listenStatusService.stopListening();\n    this.listenStatusSubscription.unsubscribe();\n\n    const updatingIsProcessing = status?.titleClass !== TitleClass.cancel && status?.titleClass !== TitleClass.cancelUser && !account;\n\n    if (updatingIsProcessing) {\n      return;\n    }\n\n    const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;\n    const isSavePaymentMethod = true;\n\n    this.savePaymentMethodStatus = paymentAccountWasSaved ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;\n\n    this.nextActionService.emitFlowUpdates(\n      new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus)\n    );\n  }\n}\n"]}
110
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"save-payment-method-status.service.js","sourceRoot":"","sources":["../../../../../../../../packages/payment-client-core/src/lib/core/payment/status/save-payment-method-status/save-payment-method-status.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { StatusRequestParams } from '../status-request/status-request-params.interface';\nimport { Status } from '../status.interface';\nimport { firstValueFrom, Subscription } from 'rxjs';\nimport { StatusRequestService } from '../status-request/status-request.service';\nimport { StatusUpdatedAction } from '../../actions/status-updated/status-updated.action.class';\nimport { ListenStatusService } from '../listen-status/listen-status.service';\nimport { SavedPaymentAccountChanges } from './api/saved-payment-account-changes.interface';\nimport { SavedPaymentAccountChangesService } from './api/saved-payment-account-changes.service';\nimport { SavedPaymentAccount } from './api/saved-payment-account.interface';\nimport { TitleClass } from '../title-class.enum';\nimport { NextActionService } from '../../actions/next-action.service';\nimport { StatusEnum } from '../status.enum';\nimport { SavePaymentMethodStatus } from './save-payment-method-status.enum';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class SavePaymentMethodStatusService {\n  private savePaymentMethodStatus?: SavePaymentMethodStatus;\n  private listenStatusSubscription!: Subscription;\n\n  public constructor(\n    private readonly statusRequestService: StatusRequestService,\n    private readonly listenStatusService: ListenStatusService,\n    private readonly savedPaymentAccountChangesService: SavedPaymentAccountChangesService,\n    private readonly nextActionService: NextActionService) { }\n  public async getStatus(params: StatusRequestParams): Promise<Status> {\n    console.log('getStatus', params);\n\n    this.statusRequestService.setRequestParams(params);\n\n    // todo: get account\n    const accountData = await this.getPaymentAccountData(params.invoice);\n    // this.startWaitingStatusUpdates(params.invoice);\n\n    this.statusRequestService.request();\n\n    const statusResponse = await firstValueFrom(\n      this.statusRequestService.response$\n    );\n\n\n\n    // const savingFailedOrCancel = statusResponse.status?.titleClass === TitleClass.cancel || statusResponse.status?.titleClass === TitleClass.cancelUser;\n\n    // const savingSuccessful = statusResponse.status?.titleClass === TitleClass.done && accountData?.new_account;\n\n    if (!accountData) {\n      this.startWaitingStatusUpdates(params.invoice);\n      statusResponse.status.statusState = StatusEnum.processing;\n    }\n\n    // if (!this.savingFailedOrCancel(statusResponse?.status) && !this.savingSuccessful(accountData, statusResponse?.status)) {\n    //   // todo is proccessing\n    //\n    //   this.startWaitingStatusUpdates(params.invoice);\n    //   statusResponse.status.statusState = StatusEnum.processing;\n    // }\n    statusResponse.status.isSavePaymentAccount = true;\n    return statusResponse.status;\n\n    // if (!this.savePaymentMethodStatus) {\n    //   statusResponse.status.statusState = StatusEnum.processing;\n    // }\n    // statusResponse.status.isSavePaymentAccount = true;\n    // return statusResponse.status;\n  }\n\n  private savingFailedOrCancel(status?: Status): boolean {\n    return status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;\n  }\n\n  private savingSuccessful(accountData: SavedPaymentAccountChanges, status?: Status): boolean {\n    return !!(status?.titleClass === TitleClass.done && accountData?.new_account);\n  }\n\n  private getPaymentAccountData(invoice: number): Promise<SavedPaymentAccountChanges> {\n    return this.savedPaymentAccountChangesService\n      .request(invoice)\n      // .then((accountChanges: SavedPaymentAccountChanges) => {\n      //   if (accountChanges) {\n      //     this.handleSavingStatus(status, accountChanges.new_account);\n      //   }\n      // });\n  }\n\n  private startWaitingStatusUpdates(invoice: number): void {\n    if (this.listenStatusSubscription) {\n      this.listenStatusSubscription.unsubscribe();\n      this.listenStatusService.stopListening();\n    }\n    this.listenStatusService.listen(invoice);\n\n    this.listenStatusSubscription = this.listenStatusService.statusUpdated$\n      .subscribe(({ statusResponse }) => {\n\n        if (statusResponse.status) {\n          this.loadNewPaymentAccountData(statusResponse.status)\n        }\n      });\n  }\n\n  private loadNewPaymentAccountData(status: Status): void {\n\n\n    if (!status.invoice) {\n      return;\n    }\n    void this.savedPaymentAccountChangesService\n      .request(status.invoice)\n      .then((accountChanges: SavedPaymentAccountChanges) => {\n\n\n        if (accountChanges) {\n\n          this.handleSavingStatus(status, accountChanges);\n        }\n      });\n  }\n\n  private handleSavingStatus(\n    status: Status,\n    account: SavedPaymentAccountChanges\n  ): void {\n\n    // const savingFailedOrCancel = status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;\n    //\n    // const savingSuccessful = status?.titleClass === TitleClass.done && account;\n\n\n    if (!this.savingFailedOrCancel(status) && !this.savingSuccessful(account, status)) {\n      return;\n    }\n    this.listenStatusService.stopListening();\n    this.listenStatusSubscription.unsubscribe();\n\n    // const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;\n    const isSavePaymentMethod = true;\n\n    this.savePaymentMethodStatus = this.savingFailedOrCancel(status) ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;\n\n    this.nextActionService.emitFlowUpdates(\n      new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus)\n    );\n  }\n}\n"]}
@@ -4745,18 +4745,54 @@ class SavePaymentMethodStatusService {
4745
4745
  }
4746
4746
  getStatus(params) {
4747
4747
  return __awaiter(this, void 0, void 0, function* () {
4748
+ console.log('getStatus', params);
4748
4749
  this.statusRequestService.setRequestParams(params);
4749
- this.startWaitingStatusUpdates(params.invoice);
4750
+ // todo: get account
4751
+ const accountData = yield this.getPaymentAccountData(params.invoice);
4752
+ // this.startWaitingStatusUpdates(params.invoice);
4750
4753
  this.statusRequestService.request();
4751
4754
  const statusResponse = yield firstValueFrom(this.statusRequestService.response$);
4752
- if (!this.savePaymentMethodStatus) {
4755
+ // const savingFailedOrCancel = statusResponse.status?.titleClass === TitleClass.cancel || statusResponse.status?.titleClass === TitleClass.cancelUser;
4756
+ // const savingSuccessful = statusResponse.status?.titleClass === TitleClass.done && accountData?.new_account;
4757
+ if (!accountData) {
4758
+ this.startWaitingStatusUpdates(params.invoice);
4753
4759
  statusResponse.status.statusState = StatusEnum.processing;
4754
4760
  }
4761
+ // if (!this.savingFailedOrCancel(statusResponse?.status) && !this.savingSuccessful(accountData, statusResponse?.status)) {
4762
+ // // todo is proccessing
4763
+ //
4764
+ // this.startWaitingStatusUpdates(params.invoice);
4765
+ // statusResponse.status.statusState = StatusEnum.processing;
4766
+ // }
4755
4767
  statusResponse.status.isSavePaymentAccount = true;
4756
4768
  return statusResponse.status;
4769
+ // if (!this.savePaymentMethodStatus) {
4770
+ // statusResponse.status.statusState = StatusEnum.processing;
4771
+ // }
4772
+ // statusResponse.status.isSavePaymentAccount = true;
4773
+ // return statusResponse.status;
4757
4774
  });
4758
4775
  }
4776
+ savingFailedOrCancel(status) {
4777
+ return (status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.cancel || (status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.cancelUser;
4778
+ }
4779
+ savingSuccessful(accountData, status) {
4780
+ return !!((status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.done && (accountData === null || accountData === void 0 ? void 0 : accountData.new_account));
4781
+ }
4782
+ getPaymentAccountData(invoice) {
4783
+ return this.savedPaymentAccountChangesService
4784
+ .request(invoice);
4785
+ // .then((accountChanges: SavedPaymentAccountChanges) => {
4786
+ // if (accountChanges) {
4787
+ // this.handleSavingStatus(status, accountChanges.new_account);
4788
+ // }
4789
+ // });
4790
+ }
4759
4791
  startWaitingStatusUpdates(invoice) {
4792
+ if (this.listenStatusSubscription) {
4793
+ this.listenStatusSubscription.unsubscribe();
4794
+ this.listenStatusService.stopListening();
4795
+ }
4760
4796
  this.listenStatusService.listen(invoice);
4761
4797
  this.listenStatusSubscription = this.listenStatusService.statusUpdated$
4762
4798
  .subscribe(({ statusResponse }) => {
@@ -4773,20 +4809,22 @@ class SavePaymentMethodStatusService {
4773
4809
  .request(status.invoice)
4774
4810
  .then((accountChanges) => {
4775
4811
  if (accountChanges) {
4776
- this.handleSavingStatus(status, accountChanges.new_account);
4812
+ this.handleSavingStatus(status, accountChanges);
4777
4813
  }
4778
4814
  });
4779
4815
  }
4780
4816
  handleSavingStatus(status, account) {
4781
- this.listenStatusService.stopListening();
4782
- this.listenStatusSubscription.unsubscribe();
4783
- const updatingIsProcessing = (status === null || status === void 0 ? void 0 : status.titleClass) !== TitleClass.cancel && (status === null || status === void 0 ? void 0 : status.titleClass) !== TitleClass.cancelUser && !account;
4784
- if (updatingIsProcessing) {
4817
+ // const savingFailedOrCancel = status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;
4818
+ //
4819
+ // const savingSuccessful = status?.titleClass === TitleClass.done && account;
4820
+ if (!this.savingFailedOrCancel(status) && !this.savingSuccessful(account, status)) {
4785
4821
  return;
4786
4822
  }
4787
- const paymentAccountWasSaved = (status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.done && account !== null;
4823
+ this.listenStatusService.stopListening();
4824
+ this.listenStatusSubscription.unsubscribe();
4825
+ // const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;
4788
4826
  const isSavePaymentMethod = true;
4789
- this.savePaymentMethodStatus = paymentAccountWasSaved ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
4827
+ this.savePaymentMethodStatus = this.savingFailedOrCancel(status) ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
4790
4828
  this.nextActionService.emitFlowUpdates(new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus));
4791
4829
  }
4792
4830
  }