feature/msal-angular/msal-guard-stricter: fix some testing

AzureAD · Jul 4, 2024 · 736fcea · 736fcea
1 parent 4064f4f
commit 736fcea
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 21 deletions.
diff --git a/lib/msal-angular/src/msal.guard.spec.ts b/lib/msal-angular/src/msal.guard.spec.ts
@@ -7,20 +7,22 @@ import {
  AccountInfo,
  AuthenticationResult,
  BrowserSystemOptions,
+ InteractionStatus,
  InteractionType,
  IPublicClientApplication,
  LogLevel,
  PublicClientApplication,
  UrlString,
 } from "@azure/msal-browser";
-import { of } from "rxjs";
+import { BehaviorSubject, of } from "rxjs";
 import {
  MsalModule,
  MsalGuard,
  MsalService,
  MsalBroadcastService,
 } from "./public-api";
 import { MsalGuardConfiguration } from "./msal.guard.config";
+import { bootstrapApplication } from "@angular/platform-browser";
 
 let guard: MsalGuard;
 let authService: MsalService;
@@ -388,14 +390,12 @@ describe("MsalGuard", () => {
 
  it("returns false for option enableCheckForExpiredToken is true and token is expired and silentRefresh fails", (done) => {
  enableCheckForExpiredToken = true;
+ silentAuthRequest = {};
  initializeMsal();
 
- authService.handleRedirectObservable().subscribe();
-
- spyOn(MsalService.prototype, "handleRedirectObservable").and.returnValue(
- //@ts-ignore
- of("test")
- );
+ authService.handleRedirectObservable().subscribe((result) => {
+ console.log("handleRedirectObservable result", result);
+ });
 
  spyOn(
  PublicClientApplication.prototype,
@@ -410,6 +410,8 @@ describe("MsalGuard", () => {
  of({ accessToken: undefined } as AuthenticationResult)
  );
 
+ spyOn(guard as any, "loginInteractively").and.returnValue(of(false));
+
  guard.canActivate(routeMock, routeStateMock).subscribe((result) => {
  expect(result).toBeFalse();
  done();
@@ -419,14 +421,12 @@ describe("MsalGuard", () => {
  it("returns false for option enableCheckForExpiredToken is true and token is not expired but not within minimumSecondsBeforeTokenExpiration and silentRefresh fails", (done) => {
  enableCheckForExpiredToken = true;
  minimumSecondsBeforeTokenExpiration = 60;
+ silentAuthRequest = {};
  initializeMsal();
 
- authService.handleRedirectObservable().subscribe();
-
- spyOn(MsalService.prototype, "handleRedirectObservable").and.returnValue(
- //@ts-ignore
- of("test")
- );
+ authService.handleRedirectObservable().subscribe((result) => {
+ console.log("handleRedirectObservable result", result);
+ });
 
  spyOn(
  PublicClientApplication.prototype,
@@ -441,6 +441,8 @@ describe("MsalGuard", () => {
  of({ accessToken: undefined } as AuthenticationResult)
  );
 
+ spyOn(guard as any, "loginInteractively").and.returnValue(of(false));
+
  guard.canActivate(routeMock, routeStateMock).subscribe((result) => {
  expect(result).toBeFalse();
  done();
@@ -452,12 +454,9 @@ describe("MsalGuard", () => {
  silentAuthRequest = {}; // set silentauth request or it will not be tried
  initializeMsal();
 
- authService.handleRedirectObservable().subscribe();
-
- spyOn(MsalService.prototype, "handleRedirectObservable").and.returnValue(
- //@ts-ignore
- of("test")
- );
+ authService.handleRedirectObservable().subscribe((result) => {
+ console.log("handleRedirectObservable result", result);
+ });
 
  spyOn(
  PublicClientApplication.prototype,

diff --git a/lib/msal-angular/src/msal.guard.ts b/lib/msal-angular/src/msal.guard.ts
@@ -353,8 +353,17 @@ export class MsalGuard {
  return this.authService.acquireTokenSilent(silentRequest);
  }),
  map((authResult) => {
- this.authService.getLogger().info("Guard - silent refresh succeeded");
- return !!authResult.accessToken;
+ if (!!authResult.accessToken) {
+ this.authService
+ .getLogger()
+ .info("Guard - silent refresh succeeded");
+ return true;
+ } else {
+ this.authService
+ .getLogger()
+ .warning("Guard - silent refresh did not return a token");
+ return false;
+ }
  }),
  catchError((err) => {
  this.authService