[FIX] Make SAML to work on Rocket.Chat < 2.3.0 (#1629)
This commit is contained in:
parent
862ffa13c6
commit
ba27c580f4
|
@ -11,7 +11,7 @@ import StatusBar from '../containers/StatusBar';
|
||||||
import ActivityIndicator from '../containers/ActivityIndicator';
|
import ActivityIndicator from '../containers/ActivityIndicator';
|
||||||
import { withTheme } from '../theme';
|
import { withTheme } from '../theme';
|
||||||
import { themedHeader } from '../utils/navigation';
|
import { themedHeader } from '../utils/navigation';
|
||||||
import log from '../utils/log';
|
import debounce from '../utils/debounce';
|
||||||
|
|
||||||
const userAgent = isIOS
|
const userAgent = isIOS
|
||||||
? 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1'
|
? 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1'
|
||||||
|
@ -43,6 +43,12 @@ class AuthenticationWebView extends React.PureComponent {
|
||||||
this.redirectRegex = new RegExp(`(?=.*(${ props.server }))(?=.*(credentialToken))(?=.*(credentialSecret))`, 'g');
|
this.redirectRegex = new RegExp(`(?=.*(${ props.server }))(?=.*(credentialToken))(?=.*(credentialSecret))`, 'g');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
if (this.debouncedLogin && this.debouncedLogin.stop) {
|
||||||
|
this.debouncedLogin.stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dismiss = () => {
|
dismiss = () => {
|
||||||
const { navigation } = this.props;
|
const { navigation } = this.props;
|
||||||
navigation.pop();
|
navigation.pop();
|
||||||
|
@ -65,32 +71,25 @@ class AuthenticationWebView extends React.PureComponent {
|
||||||
this.dismiss();
|
this.dismiss();
|
||||||
}
|
}
|
||||||
|
|
||||||
onNavigationStateChange = (webViewState) => {
|
// eslint-disable-next-line react/sort-comp
|
||||||
try {
|
debouncedLogin = debounce(params => this.login(params), 3000);
|
||||||
const url = decodeURIComponent(webViewState.url);
|
|
||||||
|
|
||||||
if (this.authType === 'cas') {
|
onNavigationStateChange = (webViewState) => {
|
||||||
|
const url = decodeURIComponent(webViewState.url);
|
||||||
|
if (this.authType === 'saml' || this.authType === 'cas') {
|
||||||
const { navigation } = this.props;
|
const { navigation } = this.props;
|
||||||
const ssoToken = navigation.getParam('ssoToken');
|
const ssoToken = navigation.getParam('ssoToken');
|
||||||
if (url.includes('ticket') || url.includes('validate')) {
|
if (url.includes('ticket') || url.includes('validate') || url.includes('saml_idp_credentialToken')) {
|
||||||
const payload = { cas: { credentialToken: ssoToken } };
|
let payload;
|
||||||
// We need to set a timeout when the login is done with SSO in order to make it work on our side.
|
|
||||||
// It is actually due to the SSO server processing the response.
|
|
||||||
setTimeout(() => {
|
|
||||||
this.login(payload);
|
|
||||||
}, 3000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.authType === 'saml') {
|
if (this.authType === 'saml') {
|
||||||
const parsedUrl = parse(url, true);
|
const parsedUrl = parse(url, true);
|
||||||
if (parsedUrl.query && parsedUrl.query.saml_idp_credentialToken) {
|
const token = (parsedUrl.query && parsedUrl.query.saml_idp_credentialToken) || ssoToken;
|
||||||
const payload = { credentialToken: parsedUrl.query.saml_idp_credentialToken, saml: true };
|
const credentialToken = { credentialToken: token };
|
||||||
// We need to set a timeout when the login is done with SSO in order to make it work on our side.
|
payload = { ...credentialToken, saml: true };
|
||||||
// It is actually due to the SSO server processing the response.
|
} else {
|
||||||
setTimeout(() => {
|
payload = { cas: { credentialToken: ssoToken } };
|
||||||
this.login(payload);
|
}
|
||||||
}, 3000);
|
this.debouncedLogin(payload);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -101,9 +100,6 @@ class AuthenticationWebView extends React.PureComponent {
|
||||||
this.login({ oauth: { ...credentials } });
|
this.login({ oauth: { ...credentials } });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
|
||||||
log(e);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
|
|
@ -250,8 +250,9 @@ class LoginSignupView extends React.Component {
|
||||||
const { server } = this.props;
|
const { server } = this.props;
|
||||||
const { clientConfig } = loginService;
|
const { clientConfig } = loginService;
|
||||||
const { provider } = clientConfig;
|
const { provider } = clientConfig;
|
||||||
const url = `${ server }/_saml/authorize/${ provider }/`;
|
const ssoToken = random(17);
|
||||||
this.openOAuth({ url, authType: 'saml' });
|
const url = `${ server }/_saml/authorize/${ provider }/${ ssoToken }`;
|
||||||
|
this.openOAuth({ url, ssoToken, authType: 'saml' });
|
||||||
}
|
}
|
||||||
|
|
||||||
onPressCas = () => {
|
onPressCas = () => {
|
||||||
|
|
Loading…
Reference in New Issue