thingsboard-developers
Changes
ui/src/app/api/user.service.js 19(+10 -9)
Details
ui/src/app/api/user.service.js 19(+10 -9)
diff --git a/ui/src/app/api/user.service.js b/ui/src/app/api/user.service.js
index 1668657..d09387b 100644
--- a/ui/src/app/api/user.service.js
+++ b/ui/src/app/api/user.service.js
@@ -302,7 +302,7 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, logi
$rootScope.forceFullscreen = true;
fetchAllowedDashboardIds();
} else if (currentUser.userId) {
- getUser(currentUser.userId).then(
+ getUser(currentUser.userId, true).then(
function success(user) {
currentUserDetails = user;
updateUserLang();
@@ -319,6 +319,7 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, logi
},
function fail() {
deferred.reject();
+ logout();
}
)
} else {
@@ -414,19 +415,19 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, logi
}
$http.post(url, user).then(function success(response) {
deferred.resolve(response.data);
- }, function fail(response) {
- deferred.reject(response.data);
+ }, function fail() {
+ deferred.reject();
});
return deferred.promise;
}
- function getUser(userId) {
+ function getUser(userId, ignoreErrors) {
var deferred = $q.defer();
var url = '/api/user/' + userId;
- $http.get(url).then(function success(response) {
+ $http.get(url, { ignoreErrors: ignoreErrors }).then(function success(response) {
deferred.resolve(response.data);
- }, function fail(response) {
- deferred.reject(response.data);
+ }, function fail() {
+ deferred.reject();
});
return deferred.promise;
}
@@ -436,8 +437,8 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, logi
var url = '/api/user/' + userId;
$http.delete(url).then(function success() {
deferred.resolve();
- }, function fail(response) {
- deferred.reject(response.data);
+ }, function fail() {
+ deferred.reject();
});
return deferred.promise;
}