Commit 19ad5737d842076ce8f02f617012004735d4dad3

Authored by Igor Kulikov
1 parent 8eb6172d

Do logout if userId of stored JWT token no longer valid.

Showing 1 changed file with 10 additions and 9 deletions
... ... @@ -302,7 +302,7 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, logi
302 302 $rootScope.forceFullscreen = true;
303 303 fetchAllowedDashboardIds();
304 304 } else if (currentUser.userId) {
305   - getUser(currentUser.userId).then(
  305 + getUser(currentUser.userId, true).then(
306 306 function success(user) {
307 307 currentUserDetails = user;
308 308 updateUserLang();
... ... @@ -319,6 +319,7 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, logi
319 319 },
320 320 function fail() {
321 321 deferred.reject();
  322 + logout();
322 323 }
323 324 )
324 325 } else {
... ... @@ -414,19 +415,19 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, logi
414 415 }
415 416 $http.post(url, user).then(function success(response) {
416 417 deferred.resolve(response.data);
417   - }, function fail(response) {
418   - deferred.reject(response.data);
  418 + }, function fail() {
  419 + deferred.reject();
419 420 });
420 421 return deferred.promise;
421 422 }
422 423
423   - function getUser(userId) {
  424 + function getUser(userId, ignoreErrors) {
424 425 var deferred = $q.defer();
425 426 var url = '/api/user/' + userId;
426   - $http.get(url).then(function success(response) {
  427 + $http.get(url, { ignoreErrors: ignoreErrors }).then(function success(response) {
427 428 deferred.resolve(response.data);
428   - }, function fail(response) {
429   - deferred.reject(response.data);
  429 + }, function fail() {
  430 + deferred.reject();
430 431 });
431 432 return deferred.promise;
432 433 }
... ... @@ -436,8 +437,8 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, logi
436 437 var url = '/api/user/' + userId;
437 438 $http.delete(url).then(function success() {
438 439 deferred.resolve();
439   - }, function fail(response) {
440   - deferred.reject(response.data);
  440 + }, function fail() {
  441 + deferred.reject();
441 442 });
442 443 return deferred.promise;
443 444 }
... ...