remove double backend call on first visit

ORCID · Feb 8, 2024 · e60495b · e60495b
1 parent 2de390e
commit e60495b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ui/src/app/account/login/login.component.ts b/ui/src/app/account/login/login.component.ts
@@ -81,7 +81,7 @@ export class LoginComponent implements AfterViewInit, OnDestroy {
             if (!data.mfaRequired) {
               this.showMfa = false
               this.accountService
-                .getAccountData()
+                .getAccountData(true)
                 .pipe(
                   filter((account) => !!account),
                   take(1)

diff --git a/ui/src/app/account/service/account.service.ts b/ui/src/app/account/service/account.service.ts
@@ -11,6 +11,7 @@ import { Router } from '@angular/router'
 
 @Injectable({ providedIn: 'root' })
 export class AccountService {
+  // TODO: have unknown and offline instead of undefined and null
   private accountData = new BehaviorSubject<IAccount | null | undefined>(undefined)
   private isFetchingAccountData = false
   private stopFetchingAccountData = new Subject()
@@ -138,7 +139,7 @@ export class AccountService {
       //this.memberService.memberData.next(undefined);
       this.stopFetchingAccountData.next(true)
     }
-    if ((!this.accountData.value && !this.isFetchingAccountData) || force) {
+    if ((this.accountData.value === undefined && !this.isFetchingAccountData) || force) {
       this.isFetchingAccountData = true
       this.fetchAccountData().subscribe()
     }