taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

prevent infinite loop with an invalid token

stable
juanfran 2016-11-03 10:22:00 +01:00
parent d19c431f16
commit d6c26087d8
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/coffee/app.coffee
View File

@ -529,7 +529,10 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
.search("force_next", search.force_next) .search("force_next", search.force_next)
else else
$location.url($navUrls.resolve("login")) $location.url($navUrls.resolve("login"))
.search("next", nextUrl) .search({
"unauthorized": true
"next": nextUrl
})
return $q.reject(response) return $q.reject(response)

11
app/coffee/modules/auth.coffee
View File

@ -32,10 +32,11 @@ class LoginPage
'tgCurrentUserService', 'tgCurrentUserService',
'$location', '$location',
'$tgNavUrls', '$tgNavUrls',
'$routeParams' '$routeParams',
'$tgAuth'
] ]
constructor: (currentUserService, $location, $navUrls, $routeParams) -> constructor: (currentUserService, $location, $navUrls, $routeParams, $auth) ->
if currentUserService.isAuthenticated() if currentUserService.isAuthenticated()
if not $routeParams['force_login'] if not $routeParams['force_login']
url = $navUrls.resolve("home") url = $navUrls.resolve("home")
@ -43,7 +44,11 @@ class LoginPage
url = decodeURIComponent($routeParams['next']) url = decodeURIComponent($routeParams['next'])
$location.search('next', null) $location.search('next', null)
$location.url(url) if $routeParams['unauthorized']
$auth.clear()
$auth.removeToken()
else
$location.url(url)
module.controller('LoginPage', LoginPage) module.controller('LoginPage', LoginPage)