Merge branch 'hotfix/login-redirect-loop-v2tokens' into dev

vikasrohit · vikasrohit · commit 7ab59e792c46 · 2016-07-14T10:47:20.000+05:30
diff --git a/app/services/tcAuth.service.js b/app/services/tcAuth.service.js
@@ -25,7 +25,7 @@ import { getCurrentUser, logout as doLogout } from './userv3.service.js'
     }
 
     function isAuthenticated() {
-      return !!getCurrentUser()
+      return !!getCurrentUser() && !!AuthTokenService.getV2Token() && !!AuthTokenService.getTCSSOToken()
     }
 
   }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import { getCurrentUser, logout as doLogout } from './userv3.service.js'`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`function isAuthenticated() {`
`28`		`- return !!getCurrentUser()`
	`28`	`+ return !!getCurrentUser() && !!AuthTokenService.getV2Token() && !!AuthTokenService.getTCSSOToken()`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`}`