fix(users): confirmation link is not working for logged in users

close #2069
erxes · Jun 19, 2020 · 6cb66fe · 6cb66fe
1 parent b7600bf
commit 6cb66fe
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 13 deletions.
diff --git a/ui/src/modules/settings/team/components/UserConfirmation.tsx b/ui/src/modules/settings/team/components/UserConfirmation.tsx
@@ -1,4 +1,5 @@
 import { AuthBox } from 'modules/auth/styles';
+import { IUser } from 'modules/auth/types';
 import Button from 'modules/common/components/Button';
 import FormControl from 'modules/common/components/form/Control';
 import FormGroup from 'modules/common/components/form/Group';
@@ -21,6 +22,7 @@ class Confirmation extends React.Component<{
       username: string;
     }
   ) => void;
+  currentUser?: IUser;
 }> {
   onSubmit = e => {
     e.preventDefault();
@@ -76,6 +78,14 @@ class Confirmation extends React.Component<{
   }
 
   render() {
+    if (this.props.currentUser) {
+      return (
+        <div style={{ width: '50%', margin: 'auto' }}>
+          {this.renderContent()}
+        </div>
+      );
+    }
+
     return <AuthLayout content={this.renderContent()} />;
   }
 }

diff --git a/ui/src/modules/settings/team/containers/UserConfirmation.tsx b/ui/src/modules/settings/team/containers/UserConfirmation.tsx
@@ -1,5 +1,6 @@
 import gql from 'graphql-tag';
 import * as compose from 'lodash.flowright';
+import { IUser } from 'modules/auth/types';
 import { Alert, withProps } from 'modules/common/utils';
 import React from 'react';
 import { graphql } from 'react-apollo';
@@ -11,13 +12,19 @@ import { ConfirmMutationResponse, ConfirmMutationVariables } from '../types';
 
 type Props = {
   queryParams: any;
+  currentUser?: IUser;
 };
 
 type FinalProps = Props & IRouterProps & ConfirmMutationResponse;
 
 class UserConfirmationContainer extends React.Component<FinalProps> {
   render() {
-    const { usersConfirmInvitation, queryParams, history } = this.props;
+    const {
+      usersConfirmInvitation,
+      queryParams,
+      history,
+      currentUser
+    } = this.props;
 
     const confirmUser = ({
       password,
@@ -49,7 +56,8 @@ class UserConfirmationContainer extends React.Component<FinalProps> {
     };
 
     const updatedProps = {
-      confirmUser
+      confirmUser,
+      currentUser
     };
 
     return <UserConfirmation {...updatedProps} />;

diff --git a/ui/src/modules/settings/team/routes.tsx b/ui/src/modules/settings/team/routes.tsx
@@ -3,10 +3,6 @@ import queryString from 'query-string';
 import React from 'react';
 import { Route } from 'react-router-dom';
 
-const UserConfirmation = asyncComponent(() =>
-  import(/* webpackChunkName: "Settings - UserConfirmation" */ './containers/UserConfirmation')
-);
-
 const UserDetail = asyncComponent(() =>
   import(/* webpackChunkName: "Settings - UserDetail" */ './containers/UserDetailForm')
 );
@@ -27,12 +23,6 @@ const userDetail = ({ match, location }) => {
   return <UserDetail _id={id} queryParams={queryParams} />;
 };
 
-export const userConfirmation = ({ location }) => {
-  const queryParams = queryString.parse(location.search);
-
-  return <UserConfirmation queryParams={queryParams} />;
-};
-
 const routes = () => (
   <React.Fragment>
     <Route

diff --git a/ui/src/routes.tsx b/ui/src/routes.tsx
@@ -1,6 +1,5 @@
 import withCurrentUser from 'modules/auth/containers/withCurrentUser';
 import asyncComponent from 'modules/common/components/AsyncComponent';
-import { userConfirmation } from 'modules/settings/team/routes';
 import queryString from 'query-string';
 import React from 'react';
 import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
@@ -33,13 +32,25 @@ const Unsubscribe = asyncComponent(() =>
   import(/* webpackChunkName: "Unsubscribe" */ 'modules/auth/containers/Unsubscribe')
 );
 
+const UserConfirmation = asyncComponent(() =>
+  import(/* webpackChunkName: "Settings - UserConfirmation" */ 'modules/settings/team/containers/UserConfirmation')
+);
+
 export const unsubscribe = ({ location }) => {
   const queryParams = queryString.parse(location.search);
 
   return <Unsubscribe queryParams={queryParams} />;
 };
 
 const renderRoutes = currentUser => {
+  const userConfirmation = ({ location }) => {
+    const queryParams = queryString.parse(location.search);
+
+    return (
+      <UserConfirmation queryParams={queryParams} currentUser={currentUser} />
+    );
+  };
+
   if (currentUser) {
     return (
       <>
@@ -62,6 +73,13 @@ const renderRoutes = currentUser => {
           <VideoCallRoutes />
           <TutorialRoutes />
           <DashboardRoutes />
+
+          <Route
+            key="/confirmation"
+            exact={true}
+            path="/confirmation"
+            component={userConfirmation}
+          />
         </MainLayout>
       </>
     );