move oauth redirect

maproulette · Jul 19, 2023 · f67b553 · f67b553
1 parent 35b323f
commit f67b553
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/components/CheckForToken/CheckForToken.js b/src/components/CheckForToken/CheckForToken.js
@@ -20,7 +20,7 @@ export const CheckForToken = ({ children }) => {
 
       if (storedState === state || process.env.NODE_ENV === 'development') {
         setVerifying(true)
-        callback(authCode, dispatch).then(() => {
+        callback(authCode, dispatch, push).then(() => {
           const queryParams = new URLSearchParams(location.search)
 
           if (queryParams.has('code')) {
@@ -30,14 +30,8 @@ export const CheckForToken = ({ children }) => {
               search: queryParams.toString(),
             })
 
-            const redirectUrl = localStorage.getItem('redirect');
-
             setVerifying(false)
             localStorage.removeItem('state');
-
-            if (redirectUrl) {
-              push(redirectUrl)
-            }
           }
         }).catch(() => {
           setVerifying(false)

diff --git a/src/components/TaskPane/PublicTaskPane.js b/src/components/TaskPane/PublicTaskPane.js
@@ -63,9 +63,11 @@ export class PublicTaskPane extends Component {
     //render regular TaskPane for logged in users.
     const loggedIn = localStorage.getItem('isLoggedIn')
     if (loggedIn) {
-      <Redirect
-        to={`${this.match.url}`}
-      />
+      return (
+        <Redirect
+          to={`${this.props.match.url}`}
+        />
+      )
     }
 
     if (!_get(this.props, 'task.parent.parent')) {

diff --git a/src/services/User/User.js b/src/services/User/User.js
@@ -320,7 +320,7 @@ export const fetchBasicUser = function(userId) {
  *
  * @param authCode - the token
  */
-export const callback = async (authCode, dispatch) => {
+export const callback = async (authCode, dispatch, push) => {
   const resetURI =
   `${process.env.REACT_APP_MAP_ROULETTE_SERVER_URL}/auth/callback?code=${authCode}`
 
@@ -337,6 +337,13 @@ export const callback = async (authCode, dispatch) => {
         dispatch(fetchSavedChallenges(userId))
         dispatch(fetchUserNotifications(userId))
         subscribeToUserUpdates(dispatch, userId)
+
+        const redirectUrl = localStorage.getItem('redirect');
+
+        if (redirectUrl) {
+          push(redirectUrl)
+          localStorage.removeItem('redirects')
+        }
       }).catch(
         error => console.log(error)
       ).then(() => null)