From 385c644988517b0dc5c6d998fbd8b55f066ff91e Mon Sep 17 00:00:00 2001 From: enahum Date: Fri, 2 Sep 2016 12:23:26 -0300 Subject: PLT-4035 Prevent request to getAuthorizedApps when OAuth provider is disabled (#3921) --- .../components/user_settings/user_settings_security.jsx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'webapp/components') diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index bcffa157c..040c2bad3 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -56,13 +56,15 @@ export default class SecurityTab extends React.Component { } componentDidMount() { - Client.getAuthorizedApps( - (authorizedApps) => { - this.setState({authorizedApps, serverError: null}); //eslint-disable-line react/no-did-mount-set-state - }, - (err) => { - this.setState({serverError: err.message}); //eslint-disable-line react/no-did-mount-set-state - }); + if (global.mm_config.EnableOAuthServiceProvider === 'true') { + Client.getAuthorizedApps( + (authorizedApps) => { + this.setState({authorizedApps, serverError: null}); //eslint-disable-line react/no-did-mount-set-state + }, + (err) => { + this.setState({serverError: err.message}); //eslint-disable-line react/no-did-mount-set-state + }); + } } submitPassword(e) { -- cgit v1.2.3-1-g7c22