Fix logout flow

src/app/api/api-client.ts

@@ -144,12 +144,10 @@ export class ApiClient {
     this._userId = undefined;
     this.user = undefined;
 
-    localStorage.removeItem('game_token');
-
     this.userWatcher.emit(undefined);
-    this.makeRequest("POST", "logout", {})
-      .subscribe(() => {
-      }); // Need to subscribe for request to fire
+    this.makeRequest("PUT", "logout", {}).subscribe();
+
+    localStorage.removeItem('game_token');
   }
 
   public ResetPassword(username: string, passwordSha512: string, signIn: boolean = false): void {
@@ -163,7 +161,7 @@ export class ApiClient {
       resetToken: this.resetToken,
     }
 
-    this.makeRequest("POST", "resetPassword", body)
+    this.makeRequest("PUT", "resetPassword", body)
       .subscribe(() => {
         if (signIn) this.LogIn(username, passwordSha512);
         this.bannerService.push({

src/app/pages/login/login.component.ts

@@ -2,20 +2,22 @@ import { Component } from '@angular/core';
 import { ApiClient } from 'src/app/api/api-client';
 import { sha512Async } from 'src/app/hash';
 
+let i: number = 0;
+
 @Component({
   selector: 'app-login',
   templateUrl: './login.component.html'
 })
 export class LoginComponent {
-  usernameId: string = "login-username"
-  passwordId: string = "login-password"
+  usernameId: string = "login-username" + i++;
+  passwordId: string = "login-password" + i++;
 
   constructor(private apiClient: ApiClient) {}
 
   login() {
     const usernameInput: string = (<HTMLInputElement>document.getElementById(this.usernameId)).value;
     const passwordInput: string = (<HTMLInputElement>document.getElementById(this.passwordId)).value;
-    
+
     sha512Async(passwordInput).then((hash) => {
       this.apiClient.LogIn(usernameInput, hash)
     });