diff options
author | Jason Blais <jason@spinpunch.com> | 2016-09-20 00:00:07 -0400 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-09-19 21:00:07 -0700 |
commit | 0157e613bdadaea6b0e0b9db7e8e3000282f09f4 (patch) | |
tree | 213c790fd3e6204f91d1c45e9f5c61b95f2e17c7 | |
parent | bb69e98631b2541954b6ae465b8ba5f788b9dc49 (diff) | |
download | chat-0157e613bdadaea6b0e0b9db7e8e3000282f09f4.tar.gz chat-0157e613bdadaea6b0e0b9db7e8e3000282f09f4.tar.bz2 chat-0157e613bdadaea6b0e0b9db7e8e3000282f09f4.zip |
Add a link to OAuth 2 docs in help texts (#4034)
* Update installed_oauth_apps.jsx
* Update custom_integrations_settings.jsx
* Update confirm_integration.jsx
* Update installed_oauth_apps.jsx
* Update en.json
* Change FormattedMessage to FormattedHTMLMessage
* Fix proper coding of links in en.json
* Update en.json
4 files changed, 23 insertions, 8 deletions
diff --git a/webapp/components/admin_console/custom_integrations_settings.jsx b/webapp/components/admin_console/custom_integrations_settings.jsx index 10963b6a6..6a4202d00 100644 --- a/webapp/components/admin_console/custom_integrations_settings.jsx +++ b/webapp/components/admin_console/custom_integrations_settings.jsx @@ -115,9 +115,9 @@ export default class WebhookSettings extends AdminSettings { /> } helpText={ - <FormattedMessage + <FormattedHTMLMessage id='admin.oauth.providerDescription' - defaultMessage='When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications.' + defaultMessage='When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <a href="https://docs.mattermost.com/developer/oauth-2-0-applications.html" target="_blank">documentation</a> to learn more.' /> } value={this.state.enableOAuthServiceProvider} diff --git a/webapp/components/integrations/components/confirm_integration.jsx b/webapp/components/integrations/components/confirm_integration.jsx index b9274f2e4..de419341e 100644 --- a/webapp/components/integrations/components/confirm_integration.jsx +++ b/webapp/components/integrations/components/confirm_integration.jsx @@ -154,9 +154,9 @@ export default class ConfirmIntegration extends React.Component { helpText = []; helpText.push( <p> - <FormattedMessage + <FormattedHTMLMessage id='add_oauth_app.doneHelp' - defaultMessage='Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.' + defaultMessage='Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application (see <a href="https://docs.mattermost.com/developer/oauth-2-0-applications.html">documentation</a> for further details).' /> </p> ); diff --git a/webapp/components/integrations/components/installed_oauth_apps.jsx b/webapp/components/integrations/components/installed_oauth_apps.jsx index 7a3b512dd..39ef347e2 100644 --- a/webapp/components/integrations/components/installed_oauth_apps.jsx +++ b/webapp/components/integrations/components/installed_oauth_apps.jsx @@ -82,7 +82,21 @@ export default class InstalledOAuthApps extends React.Component { helpText={ <FormattedMessage id='installed_oauth_apps.help' - defaultMessage='OAuth 2.0 Applications are available to everyone on your server.' + defaultMessage='Create OAuth 2.0 applications to securely integrate bots and third-party applications with Mattermost. Please see {link} to learn more.' + values={{ + link: ( + <a + target='_blank' + rel='noopener noreferrer' + href='https://docs.mattermost.com/developer/oauth-2-0-applications.html' + > + <FormattedMessage + id='installed_oauth_apps.helpLink' + defaultMessage='documentation' + /> + </a> + ) + }} /> } addText={ diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 91760fb14..734be8c7d 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -101,7 +101,7 @@ "add_oauth_app.clientSecret": "<b>Client Secret</b>: {secret}", "add_oauth_app.description.help": "Description for your OAuth 2.0 application.", "add_oauth_app.descriptionRequired": "Description for the OAuth 2.0 application is required.", - "add_oauth_app.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.", + "add_oauth_app.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application (see <a href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> for further details).", "add_oauth_app.doneUrlHelp": "The following are your authorized redirect URL(s).", "add_oauth_app.header": "Add", "add_oauth_app.homepage.help": "The URL for the homepage of the OAuth 2.0 application. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.", @@ -500,7 +500,7 @@ "admin.oauth.google": "Google Apps", "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider", "admin.oauth.office365": "Office 365 (Beta)", - "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications.", + "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <a href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> to learn more.", "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ", "admin.oauth.select": "Select OAuth 2.0 service provider:", "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use \"Mattermost - your-company-name\" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>", @@ -1363,7 +1363,8 @@ "installed_oauth_apps.description": "Description", "installed_oauth_apps.empty": "No OAuth 2.0 Applications found", "installed_oauth_apps.header": "OAuth 2.0 Applications", - "installed_oauth_apps.help": "OAuth 2.0 Applications are available to everyone on your server.", + "installed_oauth_apps.help": "Create OAuth 2.0 applications to securely integrate bots and third-party applications with Mattermost. Please see {link} to learn more.", + "installed_oauth_apps.helpLink": "documentation", "installed_oauth_apps.homepage": "Homepage", "installed_oauth_apps.iconUrl": "Icon URL", "installed_oauth_apps.is_trusted": "Is Trusted: <strong>{isTrusted}</strong>", |