Merge pull request #1654 from topcoder-platform/pm-1355

fix(PM-1355): Retain query param in invite link

Author: hentrymartin

.circleci/config.yml

@@ -152,7 +152,7 @@ workflows:
           context: org-global
           filters: &filters-dev
             branches:
-              only: ["develop", "PM-803_wm-regression-fixes", "PM-902_show-all-projects-on-challenge-page", "pm-1169"]
+              only: ["develop", "PM-803_wm-regression-fixes", "PM-902_show-all-projects-on-challenge-page"]
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

src/routes.js

@@ -111,7 +111,7 @@ class Routes extends React.Component {
       } else {
         console.error('An unexpected error occurred while getting auth token')
       }
-      const redirectBackToUrl = encodeURIComponent(window.location.origin + this.props.location.pathname)
+      const redirectBackToUrl = encodeURIComponent(window.location.origin + this.props.location.pathname + this.props.location.search)
       window.location = `${ACCOUNTS_APP_LOGIN_URL}?retUrl=${redirectBackToUrl}`
     })
   }