summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/admin_console/custom_integrations_settings.jsx4
-rw-r--r--webapp/components/integrations/components/confirm_integration.jsx4
-rw-r--r--webapp/components/integrations/components/installed_oauth_apps.jsx16
3 files changed, 19 insertions, 5 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={