remove getAuthenticationState

ui/src/app/account/service/account.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { SessionStorageService } from 'ngx-webstorage'
 import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'
 import { BehaviorSubject, EMPTY, Observable, Subject, catchError, map, of, takeUntil, tap } from 'rxjs'
 
 import { SERVER_API_URL } from '../../../app/app.constants'
 import { IAccount } from '../model/account.model'
@@ -14,7 +14,7 @@
   private isFetchingAccountData = false
   private stopFetchingAccountData = new Subject()
   private authenticated = false
   private authenticationState = new BehaviorSubject<any>(null)
   private logoutAsResourceUrl = SERVER_API_URL + 'services/userservice/api'
 
   constructor(
@@ -137,10 +137,6 @@
     return this.accountData.value !== undefined
   }
 
-  getAuthenticationState(): Observable<any> {
-    return this.accountData.asObservable()
-  }
-
   getImageUrl(): string | null {
     return this.isIdentityResolved() ? this.accountData.value!.imageUrl : null
   }

ui/src/app/layout/navbar/navbar.component.spec.ts

@@ -24,7 +24,6 @@ describe('NavbarComponent', () => {
       'getAccountData',
       'isAuthenticated',
       'hasAnyAuthority',
-      'getAuthenticationState',
       'isLoggedAs',
       'isOrganizationOwner',
       'getImageUrl',
@@ -60,7 +59,7 @@ describe('NavbarComponent', () => {
     accountService.isOrganizationOwner.and.returnValue(false)
     accountService.getImageUrl.and.returnValue(null)
     accountService.getSalesforceId.and.returnValue('sfid')
-    accountService.getAuthenticationState.and.returnValue(
+    accountService.getAccountData.and.returnValue(
       of({
         activated: true,
         authorities: ['ROLE_USER'],
@@ -105,7 +104,7 @@ describe('NavbarComponent', () => {
     accountService.isOrganizationOwner.and.returnValue(false)
     accountService.getImageUrl.and.returnValue(null)
     accountService.getSalesforceId.and.returnValue('sfid')
-    accountService.getAuthenticationState.and.returnValue(
+    accountService.getAccountData.and.returnValue(
       of({
         activated: true,
         authorities: ['ROLE_USER', 'ROLE_CONSORTIUM_LEAD'],
@@ -143,7 +142,7 @@ describe('NavbarComponent', () => {
     accountService.isOrganizationOwner.and.returnValue(false)
     accountService.getImageUrl.and.returnValue(null)
     accountService.getSalesforceId.and.returnValue('sfid')
-    accountService.getAuthenticationState.and.returnValue(
+    accountService.getAccountData.and.returnValue(
       of({
         activated: true,
         authorities: ['ROLE_USER', 'ASSERTION_SERVICE_ENABLED'],

ui/src/app/layout/navbar/navbar.component.ts

@@ -61,10 +61,9 @@ export class NavbarComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.accountService.getAuthenticationState().subscribe(() => {
+    this.accountService.getAccountData().subscribe(() => {
       if (!this.memberCallDone && this.isAuthenticated() && this.hasRoleUser()) {
         this.memberCallDone = true
-
         const salesforceId = this.accountService.getSalesforceId()
         if (salesforceId) {
           this.memberService.find(salesforceId).subscribe({

ui/src/app/shared/directive/has-any-authority.directive.ts

@@ -29,7 +29,7 @@ export class HasAnyAuthorityDirective {
     this.authorities = typeof value === 'string' ? [value] : value
     this.updateView()
     // Get notified each time authentication state changes.
-    this.accountService.getAuthenticationState().subscribe((identity) => this.updateView())
+    this.accountService.getAccountData().subscribe((identity) => this.updateView())
   }
 
   private updateView(): void {