Merge pull request #2829 from AzureAD/angular-omit-scopes

[msal-angular] Make scopes optional for msal-guard config
AzureAD · Jan 7, 2021 · fe9bd40 · fe9bd40
2 parents c035396 + cf03114
commit fe9bd40
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/change/@azure-msal-angular-9cb13310-e058-4726-95c6-d0f213107d3a.json b/change/@azure-msal-angular-9cb13310-e058-4726-95c6-d0f213107d3a.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Make scopes optional for msal-guard config (#2829)",
+  "packageName": "@azure/msal-angular",
+  "email": "joarroyo@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/lib/msal-angular/src/msal.guard.config.ts b/lib/msal-angular/src/msal.guard.config.ts
@@ -7,5 +7,5 @@ import { PopupRequest, RedirectRequest,InteractionType } from "@azure/msal-brows
 
 export type MsalGuardConfiguration = {
     interactionType: InteractionType.Popup | InteractionType.Redirect;
-    authRequest?: PopupRequest | Omit<RedirectRequest, "redirectStartPage">;
+    authRequest?: Partial<PopupRequest> | Partial<Omit<RedirectRequest, "redirectStartPage">>;
 };
diff --git a/lib/msal-angular/src/msal.guard.ts b/lib/msal-angular/src/msal.guard.ts
@@ -7,7 +7,7 @@ import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, CanActivateCh
 import { MsalService } from "./msal.service";
 import { Injectable, Inject } from "@angular/core";
 import { Location } from "@angular/common";
-import { InteractionType, BrowserConfigurationAuthError, BrowserUtils, UrlString } from "@azure/msal-browser";
+import { InteractionType, BrowserConfigurationAuthError, BrowserUtils, UrlString, PopupRequest, RedirectRequest } from "@azure/msal-browser";
 import { MsalGuardConfiguration } from "./msal.guard.config";
 import { MSAL_GUARD_CONFIG } from "./constants";
 import { concatMap, catchError, map } from "rxjs/operators";
@@ -51,7 +51,7 @@ export class MsalGuard implements CanActivate, CanActivateChild, CanLoad {
     private loginInteractively(url: string): Observable<boolean> {
         if (this.msalGuardConfig.interactionType === InteractionType.Popup) {
             this.authService.getLogger().verbose("Guard - logging in by popup");
-            return this.authService.loginPopup({ ...this.msalGuardConfig.authRequest })
+            return this.authService.loginPopup({ ...this.msalGuardConfig.authRequest } as PopupRequest)
                 .pipe(
                     map(() => {
                         this.authService.getLogger().verbose("Guard - login by popup successful, can activate");
@@ -66,7 +66,7 @@ export class MsalGuard implements CanActivate, CanActivateChild, CanLoad {
         this.authService.loginRedirect({
             redirectStartPage,
             ...this.msalGuardConfig.authRequest
-        });
+        } as RedirectRequest);
         return of(false);
     }
 

diff --git a/samples/msal-angular-v2-samples/angular10-sample-app/src/app/app.component.ts b/samples/msal-angular-v2-samples/angular10-sample-app/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, Inject, OnDestroy, Injectable } from '@angular/core';
 import { MsalService, MsalBroadcastService, MSAL_GUARD_CONFIG, MsalGuardConfiguration } from '@azure/msal-angular';
-import { EventMessage, EventType, InteractionType } from '@azure/msal-browser';
+import { EventMessage, EventType, InteractionType, PopupRequest, RedirectRequest } from '@azure/msal-browser';
 import { Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
 
@@ -42,10 +42,10 @@ export class AppComponent implements OnInit, OnDestroy {
 
   login() {
     if (this.msalGuardConfig.interactionType === InteractionType.Popup) {
-      this.authService.loginPopup({...this.msalGuardConfig.authRequest})
+      this.authService.loginPopup({...this.msalGuardConfig.authRequest} as PopupRequest)
         .subscribe(() => this.checkAccount());
     } else {
-      this.authService.loginRedirect({...this.msalGuardConfig.authRequest});
+      this.authService.loginRedirect({...this.msalGuardConfig.authRequest} as RedirectRequest);
     }
   }
 

diff --git a/samples/msal-angular-v2-samples/angular11-sample-app/src/app/app.component.ts b/samples/msal-angular-v2-samples/angular11-sample-app/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, Inject, OnDestroy, Injectable } from '@angular/core';
 import { MsalService, MsalBroadcastService, MSAL_GUARD_CONFIG, MsalGuardConfiguration } from '@azure/msal-angular';
-import { EventMessage, EventType, InteractionType } from '@azure/msal-browser';
+import { EventMessage, EventType, InteractionType, PopupRequest, RedirectRequest } from '@azure/msal-browser';
 import { Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
 
@@ -43,15 +43,15 @@ export class AppComponent implements OnInit, OnDestroy {
   login() {
     if (this.msalGuardConfig.interactionType === InteractionType.Popup) {
       if (this.msalGuardConfig.authRequest){
-        this.authService.loginPopup({...this.msalGuardConfig.authRequest})
+        this.authService.loginPopup({...this.msalGuardConfig.authRequest} as PopupRequest)
           .subscribe(() => this.checkAccount());
         } else {
           this.authService.loginPopup()
             .subscribe(() => this.checkAccount());
       }
     } else {
       if (this.msalGuardConfig.authRequest){
-        this.authService.loginRedirect({...this.msalGuardConfig.authRequest});
+        this.authService.loginRedirect({...this.msalGuardConfig.authRequest} as RedirectRequest);
       } else {
         this.authService.loginRedirect();
       }

diff --git a/samples/msal-angular-v2-samples/angular9-v2-sample-app/src/app/app.component.ts b/samples/msal-angular-v2-samples/angular9-v2-sample-app/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, Inject, OnDestroy, Injectable } from '@angular/core';
 import { MsalService, MsalBroadcastService, MSAL_GUARD_CONFIG, MsalGuardConfiguration } from '@azure/msal-angular';
-import { EventMessage, EventType, InteractionType } from '@azure/msal-browser';
+import { EventMessage, EventType, InteractionType, PopupRequest, RedirectRequest } from '@azure/msal-browser';
 import { Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
 
@@ -42,10 +42,10 @@ export class AppComponent implements OnInit, OnDestroy {
 
   login() {
     if (this.msalGuardConfig.interactionType === InteractionType.Popup) {
-      this.authService.loginPopup({...this.msalGuardConfig.authRequest})
+      this.authService.loginPopup({...this.msalGuardConfig.authRequest} as PopupRequest)
         .subscribe(() => this.checkAccount());
     } else {
-      this.authService.loginRedirect({...this.msalGuardConfig.authRequest});
+      this.authService.loginRedirect({...this.msalGuardConfig.authRequest} as RedirectRequest);
     }
   }