MM-4887: Remove back to MM button for Zapier-MM OAuth integration set…

…up (mattermost#4906) * MM-4887: Remove back to MM button got Zapier OAuth setup * MM-4887: Fix lint error Co-authored-by: Catalin Tomai <[email protected]>
Revanth47 · Mar 30, 2020 · 4c08988 · 4c08988
1 parent 987045a
commit 4c08988
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 0 deletions.
diff --git a/components/error_page/__snapshots__/error_message.test.tsx.snap b/components/error_page/__snapshots__/error_message.test.tsx.snap
@@ -83,6 +83,12 @@ exports[`components/error_page/ErrorMessage should match snapshot, oauth_access_
 </p>
 `;
 
+exports[`components/error_page/ErrorMessage should match snapshot, oauth_invalid_param type 1`] = `
+<p>
+ error message
+</p>
+`;
+
 exports[`components/error_page/ErrorMessage should match snapshot, oauth_missing_code type 1`] = `
 <div>
  <p>

diff --git a/components/error_page/__snapshots__/error_title.test.tsx.snap b/components/error_page/__snapshots__/error_title.test.tsx.snap
@@ -36,6 +36,14 @@ exports[`components/error_page/ErrorTitle should match snapshot, oauth_missing_c
 />
 `;
 
+exports[`components/error_page/ErrorTitle should match snapshot, oauth_invalid_param type 1`] = `
+<FormattedMessage
+ defaultMessage="OAuth Parameter Error"
+ id="error.oauth_invalid_param.title"
+ values={Object {}}
+/>
+`;
+
 exports[`components/error_page/ErrorTitle should match snapshot, page_not_found type 1`] = `
 <FormattedMessage
  defaultMessage="Page Not Found"

diff --git a/components/error_page/error_message.test.tsx b/components/error_page/error_message.test.tsx
@@ -50,6 +50,15 @@ describe('components/error_page/ErrorMessage', () => {
  expect(wrapper).toMatchSnapshot();
  });
 
+ test('should match snapshot, oauth_invalid_param type', () => {
+ const props = {...baseProps, type: ErrorPageTypes.OAUTH_INVALID_PARAM, message: 'error message'};
+ 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/components/error_page/error_message.tsx b/components/error_page/error_message.tsx
@@ -176,6 +176,13 @@ const ErrorMessage: React.FC<Props> = ({type, message, service, isGuest}: Props)
  </p>
  );
  break;
+ case ErrorPageTypes.OAUTH_INVALID_PARAM:
+ errorMessage = (
+ <p>
+ {message}
+ </p>
+ );
+ break;
  case ErrorPageTypes.PAGE_NOT_FOUND:
  default:
  errorMessage = (

diff --git a/components/error_page/error_page.tsx b/components/error_page/error_page.tsx
@@ -108,6 +108,8 @@ export default class ErrorPage extends React.PureComponent<Props> {
  />
  </Link>
  );
+ } else if (type === ErrorPageTypes.OAUTH_INVALID_PARAM) {
+ backButton = null;
  } else {
  backButton = (
  <Link to='/'>

diff --git a/components/error_page/error_title.test.tsx b/components/error_page/error_title.test.tsx
@@ -49,6 +49,15 @@ describe('components/error_page/ErrorTitle', () => {
  expect(wrapper).toMatchSnapshot();
  });
 
+ test('should match snapshot, oauth_invalid_param type', () => {
+ const props = {...baseProps, type: ErrorPageTypes.OAUTH_INVALID_PARAM};
+ 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/components/error_page/error_title.tsx b/components/error_page/error_title.tsx
@@ -48,6 +48,14 @@ const ErrorTitle: React.FC<Props> = ({type, title}: Props) => {
  />
  );
  break;
+ case ErrorPageTypes.OAUTH_INVALID_PARAM:
+ errorTitle = (
+ <FormattedMessage
+ id='error.oauth_invalid_param.title'
+ defaultMessage='OAuth Parameter Error'
+ />
+ );
+ break;
  case ErrorPageTypes.TEAM_NOT_FOUND:
  errorTitle = (
  <FormattedMessage

diff --git a/i18n/en.json b/i18n/en.json
@@ -2293,6 +2293,7 @@
  "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_invalid_param.title": "OAuth Parameter 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/utils/constants.jsx b/utils/constants.jsx
@@ -459,6 +459,7 @@ export const ErrorPageTypes = {
  LOCAL_STORAGE: 'local_storage',
  OAUTH_ACCESS_DENIED: 'oauth_access_denied',
  OAUTH_MISSING_CODE: 'oauth_missing_code',
+ OAUTH_INVALID_PARAM: 'oauth_invalid_param',
  PAGE_NOT_FOUND: 'page_not_found',
  PERMALINK_NOT_FOUND: 'permalink_not_found',
  TEAM_NOT_FOUND: 'team_not_found',