MM-10573 Add error page if user doesn't authorize Mattermost for OAuth (

#1699)
mattermost · Sep 14, 2018 · acbd391 · acbd391
1 parent e4eacad
commit acbd391
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 0 deletions.
diff --git a/components/error_page/error_message.jsx b/components/error_page/error_message.jsx
@@ -148,6 +148,19 @@ export default function ErrorMessage({type, message, service}) {
  </div>
  );
  break;
+ case ErrorPageTypes.OAUTH_ACCESS_DENIED:
+ errorMessage = (
+ <p>
+ <FormattedMessage
+ id='error.oauth_access_denied'
+ defaultMessage='You must authorize Mattermost to log in with {service}.'
+ values={{
+ service,
+ }}
+ />
+ </p>
+ );
+ break;
  case ErrorPageTypes.PAGE_NOT_FOUND:
  default:
  errorMessage = (

diff --git a/components/error_page/error_page.jsx b/components/error_page/error_page.jsx
@@ -85,6 +85,15 @@ export default class ErrorPage extends React.PureComponent {
  />
  </Link>
  );
+ } else if (type === ErrorPageTypes.OAUTH_ACCESS_DENIED || type === ErrorPageTypes.OAUTH_MISSING_CODE) {
+ backButton = (
+ <Link to='/'>
+ <FormattedMessage
+ id='error.generic.link_login'
+ defaultMessage='Back to login page'
+ />
+ </Link>
+ );
  } else {
  backButton = (
  <Link to='/'>

diff --git a/components/error_page/error_title.jsx b/components/error_page/error_title.jsx
@@ -28,6 +28,14 @@ export default function ErrorTitle({type, title}) {
  />
  );
  break;
+ case ErrorPageTypes.OAUTH_ACCESS_DENIED:
+ errorTitle = (
+ <FormattedMessage
+ id='error.oauth_access_denied.title'
+ defaultMessage='Authorization Error'
+ />
+ );
+ break;
  case ErrorPageTypes.OAUTH_MISSING_CODE:
  errorTitle = (
  <FormattedMessage

diff --git a/i18n/en.json b/i18n/en.json
@@ -1868,6 +1868,7 @@
  "error.channel_not_found.message": "The channel you're requesting is private or does not exist. Please contact an Administrator to be added to the channel.",
  "error.channel_not_found.title": "Channel Not Found",
  "error.generic.link": "Back to {siteName}",
+ "error.generic.link_login": "Back to login page",
  "error.generic.link_message": "Back to {siteName}",
  "error.generic.message": "An error has occurred.",
  "error.generic.title": "Error",
@@ -1879,6 +1880,8 @@
  "error.not_found.link_message": "Back to Mattermost",
  "error.not_found.message": "The page you were trying to reach does not exist",
  "error.not_found.title": "Page not found",
+ "error.oauth_access_denied": "You must authorize Mattermost to log in with {service}.",
+ "error.oauth_access_denied.title": "Authorization Error",
  "error.oauth_missing_code": "The service provider {service} did not provide an authorization code in the redirect URL.",
  "error.oauth_missing_code.forum": "If you reviewed the above and are still having trouble with configuration, you may post in our {link} where we'll be happy to help with issues during setup.",
  "error.oauth_missing_code.forum.link": "Troubleshooting forum",

diff --git a/tests/components/error_page/__snapshots__/error_message.test.jsx.snap b/tests/components/error_page/__snapshots__/error_message.test.jsx.snap
@@ -59,6 +59,20 @@ exports[`components/error_page/ErrorMessage should match snapshot, no type nor m
 </p>
 `;
 
+exports[`components/error_page/ErrorMessage should match snapshot, oauth_access_denied type 1`] = `
+<p>
+ <FormattedMessage
+ defaultMessage="You must authorize Mattermost to log in with {service}."
+ id="error.oauth_access_denied"
+ values={
+ Object {
+ "service": "Gitlab",
+ }
+ }
+ />
+</p>
+`;
+
 exports[`components/error_page/ErrorMessage should match snapshot, oauth_missing_code type 1`] = `
 <div>
  <p>

diff --git a/tests/components/error_page/__snapshots__/error_title.test.jsx.snap b/tests/components/error_page/__snapshots__/error_title.test.jsx.snap
@@ -20,6 +20,14 @@ exports[`components/error_page/ErrorTitle should match snapshot, no type but wit
 
 exports[`components/error_page/ErrorTitle should match snapshot, no type nor title 1`] = `"Error"`;
 
+exports[`components/error_page/ErrorTitle should match snapshot, oauth_access_denied type 1`] = `
+<FormattedMessage
+ defaultMessage="Authorization Error"
+ id="error.oauth_access_denied.title"
+ values={Object {}}
+/>
+`;
+
 exports[`components/error_page/ErrorTitle should match snapshot, oauth_missing_code type 1`] = `
 <FormattedMessage
  defaultMessage="Mattermost needs your help"

diff --git a/tests/components/error_page/error_message.test.jsx b/tests/components/error_page/error_message.test.jsx
@@ -40,6 +40,15 @@ describe('components/error_page/ErrorMessage', () => {
  expect(wrapper).toMatchSnapshot();
  });
 
+ test('should match snapshot, oauth_access_denied type', () => {
+ const props = {...baseProps, type: ErrorPageTypes.OAUTH_ACCESS_DENIED, service: 'Gitlab'};
+ const wrapper = shallow(
+ <ErrorMessage {...props}/>
+ );
+
+ expect(wrapper).toMatchSnapshot();
+ });
+
  test('should match snapshot, page_not_found type', () => {
  const props = {...baseProps, type: ErrorPageTypes.PAGE_NOT_FOUND};
  const wrapper = shallow(

diff --git a/tests/components/error_page/error_title.test.jsx b/tests/components/error_page/error_title.test.jsx
@@ -39,6 +39,15 @@ describe('components/error_page/ErrorTitle', () => {
  expect(wrapper).toMatchSnapshot();
  });
 
+ test('should match snapshot, oauth_access_denied type', () => {
+ const props = {...baseProps, type: ErrorPageTypes.OAUTH_ACCESS_DENIED};
+ const wrapper = shallow(
+ <ErrorTitle {...props}/>
+ );
+
+ expect(wrapper).toMatchSnapshot();
+ });
+
  test('should match snapshot, page_not_found type', () => {
  const props = {...baseProps, type: ErrorPageTypes.PAGE_NOT_FOUND};
  const wrapper = shallow(

diff --git a/utils/constants.jsx b/utils/constants.jsx
@@ -444,6 +444,7 @@ export const StoragePrefixes = {
 
 export const ErrorPageTypes = {
  LOCAL_STORAGE: 'local_storage',
+ OAUTH_ACCESS_DENIED: 'oauth_access_denied',
  OAUTH_MISSING_CODE: 'oauth_missing_code',
  PAGE_NOT_FOUND: 'page_not_found',
  PERMALINK_NOT_FOUND: 'permalink_not_found',