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

Add the onMessage handler when sso completes (#2474)

Browse source 
* Add the onMessage handler when sso completes

* Enable handler only for mattermost server
This commit is contained in:
Elias Nahum 2018-12-21 10:44:35 -03:00 committed by GitHub
parent d9588e0839
commit 71e9b1fc27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -79,6 +79,7 @@ class SSO extends PureComponent {
error: null,
renderWebView: false,
jsCode: '',
messagingEnabled: false,
};
switch (props.ssoType) {
@ -156,16 +157,20 @@ class SSO extends PureComponent {
onNavigationStateChange = (navState) => {
const {url} = navState;
const nextState = {};
const nextState = {
messagingEnabled: false,
};
const parsed = urlParse(url);
if (parsed.host.includes('.onelogin.com')) {
nextState.jsCode = oneLoginFormScalingJS;
} else if (parsed.pathname === this.completedUrl) {
// To avoid `window.postMessage` conflicts in any of the SSO flows
// we enable the onMessage handler only When the webView navigates to the final SSO URL.
nextState.messagingEnabled = true;
}
if (Object.keys(nextState).length) {
this.setState(nextState);
}
this.setState(nextState);
};
onLoadEnd = (event) => {
@ -210,7 +215,7 @@ class SSO extends PureComponent {
render() {
const {theme} = this.props;
const {error, renderWebView, jsCode} = this.state;
const {error, messagingEnabled, renderWebView, jsCode} = this.state;
const style = getStyleSheet(theme);
let content;
@ -235,14 +240,14 @@ class SSO extends PureComponent {
renderLoading={this.renderLoading}
injectedJavaScript={jsCode}
onLoadEnd={this.onLoadEnd}
onMessage={this.onMessage}
onMessage={messagingEnabled && this.onMessage}
useWebKit={true}
/>
);
}
return (
<View style={{flex: 1}}>
<View style={style.container}>
<StatusBar/>
{content}
</View>
@ -252,6 +257,9 @@ class SSO extends PureComponent {
const getStyleSheet = makeStyleSheetFromTheme((theme) => {
return {
container: {
flex: 1,
},
errorContainer: {
alignItems: 'center',
flex: 1,