Only resolve login process on success

swisstopo · Jul 11, 2024 · bd3f7dd · bd3f7dd
1 parent 7a896de
commit bd3f7dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/apps/client-asset-sg/src/app/components/splash-screen/splash-screen.component.html b/apps/client-asset-sg/src/app/components/splash-screen/splash-screen.component.html
@@ -8,7 +8,7 @@
   />
   <div class="text">
     <p class="welcome">{{ "welcomeTo" | translate }} {{ host }}</p>
-    <p class="system">Asset Data Management System</p>
+    <p class="system">Assets</p>
   </div>
   <ng-container [ngSwitch]="authService.state$ | async">
     <ng-container *ngSwitchCase="AuthState.Ongoing">

diff --git a/libs/auth/src/lib/services/auth.service.ts b/libs/auth/src/lib/services/auth.service.ts
@@ -39,9 +39,11 @@ export class AuthService {
   async signIn(): Promise<void> {
     try {
       if (this.state.value === AuthState.Ongoing) {
-        await this.oauthService.loadDiscoveryDocumentAndLogin();
-        this.oauthService.setupAutomaticSilentRefresh();
-        this.state.next(AuthState.Success);
+        const success = await this.oauthService.loadDiscoveryDocumentAndLogin();
+        if (success) {
+          this.oauthService.setupAutomaticSilentRefresh();
+          this.state.next(AuthState.Success);
+        }
       } else {
         this.state.next(AuthState.Ongoing);
         this.oauthService.initLoginFlow();