Merge pull request #523 from appirio-tech/feature/discourse-redirect-logged-out-state

Github issue #518 Discussions URL shows empty page when user is not logged in

Author: vikasrohit

src/routes.jsx

@@ -8,6 +8,7 @@ import projectRoutes from './projects/routes.jsx'
 import RedirectComponent from './components/RedirectComponent'
 import {ACCOUNTS_APP_LOGIN_URL, PROJECT_FEED_TYPE_PRIMARY, PROJECT_FEED_TYPE_MESSAGES } from './config/constants'
 import { getTopic } from './api/messages'
+import { getFreshToken } from 'tc-accounts'
 
 // import reportsListRoutes from './reports/routes.jsx'
 
@@ -17,26 +18,33 @@ const LoginRedirect = withProps({
 
 const redirectToProject = (nextState, replace, callback) => {
   const feedId = nextState.params.feedId
-  getTopic(feedId).then(resp => {
-    if (resp.topics && resp.topics.length > 0) {
-      const topic = resp.topics[0]
-      const projectId = topic.referenceId
-      if (topic.tag === PROJECT_FEED_TYPE_PRIMARY) {
-        replace(`/projects/${projectId}/`)
-      } else if (topic.tag === PROJECT_FEED_TYPE_MESSAGES) {
-        replace({
-          pathname: `/projects/${projectId}/discussions`,
-          state: { threadId : topic.id }
-        })
-      } else {
-        replace('/projects')
+  getFreshToken().then(() => {
+    getTopic(feedId).then(resp => {
+      if (resp.topics && resp.topics.length > 0) {
+        const topic = resp.topics[0]
+        const projectId = topic.referenceId
+        if (topic.tag === PROJECT_FEED_TYPE_PRIMARY) {
+          replace(`/projects/${projectId}/`)
+        } else if (topic.tag === PROJECT_FEED_TYPE_MESSAGES) {
+          replace({
+            pathname: `/projects/${projectId}/discussions`,
+            state: { threadId : topic.id }
+          })
+        } else {
+          replace('/projects')
+        }
       }
-    }
-    callback()
-  })
-  .catch(() => {
-    replace('/projects')
-    callback()
+      callback()
+    })
+    .catch(() => {
+      replace('/projects')
+      callback()
+    })
+  }).catch(() => {
+    // FIXME should we include hash, search etc
+    const redirectBackToUrl = window.location.origin + '/' + nextState.location.pathname
+    const newLocation = ACCOUNTS_APP_LOGIN_URL + '?retUrl=' + redirectBackToUrl
+    window.location = newLocation
   })
 }
 
@@ -53,4 +61,4 @@ export default (
     <Route path="/error" component={ () => <PageError code={500} /> }/>
     <Route path="*" component={ () => <PageError code={404} /> }/>
   </Route>
-)
+)