blackteay/fes.js
1
0
Fork 0
mirror of https://github.com/WeBankFinTech/fes.js.git synced 2025-04-05 03:05:07 +08:00
Code Issues Projects Releases Wiki Activity

fix: login 兼容不同的 request 版本 (#242)

Browse Source 
* fix: login 兼容不同的 request 版本

* chore: upgrade request
This commit is contained in:
qlin 2024-05-06 15:14:26 +08:00 committed by GitHub
parent 1b0d3409bb
commit c7e7efaa31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 61 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
packages/fes-plugin-login/src/runtime/runtime.js
View File

@ -1,8 +1,12 @@
import { request } from '@@/core/pluginExports';
import { ApplyPluginsType, getRouter, plugin } from '@fesjs/fes';
let config;
function getLoginConfig() {
if (config) return config;
if (config) {
return config;
}
config = plugin.applyPlugins({
key: 'login',
type: ApplyPluginsType.modify,
@ -14,38 +18,63 @@ function getLoginConfig() {
return config;
}
const defaultExport = {
onRouterCreated({ router }) {
const { hasLogin, loginPath } = getLoginConfig();
if (hasLogin && loginPath) {
let isAuthenticated;
router.beforeEach(async (to, from, next) => {
if (to.path !== loginPath && !isAuthenticated) {
isAuthenticated = await hasLogin();
if (!isAuthenticated) {
return next({ path: loginPath });
}
}
next();
});
}
},
};
// ACCESS
export function request(memo) {
if (!memo.responseInterceptors) {
memo.responseInterceptors = [];
}
memo.responseInterceptors.push([
(response) => response,
(error) => {
if (request.version) {
defaultExport.request = (memo) => {
const config = getRunTimeConfig();
if (config.ignore401Redirect) {
return memo;
}
const errorHandler = memo.errorHandler;
memo.errorHandler = (error) => {
if (error?.response?.status === 401) {
const router = getRouter();
const { loginPath } = getLoginConfig();
router.push({ path: loginPath });
}
throw error;
},
]);
return memo;
errorHandler && errorHandler(error);
};
return memo;
};
}
else {
defaultExport.request = (memo) => {
if (!memo.responseInterceptors) {
memo.responseInterceptors = [];
}
memo.responseInterceptors.push([
response => response,
(error) => {
if (error?.response?.status === 401) {
const router = getRouter();
const { loginPath } = getLoginConfig();
router.push({ path: loginPath });
}
throw error;
},
]);
return memo;
};
}
export function onRouterCreated({ router }) {
const { hasLogin, loginPath } = getLoginConfig();
if (hasLogin && loginPath) {
let isAuthenticated;
router.beforeEach(async (to, from, next) => {
if (to.path !== loginPath && !isAuthenticated) {
isAuthenticated = await hasLogin();
if (!isAuthenticated) {
return next({ path: loginPath });
}
}
next();
});
}
}
export default defaultExport;

2
packages/fes-plugin-request/package.json
View File

@ -33,7 +33,7 @@
},
"dependencies": {
"@fesjs/utils": "^3.0.1",
"@qlin/request": "^0.2.0"
"@qlin/request": "^0.2.3"
},
"typings": "./types.d.ts"
}

8
pnpm-lock.yaml generated
View File

@ -650,8 +650,8 @@ importers:
specifier: ^3.0.1
version: link:../fes-utils
'@qlin/request':
specifier: ^0.2.0
version: 0.2.0
specifier: ^0.2.3
version: 0.2.3
vue:
specifier: ^3.2.37
version: 3.3.4
@ -3921,8 +3921,8 @@ packages:
resolution: {integrity: sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==}
dev: false
/@qlin/request@0.2.0:
resolution: {integrity: sha512-zbCIHy7wBYy4pz/GarBeDTGmtkT2QfsCqudKQMs6wkhZ/ZMMQzAhO7d+REH89d3cdUPvw7qMnpYXYpHEg2eCeg==}
/@qlin/request@0.2.3:
resolution: {integrity: sha512-haKCRgZZWF9cZF7btRNfZQlDtJQ0uVqjwp51mqT+073V7JbL2DpUmVsRODtb3nnw9uVAHOqS9rmq+ZigwftgGg==}
dependencies:
'@types/lodash-es': 4.17.12
lodash-es: 4.17.21