fix redirectUrl after custom oauth successful login initiated by ifra…

…me command, fixes #5042 (#5043)
RocketChat · Nov 29, 2016 · a68c2de · a68c2de
1 parent 1364322
commit a68c2de
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/packages/rocketchat-ui/lib/iframeCommands.js b/packages/rocketchat-ui/lib/iframeCommands.js
@@ -19,12 +19,17 @@ const commands = {
 			}, event.origin);
 		};
 
-		if (typeof data.service === 'string') {
+		const siteUrl = Meteor.settings.Site_Url + '/';
+		if (typeof data.redirectUrl !== 'string' || !data.redirectUrl.startsWith(siteUrl)) {
+			data.redirectUrl = null;
+		}
+
+		if (typeof data.service === 'string' && window.ServiceConfiguration) {
 			const customOauth = ServiceConfiguration.configurations.findOne({service: data.service});
 
 			if (customOauth) {
 				const customLoginWith = Meteor['loginWith' + _.capitalize(customOauth.service, true)];
-				const customRedirectUri = window.OAuth._redirectUri(customOauth.service, customOauth);
+				const customRedirectUri = data.redirectUrl || siteUrl;
 				customLoginWith.call(Meteor, {'redirectUrl': customRedirectUri}, customOAuthCallback);
 			}
 		}