summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/oauth_settings.jsx
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2016-08-04 13:20:01 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-08-04 13:20:01 -0400
commitac90f5b38962c301318fff9118c4556537002941 (patch)
tree2a596a39ea715d9685b6e4afafaf42f4ae4955f5 /webapp/components/admin_console/oauth_settings.jsx
parent3b0c743052687c7a7d1079bd04acde4e7e794ce1 (diff)
downloadchat-ac90f5b38962c301318fff9118c4556537002941.tar.gz
chat-ac90f5b38962c301318fff9118c4556537002941.tar.bz2
chat-ac90f5b38962c301318fff9118c4556537002941.zip
Update text for OAuth 2.0 and Google SSO (#3740)
* Update help text for OAuth * Update oauth_settings.jsx * Update en.json
Diffstat (limited to 'webapp/components/admin_console/oauth_settings.jsx')
-rw-r--r--webapp/components/admin_console/oauth_settings.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/admin_console/oauth_settings.jsx b/webapp/components/admin_console/oauth_settings.jsx
index 61a0dd156..ad7d2159f 100644
--- a/webapp/components/admin_console/oauth_settings.jsx
+++ b/webapp/components/admin_console/oauth_settings.jsx
@@ -385,7 +385,7 @@ export default class OAuthSettings extends AdminSettings {
helpText = (
<FormattedHTMLMessage
id='admin.google.EnableHtmlDesc'
- defaultMessage='<ol><li><a href="https://accounts.google.com/login">Log in</a> to your Google account.</li><li>Go to <a href="https://console.developers.google.com">https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter "Mattermost - your-company-name" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter "Mattermost" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID<strong> and <strong>Client Secret<strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a href="https://console.developers.google.com/apis/api/plus/overview">Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google`s systems.</li></ol>'
+ defaultMessage='<ol><li><a href="https://accounts.google.com/login">Log in</a> to your Google account.</li><li>Go to <a href="https://console.developers.google.com">https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter "Mattermost - your-company-name" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter "Mattermost" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a href="https://console.developers.google.com/apis/api/plus/overview">Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google`s systems.</li></ol>'
/>
);
} else if (this.state.oauthType === Constants.OFFICE365_SERVICE) {