Merge pull request #1961 from jagipas/fix-issue-1954

Fix issue #1954: Ensure CheckingAuthFinished event fires regardless of authentication state
damienbod · Jun 11, 2024 · 6f3fa8e · 6f3fa8e
2 parents dfe5500 + 1297d9c
commit 6f3fa8e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/projects/angular-auth-oidc-client/src/lib/auth-state/check-auth.service.spec.ts b/projects/angular-auth-oidc-client/src/lib/auth-state/check-auth.service.spec.ts
@@ -608,6 +608,28 @@ describe('CheckAuthService', () => {
         ]);
       });
     }));
+
+    it('fires CheckingAuth-Event on start and finished event on end if not authenticated', waitForAsync(() => {
+      const allConfigs = [
+        { configId: 'configId1', authority: 'some-authority' },
+      ];
+
+      spyOn(currentUrlService, 'getCurrentUrl').and.returnValue(
+        'http://localhost:4200'
+      );
+      spyOn(authStateService, 'areAuthStorageTokensValid').and.returnValue(
+        false
+      );
+
+      const fireEventSpy = spyOn(publicEventsService, 'fireEvent');
+
+      checkAuthService.checkAuth(allConfigs[0], allConfigs).subscribe(() => {
+        expect(fireEventSpy.calls.allArgs()).toEqual([
+          [EventTypes.CheckingAuth],
+          [EventTypes.CheckingAuthFinished],
+        ]);
+      });
+    }));
   });
 
   describe('checkAuthIncludingServer', () => {

diff --git a/projects/angular-auth-oidc-client/src/lib/auth-state/check-auth.service.ts b/projects/angular-auth-oidc-client/src/lib/auth-state/check-auth.service.ts
@@ -257,9 +257,8 @@ export class CheckAuthService {
             this.authStateService.setAuthenticatedAndFireEvent(allConfigs);
             this.userService.publishUserDataIfExists(config, allConfigs);
           }
-
-          this.publicEventsService.fireEvent(EventTypes.CheckingAuthFinished);
         }
+        this.publicEventsService.fireEvent(EventTypes.CheckingAuthFinished);
 
         const result: LoginResponse = {
           isAuthenticated,