From 99e3f12c24e6392d9646e4141df03d382d74ca61 Mon Sep 17 00:00:00 2001
From: joker-x <ivan@sinanimodelucro.org>
Date: Mon, 7 Sep 2020 16:10:05 +0200
Subject: [PATCH] Remove CAS logout from client login

---
 client/src/login/Login.js | 24 +++++++-----------------
 server/lib/passport.js    |  2 +-
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/client/src/login/Login.js b/client/src/login/Login.js
index 4f562279..8559467f 100644
--- a/client/src/login/Login.js
+++ b/client/src/login/Login.js
@@ -128,23 +128,13 @@ export default class Login extends Component {
             </div>
           );
         } else {
-          if (mailtrainConfig.isAuthenticated) {
-            return (
-              <div>
-                 <Title>{t('logOut')} CAS</Title>
-                 {<a href="/cas/logout" class="btn btn-primary">{t('logOut')}</a>}
-                 {passwordResetLink}
-              </div>
-            );
-          } else {
-            return (
-              <div>
-                <Title>{t('signIn')} CAS</Title>
-                {<a href="/cas/login" class="btn btn-primary">{t('signIn')}</a>}
-                {passwordResetLink}
-               </div>
-             );
-           }
+          return (
+            <div>
+              <Title>{t('signIn')} CAS</Title>
+              {<a href="/cas/login" class="btn btn-primary">{t('signIn')}</a>}
+              {passwordResetLink}
+             </div>
+          );
         }
     }
 }
diff --git a/server/lib/passport.js b/server/lib/passport.js
index c5de995c..7673a0b2 100644
--- a/server/lib/passport.js
+++ b/server/lib/passport.js
@@ -238,7 +238,7 @@ if (CasStrategy) {
 
     module.exports.authenticateCas = passport.authenticate('cas', { failureRedirect: '/login?cas-login-error' });
     module.exports.logoutCas = function (req, res) {
-        cas.logout(req, res, config.www.trustedUrlBase+'/login?cas-logout-success');
+        cas.logout(req, res, config.www.trustedUrlBase+'/?cas-logout-success');
     };
 
 } else if (LdapStrategy) {