From 16d2503d979ba0f9efe6c67b265004a06dacb9ea Mon Sep 17 00:00:00 2001
From: _Bastler <git@bstly.de>
Date: Fri, 17 Jan 2025 10:18:01 +0100
Subject: [PATCH] fix autologin on fail

---
 package-lock.json                 | 4 ++--
 package.json                      | 2 +-
 src/app/auth/auth.guard.ts        | 1 +
 src/app/pages/login/login.page.ts | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fbaf4ca..7889bd8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "bstlboard",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "bstlboard",
-      "version": "2.2.0",
+      "version": "2.2.1",
       "license": "AGPL3",
       "dependencies": {
         "@angular/animations": "^17.3.1",
diff --git a/package.json b/package.json
index 42c12c9..e3346ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bstlboard",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "license": "AGPL3",
   "scripts": {
     "ng": "ng",
diff --git a/src/app/auth/auth.guard.ts b/src/app/auth/auth.guard.ts
index ec611d4..bda5e37 100644
--- a/src/app/auth/auth.guard.ts
+++ b/src/app/auth/auth.guard.ts
@@ -78,6 +78,7 @@ export class AuthenticatedGuard implements CanActivate {
             return true;
         }).catch(function (error) {
             if (error instanceof RequestError && (error as RequestError).getResponse().status == 401) {
+                localStorage.removeItem("bstlboard.autologin");
                 return that.router.navigateByUrl(that.router.parseUrl('/login?target=' + encodeURIComponent(state.url)), { skipLocationChange: true, replaceUrl: true });
             }
 
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 3a0ff01..f3b875d 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -38,10 +38,12 @@ export class PageLogin implements OnInit {
         }
         if (params['error'] || params['error'] == '') {
           this.loginInvalid = true;
+          localStorage.removeItem("bstlboard.autologin");
           this.router.navigate([], { queryParams: { error: null }, queryParamsHandling: 'merge', replaceUrl: true });
         }
         if (params['externalError'] || params['externalError'] == '') {
           this.externalLoginInvalid = true;
+          localStorage.removeItem("bstlboard.autologin");
           this.router.navigate([], { queryParams: { externalError: null }, queryParamsHandling: 'merge', replaceUrl: true });
         }
       }