Merge pull request #6684 from RocketChat/allow-question-mark-on-oauth…

…-token-path [FIX] Allow question on OAuth token path
RocketChat · Apr 13, 2017 · 5b2ad03 · 5b2ad03
2 parents 1973c98 + 333346a
commit 5b2ad03
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/rocketchat-custom-oauth/custom_oauth_client.js b/packages/rocketchat-custom-oauth/custom_oauth_client.js
@@ -78,8 +78,10 @@ export class CustomOAuth {
 		const credentialToken = Random.secret();
 		const loginStyle = OAuth._loginStyle(this.name, config, options);
 
+		const separator = this.authorizePath.indexOf('?') !== -1 ? '&' : '?';
+
 		const loginUrl = `${ this.authorizePath
-			}?client_id=${ config.clientId
+			}${ separator }client_id=${ config.clientId
 			}&redirect_uri=${ OAuth._redirectUri(this.name, config)
 			}&response_type=code` +
 			`&state=${ OAuth._stateParam(loginStyle, credentialToken, options.redirectUrl)