Merge pull request #109 from GSA/feature/80_login_gov

Add logout method for login.gov
GSA · Mar 1, 2024 · e0c0c42 · e0c0c42
2 parents e71e9dc + 11dd5d3
commit e0c0c42
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts
@@ -104,10 +104,20 @@ export class HeaderComponent implements OnInit {
   onLogout() {
     const u = new Currentuser('', '', '', '', '', '');
     this.userService.saveUser(u);
-    this.authGuard.isLogin = false;
+    const loginMethod = localStorage.getItem('loginMethod');
     this.app.isLogin = false;
-    this.authService.logout();
-    this.router.navigateByUrl('auth').then();
+    this.authGuard.isLogin = false;
+
+    const logoutURL = this.authService.logout();
+
+    // TODO: Implement when only Login.gov is used
+    if (loginMethod === 'login.gov') {
+      window.location.href = logoutURL;
+    }
+    else {
+      this.router.navigateByUrl('auth').then();
+    }
+
   }
 
   /**

diff --git a/src/app/shared/services/auth.service.ts b/src/app/shared/services/auth.service.ts
@@ -19,6 +19,8 @@ export class AuthService {
 
   private userUrl = environment.SERVER_URL + '/auth/user';
   private loginUrl = environment.SERVER_URL + '/auth/login';
+  private logoutUrl = environment.SERVER_URL + '/logout';
+
   private tokenUrl = environment.SERVER_URL + '/auth/tokenCheck';
   private resetUrl = environment.SERVER_URL + '/auth/resetPassword';
   private authUrl = environment.SERVER_URL + '/auth';
@@ -69,6 +71,8 @@ export class AuthService {
   logout() {
     localStorage.removeItem('token');
     localStorage.clear();
+
+    return this.logoutUrl
   }
 
   /**

diff --git a/src/index.html b/src/index.html
@@ -68,6 +68,8 @@
           if (data.position !== undefined) localStorage.setItem('position', data.position);
           if (data.token !== undefined) localStorage.setItem('token', data.token);
           if (data.userRole !== undefined) localStorage.setItem('userRole', data.userRole);
+          if (data.loginMethod !== undefined) localStorage.setItem('loginMethod', data.loginMethod);
+
           window.location = '/';
       }
       return false;