responded to feedback

Author: salman90

2-Authorization-I/1-call-graph/SPA/src/app/account-switch/account-switch.component.ts

@@ -29,17 +29,16 @@ export class AccountSwitchComponent implements OnInit {
 
  switchAccount(account: AccountInfo | null) {
  const activeAccount = this.authService.instance.getActiveAccount();
+ this.authService.instance.setActiveAccount(account);
  if (!account) {
- this.authService.instance.setActiveAccount(account);
  this.authService.instance.loginRedirect({
  ...this.msalGuardConfig.authRequest,
  prompt: 'login',
  } as RedirectRequest);
  } else if (
  account &&
- activeAccount?.homeAccountId != account.homeAccountId
+ activeAccount?.homeAccountId !== account.homeAccountId
  ) {
- this.authService.instance.setActiveAccount(account);
  this.authService.instance
  .ssoSilent({
  ...this.msalGuardConfig.authRequest,

2-Authorization-I/1-call-graph/SPA/src/app/app.component.ts

@@ -1,12 +1,19 @@
 import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
-import { MsalService, MsalBroadcastService, MSAL_GUARD_CONFIG, MsalGuardConfiguration } from '@azure/msal-angular';
+import {
+ MsalService,
+ MsalBroadcastService,
+ MSAL_GUARD_CONFIG,
+ MsalGuardConfiguration,
+} from '@azure/msal-angular';
 import {
  AuthenticationResult,
  InteractionStatus,
  InteractionType,
  PopupRequest,
  RedirectRequest,
  AccountInfo,
+ EventMessage,
+ EventType
 } from '@azure/msal-browser';
 import { Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
@@ -55,6 +62,31 @@ export class AppComponent implements OnInit, OnDestroy {
  this.setLoginDisplay();
  this.checkAndSetActiveAccount();
  });
+
+ this.msalBroadcastService.msalSubject$
+ .pipe(
+ filter(
+ (msg: EventMessage) => msg.eventType === EventType.LOGOUT_SUCCESS
+ ),
+ takeUntil(this._destroying$)
+ )
+ .subscribe((result: EventMessage) => {
+ this.setLoginDisplay();
+ this.checkAndSetActiveAccount();
+ });
+
+
+ this.msalBroadcastService.msalSubject$
+ .pipe(
+ filter(
+ (msg: EventMessage) => msg.eventType === EventType.LOGIN_SUCCESS
+ ),
+ takeUntil(this._destroying$)
+ )
+ .subscribe((result: EventMessage) => {
+ const payload = result.payload as AuthenticationResult;
+ this.authService.instance.setActiveAccount(payload.account);
+ });
  }
 
  setLoginDisplay() {
@@ -124,7 +156,9 @@ export class AppComponent implements OnInit, OnDestroy {
 
  logout() {
  clearStorage(this.authService.instance.getActiveAccount());
- this.authService.logout();
+ this.authService.logout({
+ account: this.authService.instance.getActiveAccount(),
+ });
  }
 
  // unsubscribe to events when component is destroyed

2-Authorization-I/1-call-graph/SPA/src/app/home/home.component.ts

@@ -30,18 +30,7 @@ export class HomeComponent implements OnInit {
  ) {}
 
  ngOnInit(): void {
- this.msalBroadcastService.msalSubject$
- .pipe(
- filter(
- (msg: EventMessage) => msg.eventType === EventType.LOGIN_SUCCESS
- ),
- takeUntil(this._destroying$)
- )
- .subscribe((result: EventMessage) => {
- const payload = result.payload as AuthenticationResult;
- this.authService.instance.setActiveAccount(payload.account);
- });
-
+ 
  this.msalBroadcastService.inProgress$
  .pipe(
  filter((status: InteractionStatus) => status === InteractionStatus.None)