Update login form after success

Web-tree · Dec 11, 2020 · 1a9fe79 · 1a9fe79
1 parent bf14955
commit 1a9fe79
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/login/login.component.html b/src/login/login.component.html
@@ -32,7 +32,7 @@ <h2>Login</h2>
       <button mat-raised-button color="primary" [disabled]="loading" class="btn btn-primary">Login</button>
       <img *ngIf="loading"
            src="data:image/gif;base64,R0lGODlhEAAQAPIAAP///wAAAMLCwkJCQgAAAGJiYoKCgpKSkiH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCgAAACwAAAAAEAAQAAADMwi63P4wyklrE2MIOggZnAdOmGYJRbExwroUmcG2LmDEwnHQLVsYOd2mBzkYDAdKa+dIAAAh+QQJCgAAACwAAAAAEAAQAAADNAi63P5OjCEgG4QMu7DmikRxQlFUYDEZIGBMRVsaqHwctXXf7WEYB4Ag1xjihkMZsiUkKhIAIfkECQoAAAAsAAAAABAAEAAAAzYIujIjK8pByJDMlFYvBoVjHA70GU7xSUJhmKtwHPAKzLO9HMaoKwJZ7Rf8AYPDDzKpZBqfvwQAIfkECQoAAAAsAAAAABAAEAAAAzMIumIlK8oyhpHsnFZfhYumCYUhDAQxRIdhHBGqRoKw0R8DYlJd8z0fMDgsGo/IpHI5TAAAIfkECQoAAAAsAAAAABAAEAAAAzIIunInK0rnZBTwGPNMgQwmdsNgXGJUlIWEuR5oWUIpz8pAEAMe6TwfwyYsGo/IpFKSAAAh+QQJCgAAACwAAAAAEAAQAAADMwi6IMKQORfjdOe82p4wGccc4CEuQradylesojEMBgsUc2G7sDX3lQGBMLAJibufbSlKAAAh+QQJCgAAACwAAAAAEAAQAAADMgi63P7wCRHZnFVdmgHu2nFwlWCI3WGc3TSWhUFGxTAUkGCbtgENBMJAEJsxgMLWzpEAACH5BAkKAAAALAAAAAAQABAAAAMyCLrc/jDKSatlQtScKdceCAjDII7HcQ4EMTCpyrCuUBjCYRgHVtqlAiB1YhiCnlsRkAAAOwAAAAAAAAAAAA=="/>
-      <a mat-raised-button [routerLink]="['/register']" class="btn btn-link">Register</a>
+      <a mat-raised-button [routerLink]="['/register']" [disabled]="loading" class="btn btn-link">Register</a>
     </div>
   </form>
   </div>

diff --git a/src/login/login.component.ts b/src/login/login.component.ts
@@ -34,7 +34,7 @@ export class LoginComponent implements OnInit {
 
   async ngOnInit() {
     this.returnUnion = this.route.snapshot.queryParams.returnUnion;
-    this.loggedIn = await this.authenticationService.isAuthorized();
+    await this.updateIsLoginField();
     this.redirectIfNeeded();
   }
 
@@ -43,10 +43,13 @@ export class LoginComponent implements OnInit {
     const user: User = {username: this.model.username, password: sha512(this.model.password)};
     this.authenticationService.login(user)
       .subscribe(
-        res => {
+        async res => {
           this.tokenService.saveToken(JSON.parse(res).token);
           this.alertService.success('Logged in successfully');
-          this.redirectIfNeeded();
+          if (!this.redirectIfNeeded()) {
+            await this.updateIsLoginField();
+            this.loading = false;
+          }
         },
         error => {
           this.loading = false;
@@ -60,6 +63,10 @@ export class LoginComponent implements OnInit {
       );
   }
 
+  private async updateIsLoginField() {
+    this.loggedIn = await this.authenticationService.isAuthorized();
+  }
+
   getToken(): string {
     return this.tokenService.getToken();
   }
@@ -71,6 +78,9 @@ export class LoginComponent implements OnInit {
       } else {
         this.alertService.error('Unknown union ' + this.returnUnion);
       }
+      return true;
+    } else {
+      return false;
     }
   }