From 0e4725d33c6544cec464e519663416d197ba92fa Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Sat, 22 Nov 2025 15:41:22 -0500
Subject: [PATCH] corrected old env names and fixed logout redirect

---
 api/.env.example       |  2 +-
 api/src/routes/auth.js | 12 ++++++------
 ui/.env.example        |  2 +-
 ui/src/App.vue         |  9 +++++----
 ui/src/router/index.js |  2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/api/.env.example b/api/.env.example
index dd67aa1..39cf55c 100644
--- a/api/.env.example
+++ b/api/.env.example
@@ -16,4 +16,4 @@ AUTH_REVOCATION_URI=
 
 # SERVER SETTINGS
 SERVER_PORT=3000
-
+CLIENT_URL=
\ No newline at end of file
diff --git a/api/src/routes/auth.js b/api/src/routes/auth.js
index 2c3f1f4..dd9c338 100644
--- a/api/src/routes/auth.js
+++ b/api/src/routes/auth.js
@@ -69,7 +69,7 @@ router.get('/login', (req, res, next) => {
 // router.get('/callback', (req, res, next) => {
 //     passport.authenticate('openidconnect', {
 //         successRedirect: req.session.redirectTo,
-//         failureRedirect: process.env.BASE_URL
+//         failureRedirect: process.env.CLIENT_URL
 //     })
 // });
 
@@ -77,27 +77,27 @@ router.get('/callback', (req, res, next) => {
     const redirectURI = req.session.redirectTo;
     passport.authenticate('openidconnect', (err, user) => {
         if (err) return next(err);
-        if (!user) return res.redirect(process.env.BASE_URL);
+        if (!user) return res.redirect(process.env.CLIENT_URL);
 
         req.logIn(user, err => {
             if (err) return next(err);
 
             // Use redirect saved from session
-            const redirectTo = redirectURI || process.env.BASE_URL;
+            const redirectTo = redirectURI || process.env.CLIENT_URL;
             delete req.session.redirectTo;
             return res.redirect(redirectTo);
         });
     })(req, res, next);
 });
 
-router.post('/logout', function (req, res, next) {
+router.get('/logout', function (req, res, next) {
     req.logout(function (err) {
         if (err) { return next(err); }
         var params = {
             client_id: process.env.AUTH_CLIENT_ID,
-            returnTo: process.env.BASE_URL
+            returnTo: process.env.CLIENT_URL
         };
-        res.redirect(process.env.AUTH_DOMAIN + '/v2/logout?' + querystring.stringify(params));
+        res.redirect(process.env.AUTH_END_SESSION_URI + '?' + querystring.stringify(params));
     });
 });
 
diff --git a/ui/.env.example b/ui/.env.example
index ac971e4..380469b 100644
--- a/ui/.env.example
+++ b/ui/.env.example
@@ -1,2 +1,2 @@
 # SITE SETTINGS
-BASE_URL=
+VITE_APIHOST=
diff --git a/ui/src/App.vue b/ui/src/App.vue
index 7277bc0..9ccfa8d 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -27,12 +27,13 @@ const userStore = useUserStore();
 const APIHOST = import.meta.env.VITE_APIHOST;
 
 async function logout() {
-  await fetch(`${APIHOST}/logout`, {
-    method: 'POST',
-    credentials: 'include',
-  });
+  // await fetch(`${APIHOST}/logout`, {
+  //   method: 'GET',
+  //   credentials: 'include',
+  // });
 
   userStore.user = null;
+  window.location.href = APIHOST + "/logout";
 }
 
 function formatDate(dateStr) {
diff --git a/ui/src/router/index.js b/ui/src/router/index.js
index 4aeb90c..85494d3 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -2,7 +2,7 @@ import { useUserStore } from '@/stores/user'
 import { createRouter, createWebHistory } from 'vue-router'
 
 const router = createRouter({
-  history: createWebHistory(import.meta.env.BASE_URL),
+  history: createWebHistory(import.meta.env.VITE_APIHOST),
   routes: [
     // PUBLIC
     { path: '/join', component: () => import('@/pages/Join.vue') },