bugfix/CXSPA-8626:Log out will lead to many request and keep getting …

…error (#19393)
SAP · Oct 14, 2024 · 37b8eb1 · 37b8eb1
1 parent 53ce472
commit 37b8eb1
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/projects/core/src/auth/user-auth/http-interceptors/auth.interceptor.spec.ts b/projects/core/src/auth/user-auth/http-interceptors/auth.interceptor.spec.ts
@@ -370,4 +370,37 @@ describe('AuthInterceptor', () => {
     );
     sub.unsubscribe();
   });
+
+  it(`Should handle 401 error for invalid error when customer in Logout process`, (done) => {
+    spyOn(authConfigService, 'getOAuthLibConfig').and.returnValue({
+      disablePKCE: false,
+    });
+
+    spyOn(authHeaderService, 'handleExpiredAccessToken').and.callThrough();
+    spyOn(authHeaderService, 'handleExpiredRefreshToken').and.callThrough();
+
+    const sub: Subscription = http.get('/occ').subscribe({
+      error: (err) => {
+        expect(err.status).toEqual(401);
+        expect(
+          authHeaderService.handleExpiredAccessToken
+        ).not.toHaveBeenCalled();
+        expect(
+          authHeaderService.handleExpiredRefreshToken
+        ).not.toHaveBeenCalled();
+        done();
+      },
+    });
+
+    const mockReq: TestRequest = httpMock.expectOne(
+      (req) => req.url === '/occ'
+    );
+
+    mockReq.flush(
+      { errors: [{ message: 'Access is denied' }] },
+      { status: 401, statusText: 'Unauthorized' }
+    );
+
+    sub.unsubscribe();
+  });
 });
diff --git a/projects/core/src/auth/user-auth/http-interceptors/auth.interceptor.ts b/projects/core/src/auth/user-auth/http-interceptors/auth.interceptor.ts
@@ -115,7 +115,12 @@ export class AuthInterceptor implements HttpInterceptor {
   }
 
   protected isExpiredToken(resp: HttpErrorResponse): boolean {
-    if (!this.authConfigService.getOAuthLibConfig().disablePKCE) {
+    const isLogoutProcess =
+      resp.error?.errors?.[0]?.message === 'Access is denied';
+    if (
+      !this.authConfigService.getOAuthLibConfig().disablePKCE &&
+      !isLogoutProcess
+    ) {
       return resp.error?.errors?.[0]?.type === 'AccessDeniedError';
     }
     return resp.error?.errors?.[0]?.type === 'InvalidTokenError';