verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] Make SAML wait for idp token instead of creating it on client (#1527)

This commit is contained in:
Diego Mello 2020-01-07 14:44:34 -03:00 committed by GitHub
parent 9caf3bb016
commit f681a3e33f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/views/AuthenticationWebView.js
View File

@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { WebView } from 'react-native-webview';
import { connect } from 'react-redux';
import parse from 'url-parse';
import RocketChat from '../lib/rocketchat';
import { isIOS } from '../utils/deviceInfo';
@ -10,6 +11,7 @@ import StatusBar from '../containers/StatusBar';
import ActivityIndicator from '../containers/ActivityIndicator';
import { withTheme } from '../theme';
import { themedHeader } from '../utils/navigation';
import log from '../utils/log';
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'
@ -64,18 +66,26 @@ class AuthenticationWebView extends React.PureComponent {
}
onNavigationStateChange = (webViewState) => {
try {
const url = decodeURIComponent(webViewState.url);
if (this.authType === 'saml' || this.authType === 'cas') {
if (this.authType === 'cas') {
const { navigation } = this.props;
const ssoToken = navigation.getParam('ssoToken');
if (url.includes('ticket') || url.includes('validate')) {
let payload;
const credentialToken = { credentialToken: ssoToken };
if (this.authType === 'saml') {
payload = { ...credentialToken, saml: true };
} else {
payload = { cas: credentialToken };
const payload = { cas: ssoToken };
// 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') {
const parsedUrl = parse(url, true);
if (parsedUrl.query && parsedUrl.query.saml_idp_credentialToken) {
const payload = { credentialToken: parsedUrl.query.saml_idp_credentialToken, saml: true };
// 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(() => {
@ -91,6 +101,9 @@ class AuthenticationWebView extends React.PureComponent {
this.login({ oauth: { ...credentials } });
}
}
} catch (e) {
log(e);
}
}
render() {

5
app/views/LoginSignupView.js
View File

@ -250,9 +250,8 @@ class LoginSignupView extends React.Component {
const { server } = this.props;
const { clientConfig } = loginService;
const { provider } = clientConfig;
const ssoToken = random(17);
const url = `${ server }/_saml/authorize/${ provider }/${ ssoToken }`;
this.openOAuth({ url, ssoToken, authType: 'saml' });
const url = `${ server }/_saml/authorize/${ provider }/`;
this.openOAuth({ url, authType: 'saml' });
}
onPressCas = () => {