fix: login gets lost after a link is opened in a different tab (#938, #…

…1109)
intershop · May 18, 2022 · 4551931 · 4551931
1 parent a095d97
commit 4551931
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/app/core/utils/api-token/api-token.service.ts b/src/app/core/utils/api-token/api-token.service.ts
@@ -72,6 +72,14 @@ export class ApiTokenService {
               return { type: 'basket', apiToken };
             } else if (orderId) {
               return { type: 'order', apiToken, orderId };
+            } else {
+              const apiTokenCookieString = this.cookiesService.get('apiToken');
+              const apiTokenCookie: ApiTokenCookie = apiTokenCookieString
+                ? JSON.parse(apiTokenCookieString)
+                : undefined;
+              if (apiToken && apiTokenCookie) {
+                return { ...apiTokenCookie, apiToken };
+              }
             }
           }),
           distinctUntilChanged<ApiTokenCookie>(isEqual)