mirror of
https://github.com/mayswind/ezbookkeeping.git
synced 2026-05-17 00:12:11 +08:00
fix failed to call api after refresh page
This commit is contained in:
+38
-1
@@ -1,6 +1,9 @@
|
||||
import axios from 'axios';
|
||||
import userState from "./userstate.js";
|
||||
|
||||
let needBlockRequest = false;
|
||||
let blockedRequests = [];
|
||||
|
||||
axios.defaults.baseURL = '/api';
|
||||
axios.interceptors.request.use(config => {
|
||||
const token = userState.getToken();
|
||||
@@ -9,6 +12,18 @@ axios.interceptors.request.use(config => {
|
||||
config.headers.Authorization = `Bearer ${token}`;
|
||||
}
|
||||
|
||||
if (needBlockRequest && !config.ignoreBlocked) {
|
||||
return new Promise(resolve => {
|
||||
blockedRequests.push(newToken => {
|
||||
if (newToken) {
|
||||
config.headers.Authorization = `Bearer ${newToken}`;
|
||||
}
|
||||
|
||||
resolve(config);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
return config;
|
||||
}, error => {
|
||||
return Promise.reject(error);
|
||||
@@ -70,7 +85,29 @@ export default {
|
||||
return axios.get('logout.json');
|
||||
},
|
||||
refreshToken: () => {
|
||||
return axios.post('v1/tokens/refresh.json');
|
||||
needBlockRequest = true;
|
||||
|
||||
return axios.post('v1/tokens/refresh.json', {} , {
|
||||
ignoreBlocked: true
|
||||
}).then(response => {
|
||||
const data = response.data;
|
||||
|
||||
if (data && data.success && data.result && data.result.newToken) {
|
||||
userState.updateToken(data.result.newToken);
|
||||
|
||||
if (data.result.oldTokenId) {
|
||||
axios.post('v1/tokens/revoke.json', {
|
||||
tokenId: data.result.oldTokenId
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
needBlockRequest = false;
|
||||
return data.result.newToken;
|
||||
}).then(newToken => {
|
||||
blockedRequests.forEach(func => func(newToken));
|
||||
blockedRequests.length = 0;
|
||||
});
|
||||
},
|
||||
getProfile: () => {
|
||||
return axios.get('v1/users/profile/get.json');
|
||||
|
||||
+1
-7
@@ -95,13 +95,7 @@ Vue.prototype.$setLanguage(settings.getLanguage() || getDefaultLanguage());
|
||||
|
||||
// refresh token if user is logined
|
||||
if (userstate.isUserLogined()) {
|
||||
services.refreshToken().then(response => {
|
||||
const data = response.data;
|
||||
|
||||
if (data && data.success && data.result) {
|
||||
userstate.updateToken(data.result);
|
||||
}
|
||||
});
|
||||
services.refreshToken();
|
||||
}
|
||||
|
||||
new Vue({
|
||||
|
||||
Reference in New Issue
Block a user