From 9ab0b9553c70761500dbae219779a901633fda12 Mon Sep 17 00:00:00 2001
From: _Bastler <_Bastler@bstly.de>
Date: Wed, 19 May 2021 21:10:54 +0200
Subject: [PATCH] fix 2FA

---
 .../form-login-totp/form-login-totp.component.html     |  5 ++++-
 .../pages/form-login-totp/form-login-totp.component.ts | 10 ++++++++--
 src/app/pages/form-login/form-login.component.ts       |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/form-login-totp/form-login-totp.component.html b/src/app/pages/form-login-totp/form-login-totp.component.html
index fa2a9d3..fa2cab8 100644
--- a/src/app/pages/form-login-totp/form-login-totp.component.html
+++ b/src/app/pages/form-login-totp/form-login-totp.component.html
@@ -1,4 +1,4 @@
-<form action="{{apiUrl}}/auth/formlogin/totp" method="POST" #totpForm>
+<form action="{{apiUrl}}/auth/login/totp" method="POST" #totpForm>
     <mat-card>
         <mat-card-content>
             <h2>{{'security.2fa.totp.external' | i18n}}<mat-icon style="font-size: 1em;">open_in_new
@@ -13,6 +13,9 @@
                     {{'security.2fa.totp.missing' | i18n}}
                 </mat-error>
             </mat-form-field>
+            <mat-slide-toggle id="keep" name="keep" [checked]="keep" >
+                {{'login.keepSession' | i18n}}
+            </mat-slide-toggle>
         </mat-card-content>
         <mat-card-actions>
             <button type="submit" mat-raised-button color="primary" (click)="totpForm.submit()"
diff --git a/src/app/pages/form-login-totp/form-login-totp.component.ts b/src/app/pages/form-login-totp/form-login-totp.component.ts
index 07b0471..6664694 100644
--- a/src/app/pages/form-login-totp/form-login-totp.component.ts
+++ b/src/app/pages/form-login-totp/form-login-totp.component.ts
@@ -1,6 +1,5 @@
 import {Component, OnInit} from '@angular/core';
-import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {ActivatedRoute} from '@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 
 import {environment} from '../../../environments/environment';
 
@@ -12,15 +11,22 @@ import {environment} from '../../../environments/environment';
 export class FormLoginTotpComponent implements OnInit {
 
   loginInvalid: boolean;
+  keep: boolean = false;
   apiUrl = environment.apiUrl;
 
   constructor(
+    private router: Router,
     private route: ActivatedRoute) {}
 
   async ngOnInit() {
     this.route.queryParams.subscribe(params => {
       if(params['error'] || params['error'] == '') {
         this.loginInvalid = true;
+        this.router.navigate([], {queryParams: {error: null}, queryParamsHandling: 'merge'});
+      }
+      if(params['keep'] || params['keep'] == '') {
+        this.keep = true;
+        this.router.navigate([], {queryParams: {keep: null}, queryParamsHandling: 'merge'});
       }
     });
   }
diff --git a/src/app/pages/form-login/form-login.component.ts b/src/app/pages/form-login/form-login.component.ts
index 0a5a474..4f5cbdd 100644
--- a/src/app/pages/form-login/form-login.component.ts
+++ b/src/app/pages/form-login/form-login.component.ts
@@ -27,6 +27,7 @@ export class FormLoginComponent implements OnInit {
       }
       if(params['error'] || params['error'] == '') {
         this.loginInvalid = true;
+        this.router.navigate([], {queryParams: {error: null}, queryParamsHandling: 'merge'});
       }
     });