Issue RocketChat#7365: added check for the existence of a parameter i…

…n the CAS URL
wsw70 · Jul 11, 2017 · 670a8f4 · 670a8f4
1 parent 5cb30b4
commit 670a8f4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/rocketchat-cas/cas_client.js b/packages/rocketchat-cas/cas_client.js
@@ -33,7 +33,12 @@ Meteor.loginWithCas = function(options, callback) {
 	}
 
 	const appUrl = Meteor.absoluteUrl().replace(/\/$/, '') + __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
-	const loginUrl = `${ login_url }?service=${ appUrl }/_cas/${ credentialToken }`;
+	// check if the provided CAS URL already has some parameters
+	if (login_url.split('?').length > 1) {
+		const loginUrl = `${ login_url }&service=${ appUrl }/_cas/${ credentialToken }`;
+	} else {
+		const loginUrl = `${ login_url }?service=${ appUrl }/_cas/${ credentialToken }`;
+	}
 
 	const popup = openCenteredPopup(
 		loginUrl,