Merge pull request #17 from Adyen/bugfix/AD-312

AD-312 Saved cards are copied from one account to another
Adyen · Sep 17, 2024 · 829a17c · 829a17c
2 parents ceef451 + 9588830
commit 829a17c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/projects/adyen-payments/package.json b/projects/adyen-payments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adyen-payments",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "scripts": {
     "prebuild": "npm version patch -m \"Upgrade to %s for build\"",
     "build": "ng build && tsc -p tsconfig.schematics.json",

diff --git a/projects/adyen-payments/src/lib/service/checkout-adyen-configuration.service.ts b/projects/adyen-payments/src/lib/service/checkout-adyen-configuration.service.ts
@@ -1,7 +1,7 @@
 import {Injectable} from "@angular/core";
 import {combineLatest, Observable, switchMap} from "rxjs";
 import {AdyenConfigData} from "../core/models/occ.config.models";
-import {OCC_USER_ID_ANONYMOUS, Query, QueryNotifier, QueryService, QueryState, UserIdService} from "@spartacus/core";
+import {LoginEvent, LogoutEvent, OCC_USER_ID_ANONYMOUS, Query, QueryNotifier, QueryService, QueryState, UserIdService} from "@spartacus/core";
 import {filter, map, take} from "rxjs/operators";
 import {ActiveCartFacade} from "@spartacus/cart/base/root";
 import {CheckoutAdyenConfigurationReloadEvent} from "../events/checkout-adyen.events";
@@ -25,6 +25,7 @@ export class CheckoutAdyenConfigurationService extends AdyenBaseService {
       switchMap(([userId, cartId]) => this.checkoutConfigurationConnector.getCheckoutConfiguration(userId, cartId))
     ), {
       reloadOn: this.getCheckoutAdyenConfigurationLoadedEvents(),
+      resetOn: [LoginEvent, LogoutEvent]
     }
   );
 
@@ -39,11 +40,5 @@ export class CheckoutAdyenConfigurationService extends AdyenBaseService {
   fetchCheckoutConfiguration(userId: string, cartId: string): Observable<AdyenConfigData> {
     return this.checkoutConfigurationConnector.getCheckoutConfiguration(userId, cartId);
   }
-
-  getCheckoutConfiguration(): Observable<AdyenConfigData | undefined> {
-    return this.getCheckoutConfigurationState().pipe(
-      filter((state) => !state.loading),
-      map((state) => state.data)
-    );
-  }
+
 }