From f5e7460eb89f32564377133d913f14a30ba9136c Mon Sep 17 00:00:00 2001
From: nk-coding <niklask.coding@gmail.com>
Date: Fri, 19 Jul 2024 09:57:16 +0200
Subject: [PATCH] bugfixes

---
 .../strategy/strategy-instances.controller.ts   |  1 -
 backend/src/strategies/StrategyUsingPassport.ts | 17 +----------------
 frontend/src/components/BaseLayout.vue          | 16 ++++++----------
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/backend/src/api-login/strategy/strategy-instances.controller.ts b/backend/src/api-login/strategy/strategy-instances.controller.ts
index 1e617d7c..be443bde 100644
--- a/backend/src/api-login/strategy/strategy-instances.controller.ts
+++ b/backend/src/api-login/strategy/strategy-instances.controller.ts
@@ -1,5 +1,4 @@
 import {
-    All,
     Body,
     Controller,
     Delete,
diff --git a/backend/src/strategies/StrategyUsingPassport.ts b/backend/src/strategies/StrategyUsingPassport.ts
index 70eec538..2d6236e8 100644
--- a/backend/src/strategies/StrategyUsingPassport.ts
+++ b/backend/src/strategies/StrategyUsingPassport.ts
@@ -33,8 +33,6 @@ export abstract class StrategyUsingPassport extends Strategy {
         );
     }
 
-    private readonly passportInstances: Map<string, passport.Strategy> = new Map();
-
     abstract createPassportStrategyInstance(strategyInstance: StrategyInstance): passport.Strategy;
 
     protected getAdditionalPassportOptions(
@@ -44,19 +42,6 @@ export abstract class StrategyUsingPassport extends Strategy {
         return {};
     }
 
-    getPassportStrategyInstanceFor(strategyInstance: StrategyInstance): passport.Strategy {
-        if (this.passportInstances.has(strategyInstance.id)) {
-            return this.passportInstances.get(strategyInstance.id);
-        } else {
-            const newInstance = this.createPassportStrategyInstance(strategyInstance);
-            this.logger.debug(
-                `Created new passport strategy for strategy ${this.typeName}, instance: ${strategyInstance.id}`,
-            );
-            this.passportInstances.set(strategyInstance.id, newInstance);
-            return newInstance;
-        }
-    }
-
     public override async performAuth(
         strategyInstance: StrategyInstance,
         state: (AuthStateServerData & OAuthAuthorizeServerState) | undefined,
@@ -64,7 +49,7 @@ export abstract class StrategyUsingPassport extends Strategy {
         res: any,
     ): Promise<PerformAuthResult> {
         return new Promise((resolve, reject) => {
-            const passportStrategy = this.getPassportStrategyInstanceFor(strategyInstance);
+            const passportStrategy = this.createPassportStrategyInstance(strategyInstance)
             const jwtService = this.stateJwtService;
             passport.authenticate(
                 passportStrategy,
diff --git a/frontend/src/components/BaseLayout.vue b/frontend/src/components/BaseLayout.vue
index 03a274a4..0290e5d6 100644
--- a/frontend/src/components/BaseLayout.vue
+++ b/frontend/src/components/BaseLayout.vue
@@ -2,19 +2,15 @@
     <div class="root h-100 w-100 d-flex flex-column">
         <div class="header d-flex align-center my-2">
             <div class="ml-5">
-                <router-link to="/">
-                    <v-btn class="d-flex" variant="text" icon size="small">
-                        <img src="@/assets/logo.svg" width="40" />
-                    </v-btn>
-                </router-link>
+                <v-btn class="d-flex" variant="text" icon size="small">
+                    <img src="@/assets/logo.svg" width="40" />
+                </v-btn>
             </div>
             <slot name="header-title">
                 <div class="d-flex align-center">
-                    <router-link to="/">
-                        <v-btn variant="text" class="px-1" min-width="0" rounded="lger">
-                            <span class="text-h6">Gropius</span>
-                        </v-btn>
-                    </router-link>
+                    <v-btn variant="text" class="px-1" min-width="0" rounded="lger">
+                        <span class="text-h6">Gropius</span>
+                    </v-btn>
                 </div>
             </slot>
             <v-spacer />