Quellcode durchsuchen

fix logout behavior

pull/74/head
Jonathan Cobb vor 4 Jahren
Ursprung
Commit
9ca1fa0309
2 geänderte Dateien mit 7 neuen und 5 gelöschten Zeilen
  1. +5
    -3
      src/_helpers/util.js
  2. +2
    -2
      src/_services/user.service.js

+ 5
- 3
src/_helpers/util.js Datei anzeigen

@@ -28,7 +28,10 @@ export const util = {

userLoggedIn: function() { return !!util.currentUser(); },

logout: function() { return localStorage.clear(); },
logout: function() {
location.reload();
return localStorage.clear();
},

authHeader: function() {
let user = util.currentUser();
@@ -164,8 +167,7 @@ export const util = {
if (response.status === 401) {
console.log('handlePlaintextResponse: unauthenticated request: ' + JSON.stringify(data));
util.logout();
vue.$route.replace('/login');

} else if (response.status === 404) {
// todo: show nicer error message
console.log('handlePlaintextResponse: received 404: ' + (errData.resource || errData));


+ 2
- 2
src/_services/user.service.js Datei anzeigen

@@ -89,7 +89,8 @@ function logout(messages, errors) {
return Promise.resolve();
}
return fetch(`${config.apiUrl}/auth/logout`, util.getWithAuth())
.then(util.handleCrudResponse(messages, errors));
.then(util.handleCrudResponse(messages, errors))
.then(() => window.location.replace('/login'));
}

function forgotPassword(username, messages, errors) {
@@ -247,7 +248,6 @@ function handleAuthResponse(messages, errors) {
if (response.status === 401) {
// auto logout if 401 response returned from api
logout();
location.reload(true);

} else if (response.status === 404) {
// username or password was incorrect


Laden…
Abbrechen
Speichern