public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove CAS logout from client login

Browse source
This commit is contained in:
joker-x 2020-09-07 16:10:05 +02:00
parent d02330e601
commit 99e3f12c24
2 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client/src/login/Login.js
View file

@ -128,23 +128,13 @@ export default class Login extends Component {
</div> </div>
); );
} else { } else {
if (mailtrainConfig.isAuthenticated) { return (
return ( <div>
<div> <Title>{t('signIn')} CAS</Title>
<Title>{t('logOut')} CAS</Title> {<a href="/cas/login" class="btn btn-primary">{t('signIn')}</a>}
{<a href="/cas/logout" class="btn btn-primary">{t('logOut')}</a>} {passwordResetLink}
{passwordResetLink} </div>
</div> );
);
} else {
return (
<div>
<Title>{t('signIn')} CAS</Title>
{<a href="/cas/login" class="btn btn-primary">{t('signIn')}</a>}
{passwordResetLink}
</div>
);
}
} }
} }
} }

2
server/lib/passport.js
View file

@ -238,7 +238,7 @@ if (CasStrategy) {
module.exports.authenticateCas = passport.authenticate('cas', { failureRedirect: '/login?cas-login-error' }); module.exports.authenticateCas = passport.authenticate('cas', { failureRedirect: '/login?cas-login-error' });
module.exports.logoutCas = function (req, res) { 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) { } else if (LdapStrategy) {