From d0d18f207f3840c15ee6cd0e723bf03af5ad63d8 Mon Sep 17 00:00:00 2001
From: Harshil Sharma <18575143+harshilsharma63@users.noreply.github.com>
Date: Mon, 28 Mar 2022 10:22:25 +0530
Subject: [PATCH] Fixed bug where match didn't receive current router's route
 (#2598)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixed bug where match didn't receive current router's route

* Lint fiX

* Simplified the FBRoute

Co-authored-by: Jesús Espino <jespinog@gmail.com>
Co-authored-by: Scott Bishel <scott.bishel@mattermost.com>
---
 webapp/src/route.tsx | 60 +++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/webapp/src/route.tsx b/webapp/src/route.tsx
index c139b5b71..55ec3c54f 100644
--- a/webapp/src/route.tsx
+++ b/webapp/src/route.tsx
@@ -4,7 +4,6 @@ import React from 'react'
 import {
     Redirect,
     Route,
-    useRouteMatch,
 } from 'react-router-dom'
 
 import {Utils} from './utils'
@@ -27,14 +26,10 @@ type RouteProps = {
 
 function FBRoute(props: RouteProps) {
     const loggedIn = useAppSelector<boolean|null>(getLoggedIn)
-    const match = useRouteMatch<any>()
     const me = useAppSelector<IUser|null>(getMe)
     const clientConfig = useAppSelector<ClientConfig>(getClientConfig)
 
-    let originalPath
-    if (props.getOriginalPath) {
-        originalPath = props.getOriginalPath(match)
-    }
+    let redirect: React.ReactNode = null
 
     const showWelcomePage = !clientConfig.featureFlags.disableTour &&
         Utils.isFocalboardPlugin() &&
@@ -44,37 +39,38 @@ function FBRoute(props: RouteProps) {
         !me?.props[UserPropPrefix + UserSettingKey.WelcomePageViewed]
 
     if (showWelcomePage) {
-        if (originalPath) {
-            return <Redirect to={`/welcome?r=${originalPath}`}/>
-        }
-        return <Redirect to='/welcome'/>
-    }
-
-    if (loggedIn === false && props.loginRequired) {
-        if (originalPath) {
-            let redirectUrl = '/' + Utils.buildURL(originalPath)
-            if (redirectUrl.indexOf('//') === 0) {
-                redirectUrl = redirectUrl.slice(1)
+        redirect = ({match}: any) => {
+            if (props.getOriginalPath) {
+                return <Redirect to={`/welcome?r=${props.getOriginalPath!(match)}`}/>
             }
-            const loginUrl = `/error?id=not-logged-in&r=${encodeURIComponent(redirectUrl)}`
-            return <Redirect to={loginUrl}/>
+            return <Redirect to='/welcome'/>
         }
-        return <Redirect to='/error?id=not-logged-in'/>
     }
 
-    if (loggedIn === true || !props.loginRequired) {
-        return (
-            <Route
-                path={props.path}
-                render={props.render}
-                component={props.component}
-                exact={props.exact}
-            >
-                {props.children}
-            </Route>
-        )
+    if (redirect === null && loggedIn === false && props.loginRequired) {
+        redirect = ({match}: any) => {
+            if (props.getOriginalPath) {
+                let redirectUrl = '/' + Utils.buildURL(props.getOriginalPath!(match))
+                if (redirectUrl.indexOf('//') === 0) {
+                    redirectUrl = redirectUrl.slice(1)
+                }
+                const loginUrl = `/error?id=not-logged-in&r=${encodeURIComponent(redirectUrl)}`
+                return <Redirect to={loginUrl}/>
+            }
+            return <Redirect to='/error?id=not-logged-in'/>
+        }
     }
-    return null
+
+    return (
+        <Route
+            path={props.path}
+            render={props.render}
+            component={props.component}
+            exact={props.exact}
+        >
+            {redirect || props.children}
+        </Route>
+    )
 }
 
 export default React.memo(FBRoute)