Skip to content

fix unable to login if authentication is delegated to another CAS ser… #6865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vasusadariya wants to merge 7 commits into
base: develop
Choose a base branch
from
+7 −1
Open

fix unable to login if authentication is delegated to another CAS ser… #6865

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
536537d
fix unable to login if authentication is delegated to another CAS ser…
vasusadariya Dec 26, 2025
31de684
Merge branch 'develop' into authentication_fix
vasusadariya Jan 7, 2026
3a6f767
added all the changes suggested by floriannari
vasusadariya Jan 7, 2026
6de0ddd
fix: prevent premature webview closure when CAS delegates to another …
vasusadariya Jan 9, 2026
112c16c
Merge branch 'develop' into authentication_fix
vasusadariya Mar 19, 2026
e5d3bf8
chore: format code and fix lint issues
vasusadariya Mar 19, 2026
bf83a4b
Merge branch 'develop' into authentication_fix
vasusadariya Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/views/AuthenticationWebView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,14 @@ const AuthenticationWebView = () => {
}
if (authType === 'saml' || authType === 'cas') {
const parsedUrl = parse(url, true);
// Only close the webview when redirected back to the Rocket.Chat server
// This prevents premature closure when CAS delegates to another CAS server for MFA
const isRocketChatServer = url.startsWith(server);
// ticket -> cas / validate & saml_idp_credentialToken -> saml
if (parsedUrl.pathname?.includes('validate') || parsedUrl.query?.ticket || parsedUrl.query?.saml_idp_credentialToken) {
if (
isRocketChatServer &&
(parsedUrl.pathname?.includes('validate') || parsedUrl.query?.ticket || parsedUrl.query?.saml_idp_credentialToken)
) {
let payload: ICredentials;
if (authType === 'saml') {
const token = parsedUrl.query?.saml_idp_credentialToken || ssoToken;
Expand Down