From 3f8dda6f5ad676c976fd5ae575a6790fdb505449 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 29 Jul 2016 14:58:37 -0400 Subject: PLT-3633 EE: Add Google and Office365 SSO through OAuth2 (#3660) * EE: Add Google and Office365 SSO through OAuth2 * Add localization strings * Text tweaks for PLT-3633 * Added sign-up button for Office 365 * Updated some error messages and a bit of licensing * Updated sign-in method section in user settings to include Google and Office365 * Added more localization strings --- .../user_settings/user_settings_general.jsx | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'webapp/components/user_settings/user_settings_general.jsx') diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index 8dce4deed..d1c195c7e 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -419,6 +419,42 @@ class UserSettingsGeneralTab extends React.Component { {helpText} ); + } else if (this.props.user.auth_service === Constants.GOOGLE_SERVICE) { + inputs.push( +
+
+ +
+ {helpText} +
+ ); + } else if (this.props.user.auth_service === Constants.OFFICE365_SERVICE) { + inputs.push( +
+
+ +
+ {helpText} +
+ ); } else if (this.props.user.auth_service === Constants.LDAP_SERVICE) { inputs.push(
); + } else if (this.props.user.auth_service === Constants.GOOGLE_SERVICE) { + describe = ( + + ); + } else if (this.props.user.auth_service === Constants.OFFICE365_SERVICE) { + describe = ( + + ); } else if (this.props.user.auth_service === Constants.LDAP_SERVICE) { describe = (