Merge pull request #2993 from Mubashirshariq/Fix/Redundant_Redirects_between_server_and_client

Removed redundant redirects between client and server

Author: raclim

client/components/createRedirectWithUsername.jsx

@@ -17,13 +17,7 @@ import NewPasswordView from './modules/User/pages/NewPasswordView';
 import AccountView from './modules/User/pages/AccountView';
 import CollectionView from './modules/User/pages/CollectionView';
 import DashboardView from './modules/User/pages/DashboardView';
-import RedirectToUser from './components/createRedirectWithUsername';
 import { getUser } from './modules/User/actions';
-import {
-  userIsAuthenticated,
-  userIsNotAuthenticated,
-  userIsAuthorized
-} from './utils/auth';
 
 /**
  *  `params` is no longer a top-level route component prop in v4.
@@ -51,25 +45,19 @@ Route.propTypes = {
 const routes = (
   <Switch>
     <Route exact path="/" component={IDEView} />
-    <Route path="/login" component={userIsNotAuthenticated(LoginView)} />
-    <Route path="/signup" component={userIsNotAuthenticated(SignupView)} />
+    <Route path="/login" component={LoginView} />
+    <Route path="/signup" component={SignupView} />
     <Route
       path="/reset-password/:reset_password_token"
       component={NewPasswordView}
     />
-    <Route
-      path="/reset-password"
-      component={userIsNotAuthenticated(ResetPasswordView)}
-    />
+    <Route path="/reset-password" component={ResetPasswordView} />
     <Route path="/verify" component={EmailVerificationView} />
     <Route path="/projects/:project_id" component={IDEView} />
     <Route path="/:username/full/:project_id" component={FullView} />
     <Route path="/full/:project_id" component={FullView} />
 
-    <Route
-      path="/:username/assets"
-      component={userIsAuthenticated(userIsAuthorized(DashboardView))}
-    />
+    <Route path="/:username/assets" component={DashboardView} />
     <Route
       path="/:username/sketches/:project_id/add-to-collection"
       component={IDEView}
@@ -81,18 +69,10 @@ const routes = (
       component={CollectionView}
     />
     <Route path="/:username/collections" component={DashboardView} />
-
-    <Route
-      path="/sketches"
-      component={() => <RedirectToUser url="/:username/sketches" />}
-    />
-    <Route
-      path="/assets"
-      component={() => <RedirectToUser url="/:username/assets" />}
-    />
-    <Route path="/account" component={userIsAuthenticated(AccountView)} />
+    <Route path="/sketches" />
+    <Route path="/assets" />
+    <Route path="/account" component={AccountView} />
     <Route path="/about" component={IDEView} />
-
     <Route path="/privacy-policy" component={PrivacyPolicy} />
     <Route path="/terms-of-use" component={TermsOfUse} />
     <Route path="/code-of-conduct" component={CodeOfConduct} />

client/routes.jsx

@@ -76,11 +76,17 @@ router.get('/login', (req, res) => {
 });
 
 router.get('/reset-password', (req, res) => {
-  res.send(renderIndex());
+  if (req.user) {
+    return res.redirect('/account');
+  }
+  return res.send(renderIndex());
 });
 
 router.get('/reset-password/:reset_password_token', (req, res) => {
-  res.send(renderIndex());
+  if (req.user) {
+    return res.redirect('/account');
+  }
+  return res.send(renderIndex());
 });
 
 router.get('/verify', (req, res) => {
@@ -89,18 +95,18 @@ router.get('/verify', (req, res) => {
 
 router.get('/sketches', (req, res) => {
   if (req.user) {
-    res.send(renderIndex());
-  } else {
-    res.redirect('/login');
+    const { username } = req.user;
+    return res.redirect(`/${username}/sketches`);
   }
+  return res.redirect('/login');
 });
 
 router.get('/assets', (req, res) => {
   if (req.user) {
-    res.send(renderIndex());
-  } else {
-    res.redirect('/login');
+    const { username } = req.user;
+    return res.redirect(`/${username}/assets`);
   }
+  return res.redirect('/login');
 });
 
 router.get('/:username/assets', async (req, res) => {