toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix SSO error display (#2158)

Browse source
This commit is contained in:
Elias Nahum 2018-09-26 11:40:28 -03:00 committed by Harrison Healey
parent 02d9f03e23
commit f7c7e70a37
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/screens/sso/sso.js
View file

@ -26,7 +26,7 @@ const HEADERS = {
'X-Mobile-App': 'mattermost',
};
const postMessageJS = "setTimeout(function() { postMessage(document.body.innerText, '*')}, 0);";
const postMessageJS = "postMessage(document.body.innerText, '*');";
// Used to make sure that OneLogin forms scale appropriately on both platforms.
const oneLoginFormScalingJS = `
@ -158,14 +158,9 @@ class SSO extends PureComponent {
const {url} = navState;
const nextState = {};
const parsed = urlParse(url);
const serverUrl = urlParse(this.props.serverUrl);
if (parsed.host.includes('.onelogin.com')) {
nextState.jsCode = oneLoginFormScalingJS;
} else if (serverUrl.host === parsed.host) {
nextState.jsCode = postMessageJS;
} else {
nextState.jsCode = '';
}
if (Object.keys(nextState).length) {
@ -193,6 +188,8 @@ class SSO extends PureComponent {
then(getSession).
then(this.goToLoadTeam).
catch(this.onLoadEndError);
} else if (this.webView && !this.state.error) {
this.webView.injectJavaScript(postMessageJS);
}
});
}
@ -207,6 +204,10 @@ class SSO extends PureComponent {
return <Loading/>;
};
webViewRef = (ref) => {
this.webView = ref;
};
render() {
const {theme} = this.props;
const {error, renderWebView, jsCode} = this.state;
@ -224,6 +225,7 @@ class SSO extends PureComponent {
} else {
content = (
<WebView
ref={this.webViewRef}
source={{uri: this.loginUrl, headers: HEADERS}}
javaScriptEnabledAndroid={true}
automaticallyAdjustContentInsets={false}