@yelon/bis 17.3.1 → 18.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -21
- package/README.md +1 -1
- package/config/bis.config.d.ts +3 -3
- package/config/index.d.ts +5 -5
- package/config/public_api.d.ts +1 -1
- package/esm2022/bis.mjs +4 -4
- package/esm2022/config/bis.config.mjs +14 -14
- package/esm2022/config/config.mjs +4 -4
- package/esm2022/config/public_api.mjs +1 -1
- package/esm2022/layout/layout-basic.component.mjs +518 -508
- package/esm2022/layout/layout-nav-application.component.mjs +372 -372
- package/esm2022/layout/layout-nav-group.component.mjs +166 -162
- package/esm2022/layout/layout-nav-tile.component.mjs +14 -14
- package/esm2022/layout/layout.mjs +4 -4
- package/esm2022/layout/layout.module.mjs +53 -53
- package/esm2022/layout/public_api.mjs +5 -5
- package/esm2022/public_api.mjs +8 -8
- package/esm2022/src/bis.module.mjs +16 -16
- package/esm2022/src/helper.mjs +44 -44
- package/esm2022/src/provide.mjs +7 -7
- package/esm2022/src/refresh-token.mjs +78 -78
- package/esm2022/src/startup.service.mjs +183 -183
- package/esm2022/src/yunzai-act.guard.mjs +87 -87
- package/esm2022/src/yunzai-analysis-addon.guard.mjs +98 -98
- package/esm2022/src/yunzai-default.interceptor.mjs +62 -62
- package/esm2022/yunzai-widgets/public_api.mjs +6 -6
- package/esm2022/yunzai-widgets/yunzai-clear-storage.component.mjs +46 -46
- package/esm2022/yunzai-widgets/yunzai-fullscreen.component.mjs +46 -46
- package/esm2022/yunzai-widgets/yunzai-i18n.component.mjs +138 -138
- package/esm2022/yunzai-widgets/yunzai-notify.component.mjs +179 -179
- package/esm2022/yunzai-widgets/yunzai-user.component.mjs +119 -119
- package/esm2022/yunzai-widgets/yunzai-widget.module.mjs +61 -61
- package/esm2022/yunzai-widgets/yunzai-widgets.mjs +4 -4
- package/fesm2022/bis.mjs +559 -559
- package/fesm2022/config.mjs +21 -21
- package/fesm2022/layout.mjs +1097 -1083
- package/fesm2022/layout.mjs.map +1 -1
- package/fesm2022/yunzai-widgets.mjs +563 -563
- package/index.d.ts +5 -5
- package/index.less +1 -1
- package/layout/index.d.ts +5 -5
- package/layout/layout-basic.component.d.ts +54 -54
- package/layout/layout-nav-application.component.d.ts +26 -26
- package/layout/layout-nav-group.component.d.ts +14 -14
- package/layout/layout-nav-tile.component.d.ts +5 -5
- package/layout/layout.module.d.ts +18 -18
- package/layout/public_api.d.ts +5 -5
- package/layout/style/index.less +181 -182
- package/package.json +68 -68
- package/public_api.d.ts +8 -8
- package/src/bis.module.d.ts +8 -8
- package/src/helper.d.ts +16 -16
- package/src/provide.d.ts +2 -2
- package/src/refresh-token.d.ts +6 -6
- package/src/startup.service.d.ts +24 -24
- package/src/yunzai-act.guard.d.ts +20 -20
- package/src/yunzai-analysis-addon.guard.d.ts +26 -26
- package/src/yunzai-default.interceptor.d.ts +2 -2
- package/theme-compact.less +3 -3
- package/theme-dark.less +46 -46
- package/theme-default.less +48 -48
- package/theme-variable.less +1 -0
- package/yunzai-widgets/index.d.ts +5 -5
- package/yunzai-widgets/public_api.d.ts +6 -6
- package/yunzai-widgets/yunzai-clear-storage.component.d.ts +8 -8
- package/yunzai-widgets/yunzai-fullscreen.component.d.ts +8 -8
- package/yunzai-widgets/yunzai-i18n.component.d.ts +19 -19
- package/yunzai-widgets/yunzai-notify.component.d.ts +25 -25
- package/yunzai-widgets/yunzai-user.component.d.ts +22 -22
- package/yunzai-widgets/yunzai-widget.module.d.ts +18 -18
package/esm2022/src/helper.mjs
CHANGED
|
@@ -1,45 +1,45 @@
|
|
|
1
|
-
import { inject } from '@angular/core';
|
|
2
|
-
import { Router } from '@angular/router';
|
|
3
|
-
import { YA_SERVICE_TOKEN } from '@yelon/auth';
|
|
4
|
-
import { YUNZAI_I18N_TOKEN } from '@yelon/theme';
|
|
5
|
-
import { NzNotificationService } from 'ng-zorro-antd/notification';
|
|
6
|
-
export const CODEMESSAGE = {
|
|
7
|
-
200: '服务器成功返回请求的数据。',
|
|
8
|
-
201: '新建或修改数据成功。',
|
|
9
|
-
202: '一个请求已经进入后台排队(异步任务)。',
|
|
10
|
-
204: '删除数据成功。',
|
|
11
|
-
400: '发出的请求有错误,服务器没有进行新建或修改数据的操作。',
|
|
12
|
-
401: '用户没有权限(令牌、用户名、密码错误)。',
|
|
13
|
-
403: '用户得到授权,但是访问是被禁止的。',
|
|
14
|
-
404: '发出的请求针对的是不存在的记录,服务器没有进行操作。',
|
|
15
|
-
406: '请求的格式不可得。',
|
|
16
|
-
410: '请求的资源被永久删除,且不会再得到的。',
|
|
17
|
-
422: '当创建一个对象时,发生一个验证错误。',
|
|
18
|
-
500: '服务器发生错误,请检查服务器。',
|
|
19
|
-
502: '网关错误。',
|
|
20
|
-
503: '服务不可用,服务器暂时过载或维护。',
|
|
21
|
-
504: '网关超时。'
|
|
22
|
-
};
|
|
23
|
-
export function getAdditionalHeaders(headers) {
|
|
24
|
-
const res = {};
|
|
25
|
-
const lang = inject(YUNZAI_I18N_TOKEN).currentLang;
|
|
26
|
-
if (!headers?.has('Accept-Language') && lang) {
|
|
27
|
-
res['Accept-Language'] = lang;
|
|
28
|
-
}
|
|
29
|
-
return res;
|
|
30
|
-
}
|
|
31
|
-
export function checkStatus(injector, ev) {
|
|
32
|
-
if ((ev.status >= 200 && ev.status < 300) || ev.status === 401) {
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
35
|
-
const errortext = CODEMESSAGE[ev.status] || ev.statusText;
|
|
36
|
-
injector.get(NzNotificationService).error(`请求错误 ${ev.status}: ${ev.url}`, errortext);
|
|
37
|
-
}
|
|
38
|
-
export function goTo(injector, url) {
|
|
39
|
-
setTimeout(() => injector.get(Router).navigateByUrl(url));
|
|
40
|
-
}
|
|
41
|
-
export function toLogin(injector) {
|
|
42
|
-
injector.get(NzNotificationService).error(`未登录或登录已过期,请重新登录。`, ``);
|
|
43
|
-
goTo(injector, injector.get(YA_SERVICE_TOKEN).login_url);
|
|
44
|
-
}
|
|
1
|
+
import { inject } from '@angular/core';
|
|
2
|
+
import { Router } from '@angular/router';
|
|
3
|
+
import { YA_SERVICE_TOKEN } from '@yelon/auth';
|
|
4
|
+
import { YUNZAI_I18N_TOKEN } from '@yelon/theme';
|
|
5
|
+
import { NzNotificationService } from 'ng-zorro-antd/notification';
|
|
6
|
+
export const CODEMESSAGE = {
|
|
7
|
+
200: '服务器成功返回请求的数据。',
|
|
8
|
+
201: '新建或修改数据成功。',
|
|
9
|
+
202: '一个请求已经进入后台排队(异步任务)。',
|
|
10
|
+
204: '删除数据成功。',
|
|
11
|
+
400: '发出的请求有错误,服务器没有进行新建或修改数据的操作。',
|
|
12
|
+
401: '用户没有权限(令牌、用户名、密码错误)。',
|
|
13
|
+
403: '用户得到授权,但是访问是被禁止的。',
|
|
14
|
+
404: '发出的请求针对的是不存在的记录,服务器没有进行操作。',
|
|
15
|
+
406: '请求的格式不可得。',
|
|
16
|
+
410: '请求的资源被永久删除,且不会再得到的。',
|
|
17
|
+
422: '当创建一个对象时,发生一个验证错误。',
|
|
18
|
+
500: '服务器发生错误,请检查服务器。',
|
|
19
|
+
502: '网关错误。',
|
|
20
|
+
503: '服务不可用,服务器暂时过载或维护。',
|
|
21
|
+
504: '网关超时。'
|
|
22
|
+
};
|
|
23
|
+
export function getAdditionalHeaders(headers) {
|
|
24
|
+
const res = {};
|
|
25
|
+
const lang = inject(YUNZAI_I18N_TOKEN).currentLang;
|
|
26
|
+
if (!headers?.has('Accept-Language') && lang) {
|
|
27
|
+
res['Accept-Language'] = lang;
|
|
28
|
+
}
|
|
29
|
+
return res;
|
|
30
|
+
}
|
|
31
|
+
export function checkStatus(injector, ev) {
|
|
32
|
+
if ((ev.status >= 200 && ev.status < 300) || ev.status === 401) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
const errortext = CODEMESSAGE[ev.status] || ev.statusText;
|
|
36
|
+
injector.get(NzNotificationService).error(`请求错误 ${ev.status}: ${ev.url}`, errortext);
|
|
37
|
+
}
|
|
38
|
+
export function goTo(injector, url) {
|
|
39
|
+
setTimeout(() => injector.get(Router).navigateByUrl(url));
|
|
40
|
+
}
|
|
41
|
+
export function toLogin(injector) {
|
|
42
|
+
injector.get(NzNotificationService).error(`未登录或登录已过期,请重新登录。`, ``);
|
|
43
|
+
goTo(injector, injector.get(YA_SERVICE_TOKEN).login_url);
|
|
44
|
+
}
|
|
45
45
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYmlzL3NyYy9oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLE1BQU0sRUFBWSxNQUFNLGVBQWUsQ0FBQztBQUNqRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFekMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQy9DLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUVqRCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUVuRSxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQThCO0lBQ3BELEdBQUcsRUFBRSxlQUFlO0lBQ3BCLEdBQUcsRUFBRSxZQUFZO0lBQ2pCLEdBQUcsRUFBRSxxQkFBcUI7SUFDMUIsR0FBRyxFQUFFLFNBQVM7SUFDZCxHQUFHLEVBQUUsNkJBQTZCO0lBQ2xDLEdBQUcsRUFBRSxzQkFBc0I7SUFDM0IsR0FBRyxFQUFFLG1CQUFtQjtJQUN4QixHQUFHLEVBQUUsNEJBQTRCO0lBQ2pDLEdBQUcsRUFBRSxXQUFXO0lBQ2hCLEdBQUcsRUFBRSxxQkFBcUI7SUFDMUIsR0FBRyxFQUFFLG9CQUFvQjtJQUN6QixHQUFHLEVBQUUsaUJBQWlCO0lBQ3RCLEdBQUcsRUFBRSxPQUFPO0lBQ1osR0FBRyxFQUFFLG1CQUFtQjtJQUN4QixHQUFHLEVBQUUsT0FBTztDQUNiLENBQUM7QUFFRixNQUFNLFVBQVUsb0JBQW9CLENBQUMsT0FBcUI7SUFDeEQsTUFBTSxHQUFHLEdBQStCLEVBQUUsQ0FBQztJQUMzQyxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxXQUFXLENBQUM7SUFDbkQsSUFBSSxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsaUJBQWlCLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUM3QyxHQUFHLENBQUMsaUJBQWlCLENBQUMsR0FBRyxJQUFJLENBQUM7SUFDaEMsQ0FBQztJQUVELE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQztBQUVELE1BQU0sVUFBVSxXQUFXLENBQUMsUUFBa0IsRUFBRSxFQUFvQjtJQUNsRSxJQUFJLENBQUMsRUFBRSxDQUFDLE1BQU0sSUFBSSxHQUFHLElBQUksRUFBRSxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDO1FBQy9ELE9BQU87SUFDVCxDQUFDO0lBQ0QsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDO0lBQzFELFFBQVEsQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUMsQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTSxLQUFLLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxTQUFTLENBQUMsQ0FBQztBQUN2RixDQUFDO0FBT0QsTUFBTSxVQUFVLElBQUksQ0FBQyxRQUFrQixFQUFFLEdBQVc7SUFDbEQsVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7QUFDNUQsQ0FBQztBQUVELE1BQU0sVUFBVSxPQUFPLENBQUMsUUFBa0I7SUFDeEMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNsRSxJQUFJLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxTQUFVLENBQUMsQ0FBQztBQUM1RCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSHR0cEhlYWRlcnMsIEh0dHBSZXNwb25zZUJhc2UgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBpbmplY3QsIEluamVjdG9yIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBSb3V0ZXIgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuXG5pbXBvcnQgeyBZQV9TRVJWSUNFX1RPS0VOIH0gZnJvbSAnQHllbG9uL2F1dGgnO1xuaW1wb3J0IHsgWVVOWkFJX0kxOE5fVE9LRU4gfSBmcm9tICdAeWVsb24vdGhlbWUnO1xuaW1wb3J0IHsgTnpTYWZlQW55IH0gZnJvbSAnbmctem9ycm8tYW50ZC9jb3JlL3R5cGVzJztcbmltcG9ydCB7IE56Tm90aWZpY2F0aW9uU2VydmljZSB9IGZyb20gJ25nLXpvcnJvLWFudGQvbm90aWZpY2F0aW9uJztcblxuZXhwb3J0IGNvbnN0IENPREVNRVNTQUdFOiB7IFtrZXk6IG51bWJlcl06IHN0cmluZyB9ID0ge1xuICAyMDA6ICfmnI3liqHlmajmiJDlip/ov5Tlm57or7fmsYLnmoTmlbDmja7jgIInLFxuICAyMDE6ICfmlrDlu7rmiJbkv67mlLnmlbDmja7miJDlip/jgIInLFxuICAyMDI6ICfkuIDkuKror7fmsYLlt7Lnu4/ov5vlhaXlkI7lj7DmjpLpmJ/vvIjlvILmraXku7vliqHvvInjgIInLFxuICAyMDQ6ICfliKDpmaTmlbDmja7miJDlip/jgIInLFxuICA0MDA6ICflj5Hlh7rnmoTor7fmsYLmnInplJnor6/vvIzmnI3liqHlmajmsqHmnInov5vooYzmlrDlu7rmiJbkv67mlLnmlbDmja7nmoTmk43kvZzjgIInLFxuICA0MDE6ICfnlKjmiLfmsqHmnInmnYPpmZDvvIjku6TniYzjgIHnlKjmiLflkI3jgIHlr4bnoIHplJnor6/vvInjgIInLFxuICA0MDM6ICfnlKjmiLflvpfliLDmjojmnYPvvIzkvYbmmK/orr/pl67mmK/ooqvnpoHmraLnmoTjgIInLFxuICA0MDQ6ICflj5Hlh7rnmoTor7fmsYLpkojlr7nnmoTmmK/kuI3lrZjlnKjnmoTorrDlvZXvvIzmnI3liqHlmajmsqHmnInov5vooYzmk43kvZzjgIInLFxuICA0MDY6ICfor7fmsYLnmoTmoLzlvI/kuI3lj6/lvpfjgIInLFxuICA0MTA6ICfor7fmsYLnmoTotYTmupDooqvmsLjkuYXliKDpmaTvvIzkuJTkuI3kvJrlho3lvpfliLDnmoTjgIInLFxuICA0MjI6ICflvZPliJvlu7rkuIDkuKrlr7nosaHml7bvvIzlj5HnlJ/kuIDkuKrpqozor4HplJnor6/jgIInLFxuICA1MDA6ICfmnI3liqHlmajlj5HnlJ/plJnor6/vvIzor7fmo4Dmn6XmnI3liqHlmajjgIInLFxuICA1MDI6ICfnvZHlhbPplJnor6/jgIInLFxuICA1MDM6ICfmnI3liqHkuI3lj6/nlKjvvIzmnI3liqHlmajmmoLml7bov4fovb3miJbnu7TmiqTjgIInLFxuICA1MDQ6ICfnvZHlhbPotoXml7bjgIInXG59O1xuXG5leHBvcnQgZnVuY3Rpb24gZ2V0QWRkaXRpb25hbEhlYWRlcnMoaGVhZGVycz86IEh0dHBIZWFkZXJzKTogeyBbbmFtZTogc3RyaW5nXTogc3RyaW5nIH0ge1xuICBjb25zdCByZXM6IHsgW25hbWU6IHN0cmluZ106IHN0cmluZyB9ID0ge307XG4gIGNvbnN0IGxhbmcgPSBpbmplY3QoWVVOWkFJX0kxOE5fVE9LRU4pLmN1cnJlbnRMYW5nO1xuICBpZiAoIWhlYWRlcnM/LmhhcygnQWNjZXB0LUxhbmd1YWdlJykgJiYgbGFuZykge1xuICAgIHJlc1snQWNjZXB0LUxhbmd1YWdlJ10gPSBsYW5nO1xuICB9XG5cbiAgcmV0dXJuIHJlcztcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNoZWNrU3RhdHVzKGluamVjdG9yOiBJbmplY3RvciwgZXY6IEh0dHBSZXNwb25zZUJhc2UpOiB2b2lkIHtcbiAgaWYgKChldi5zdGF0dXMgPj0gMjAwICYmIGV2LnN0YXR1cyA8IDMwMCkgfHwgZXYuc3RhdHVzID09PSA0MDEpIHtcbiAgICByZXR1cm47XG4gIH1cbiAgY29uc3QgZXJyb3J0ZXh0ID0gQ09ERU1FU1NBR0VbZXYuc3RhdHVzXSB8fCBldi5zdGF0dXNUZXh0O1xuICBpbmplY3Rvci5nZXQoTnpOb3RpZmljYXRpb25TZXJ2aWNlKS5lcnJvcihg6K+35rGC6ZSZ6K+vICR7ZXYuc3RhdHVzfTogJHtldi51cmx9YCwgZXJyb3J0ZXh0KTtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBSZVRocm93SHR0cEVycm9yIHtcbiAgYm9keTogTnpTYWZlQW55O1xuICBfdGhyb3c6IHRydWU7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBnb1RvKGluamVjdG9yOiBJbmplY3RvciwgdXJsOiBzdHJpbmcpOiB2b2lkIHtcbiAgc2V0VGltZW91dCgoKSA9PiBpbmplY3Rvci5nZXQoUm91dGVyKS5uYXZpZ2F0ZUJ5VXJsKHVybCkpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdG9Mb2dpbihpbmplY3RvcjogSW5qZWN0b3IpOiB2b2lkIHtcbiAgaW5qZWN0b3IuZ2V0KE56Tm90aWZpY2F0aW9uU2VydmljZSkuZXJyb3IoYOacqueZu+W9leaIlueZu+W9leW3sui/h+acn++8jOivt+mHjeaWsOeZu+W9leOAgmAsIGBgKTtcbiAgZ29UbyhpbmplY3RvciwgaW5qZWN0b3IuZ2V0KFlBX1NFUlZJQ0VfVE9LRU4pLmxvZ2luX3VybCEpO1xufVxuIl19
|
package/esm2022/src/provide.mjs
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { importProvidersFrom, makeEnvironmentProviders } from '@angular/core';
|
|
2
|
-
import { BisModule } from './bis.module';
|
|
3
|
-
export function provideYunzaiBis() {
|
|
4
|
-
const provides = [];
|
|
5
|
-
provides.push(importProvidersFrom(BisModule));
|
|
6
|
-
return makeEnvironmentProviders(provides);
|
|
7
|
-
}
|
|
1
|
+
import { importProvidersFrom, makeEnvironmentProviders } from '@angular/core';
|
|
2
|
+
import { BisModule } from './bis.module';
|
|
3
|
+
export function provideYunzaiBis() {
|
|
4
|
+
const provides = [];
|
|
5
|
+
provides.push(importProvidersFrom(BisModule));
|
|
6
|
+
return makeEnvironmentProviders(provides);
|
|
7
|
+
}
|
|
8
8
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmlkZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2Jpcy9zcmMvcHJvdmlkZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXdCLG1CQUFtQixFQUFFLHdCQUF3QixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXBHLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFekMsTUFBTSxVQUFVLGdCQUFnQjtJQUM5QixNQUFNLFFBQVEsR0FBMkIsRUFBRSxDQUFDO0lBQzVDLFFBQVEsQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztJQUM5QyxPQUFPLHdCQUF3QixDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQzVDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBFbnZpcm9ubWVudFByb3ZpZGVycywgaW1wb3J0UHJvdmlkZXJzRnJvbSwgbWFrZUVudmlyb25tZW50UHJvdmlkZXJzIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbmltcG9ydCB7IEJpc01vZHVsZSB9IGZyb20gJy4vYmlzLm1vZHVsZSc7XG5cbmV4cG9ydCBmdW5jdGlvbiBwcm92aWRlWXVuemFpQmlzKCk6IEVudmlyb25tZW50UHJvdmlkZXJzIHtcbiAgY29uc3QgcHJvdmlkZXM6IEVudmlyb25tZW50UHJvdmlkZXJzW10gPSBbXTtcbiAgcHJvdmlkZXMucHVzaChpbXBvcnRQcm92aWRlcnNGcm9tKEJpc01vZHVsZSkpO1xuICByZXR1cm4gbWFrZUVudmlyb25tZW50UHJvdmlkZXJzKHByb3ZpZGVzKTtcbn1cbiJdfQ==
|
|
@@ -1,79 +1,79 @@
|
|
|
1
|
-
import { HttpClient } from '@angular/common/http';
|
|
2
|
-
import { APP_INITIALIZER, Injector } from '@angular/core';
|
|
3
|
-
import { BehaviorSubject, catchError, filter, switchMap, take, throwError } from 'rxjs';
|
|
4
|
-
import { YA_SERVICE_TOKEN } from '@yelon/auth';
|
|
5
|
-
import { log } from '@yelon/util';
|
|
6
|
-
import { toLogin } from './helper';
|
|
7
|
-
let refreshToking = false;
|
|
8
|
-
let refreshToken$ = new BehaviorSubject(null);
|
|
9
|
-
export const tryRefreshToken = (injector, ev, req, next) => {
|
|
10
|
-
// 连刷新Token的请求都错了,那就是真错了
|
|
11
|
-
if (['/auth/oauth/getOrCreateToken/webapp'].some(url => req.url.includes(url))) {
|
|
12
|
-
toLogin(injector);
|
|
13
|
-
return throwError(() => ev);
|
|
14
|
-
}
|
|
15
|
-
// 2、如果 `refreshToking` 为 `true` 表示已经在请求刷新 Token 中,后续所有请求转入等待状态,直至结果返回后再重新发起请求
|
|
16
|
-
if (refreshToking) {
|
|
17
|
-
return refreshToken$.pipe(filter(v => !!v), take(1), switchMap(() => next(reAttachToken(injector, req))));
|
|
18
|
-
}
|
|
19
|
-
// 3、尝试调用刷新 Token
|
|
20
|
-
refreshToking = true;
|
|
21
|
-
refreshToken$.next(null);
|
|
22
|
-
return refreshTokenRequest(injector).pipe(switchMap(res => {
|
|
23
|
-
// 通知后续请求继续执行
|
|
24
|
-
refreshToking = false;
|
|
25
|
-
refreshToken$.next(res);
|
|
26
|
-
// 重新保存新 token
|
|
27
|
-
injector.get(YA_SERVICE_TOKEN).set(res);
|
|
28
|
-
// 重新发起请求
|
|
29
|
-
return next(reAttachToken(injector, req));
|
|
30
|
-
}), catchError(err => {
|
|
31
|
-
refreshToking = false;
|
|
32
|
-
toLogin(injector);
|
|
33
|
-
return throwError(() => err);
|
|
34
|
-
}));
|
|
35
|
-
};
|
|
36
|
-
function reAttachToken(injector, req) {
|
|
37
|
-
const token = injector.get(YA_SERVICE_TOKEN).get()?.access_token;
|
|
38
|
-
return req.clone({
|
|
39
|
-
setHeaders: {
|
|
40
|
-
Authorization: `Bearer ${token}`
|
|
41
|
-
}
|
|
42
|
-
});
|
|
43
|
-
}
|
|
44
|
-
function refreshTokenRequest(injector) {
|
|
45
|
-
const model = injector.get(YA_SERVICE_TOKEN).get();
|
|
46
|
-
const form = new FormData();
|
|
47
|
-
form.set('refresh_token', model?.refresh_token);
|
|
48
|
-
form.set('grant_type', 'refresh_token');
|
|
49
|
-
form.set('scope', 'webapp');
|
|
50
|
-
return injector.get(HttpClient).post(`/auth/oauth/getOrCreateToken/webapp`, form);
|
|
51
|
-
}
|
|
52
|
-
function buildAuthRefresh(injector) {
|
|
53
|
-
const tokenSrv = injector.get(YA_SERVICE_TOKEN);
|
|
54
|
-
tokenSrv.refresh
|
|
55
|
-
.pipe(filter(() => !refreshToking), switchMap(res => {
|
|
56
|
-
log(res);
|
|
57
|
-
refreshToking = true;
|
|
58
|
-
return refreshTokenRequest(injector);
|
|
59
|
-
}))
|
|
60
|
-
.subscribe({
|
|
61
|
-
next: res => {
|
|
62
|
-
res.expired = +new Date() + 1000 * 60 * 5;
|
|
63
|
-
refreshToking = false;
|
|
64
|
-
tokenSrv.set(res);
|
|
65
|
-
},
|
|
66
|
-
error: () => toLogin(injector)
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
|
-
export function provideYunzaiBindAuthRefresh() {
|
|
70
|
-
return [
|
|
71
|
-
{
|
|
72
|
-
provide: APP_INITIALIZER,
|
|
73
|
-
useFactory: (injector) => () => buildAuthRefresh(injector),
|
|
74
|
-
deps: [Injector],
|
|
75
|
-
multi: true
|
|
76
|
-
}
|
|
77
|
-
];
|
|
78
|
-
}
|
|
1
|
+
import { HttpClient } from '@angular/common/http';
|
|
2
|
+
import { APP_INITIALIZER, Injector } from '@angular/core';
|
|
3
|
+
import { BehaviorSubject, catchError, filter, switchMap, take, throwError } from 'rxjs';
|
|
4
|
+
import { YA_SERVICE_TOKEN } from '@yelon/auth';
|
|
5
|
+
import { log } from '@yelon/util';
|
|
6
|
+
import { toLogin } from './helper';
|
|
7
|
+
let refreshToking = false;
|
|
8
|
+
let refreshToken$ = new BehaviorSubject(null);
|
|
9
|
+
export const tryRefreshToken = (injector, ev, req, next) => {
|
|
10
|
+
// 连刷新Token的请求都错了,那就是真错了
|
|
11
|
+
if (['/auth/oauth/getOrCreateToken/webapp'].some(url => req.url.includes(url))) {
|
|
12
|
+
toLogin(injector);
|
|
13
|
+
return throwError(() => ev);
|
|
14
|
+
}
|
|
15
|
+
// 2、如果 `refreshToking` 为 `true` 表示已经在请求刷新 Token 中,后续所有请求转入等待状态,直至结果返回后再重新发起请求
|
|
16
|
+
if (refreshToking) {
|
|
17
|
+
return refreshToken$.pipe(filter(v => !!v), take(1), switchMap(() => next(reAttachToken(injector, req))));
|
|
18
|
+
}
|
|
19
|
+
// 3、尝试调用刷新 Token
|
|
20
|
+
refreshToking = true;
|
|
21
|
+
refreshToken$.next(null);
|
|
22
|
+
return refreshTokenRequest(injector).pipe(switchMap(res => {
|
|
23
|
+
// 通知后续请求继续执行
|
|
24
|
+
refreshToking = false;
|
|
25
|
+
refreshToken$.next(res);
|
|
26
|
+
// 重新保存新 token
|
|
27
|
+
injector.get(YA_SERVICE_TOKEN).set(res);
|
|
28
|
+
// 重新发起请求
|
|
29
|
+
return next(reAttachToken(injector, req));
|
|
30
|
+
}), catchError(err => {
|
|
31
|
+
refreshToking = false;
|
|
32
|
+
toLogin(injector);
|
|
33
|
+
return throwError(() => err);
|
|
34
|
+
}));
|
|
35
|
+
};
|
|
36
|
+
function reAttachToken(injector, req) {
|
|
37
|
+
const token = injector.get(YA_SERVICE_TOKEN).get()?.access_token;
|
|
38
|
+
return req.clone({
|
|
39
|
+
setHeaders: {
|
|
40
|
+
Authorization: `Bearer ${token}`
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
function refreshTokenRequest(injector) {
|
|
45
|
+
const model = injector.get(YA_SERVICE_TOKEN).get();
|
|
46
|
+
const form = new FormData();
|
|
47
|
+
form.set('refresh_token', model?.refresh_token);
|
|
48
|
+
form.set('grant_type', 'refresh_token');
|
|
49
|
+
form.set('scope', 'webapp');
|
|
50
|
+
return injector.get(HttpClient).post(`/auth/oauth/getOrCreateToken/webapp`, form);
|
|
51
|
+
}
|
|
52
|
+
function buildAuthRefresh(injector) {
|
|
53
|
+
const tokenSrv = injector.get(YA_SERVICE_TOKEN);
|
|
54
|
+
tokenSrv.refresh
|
|
55
|
+
.pipe(filter(() => !refreshToking), switchMap(res => {
|
|
56
|
+
log(res);
|
|
57
|
+
refreshToking = true;
|
|
58
|
+
return refreshTokenRequest(injector);
|
|
59
|
+
}))
|
|
60
|
+
.subscribe({
|
|
61
|
+
next: res => {
|
|
62
|
+
res.expired = +new Date() + 1000 * 60 * 5;
|
|
63
|
+
refreshToking = false;
|
|
64
|
+
tokenSrv.set(res);
|
|
65
|
+
},
|
|
66
|
+
error: () => toLogin(injector)
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
export function provideYunzaiBindAuthRefresh() {
|
|
70
|
+
return [
|
|
71
|
+
{
|
|
72
|
+
provide: APP_INITIALIZER,
|
|
73
|
+
useFactory: (injector) => () => buildAuthRefresh(injector),
|
|
74
|
+
deps: [Injector],
|
|
75
|
+
multi: true
|
|
76
|
+
}
|
|
77
|
+
];
|
|
78
|
+
}
|
|
79
79
|
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"refresh-token.js","sourceRoot":"","sources":["../../../../../packages/bis/src/refresh-token.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient, HttpHandlerFn, HttpRequest, HttpResponseBase } from '@angular/common/http';\nimport { APP_INITIALIZER, Injector, Provider } from '@angular/core';\nimport { BehaviorSubject, catchError, filter, Observable, switchMap, take, throwError } from 'rxjs';\n\nimport { YA_SERVICE_TOKEN } from '@yelon/auth';\nimport { log } from '@yelon/util';\nimport { NzSafeAny } from 'ng-zorro-antd/core/types';\n\nimport { toLogin } from './helper';\n\nlet refreshToking = false;\nlet refreshToken$: BehaviorSubject<NzSafeAny> = new BehaviorSubject<NzSafeAny>(null);\n\nexport const tryRefreshToken = (\n  injector: Injector,\n  ev: HttpResponseBase,\n  req: HttpRequest<NzSafeAny>,\n  next: HttpHandlerFn\n): Observable<NzSafeAny> => {\n  // 连刷新Token的请求都错了，那就是真错了\n  if (['/auth/oauth/getOrCreateToken/webapp'].some(url => req.url.includes(url))) {\n    toLogin(injector);\n    return throwError(() => ev);\n  }\n  // 2、如果 `refreshToking` 为 `true` 表示已经在请求刷新 Token 中，后续所有请求转入等待状态，直至结果返回后再重新发起请求\n  if (refreshToking) {\n    return refreshToken$.pipe(\n      filter(v => !!v),\n      take(1),\n      switchMap(() => next(reAttachToken(injector, req)))\n    );\n  }\n  // 3、尝试调用刷新 Token\n  refreshToking = true;\n  refreshToken$.next(null);\n\n  return refreshTokenRequest(injector).pipe(\n    switchMap(res => {\n      // 通知后续请求继续执行\n      refreshToking = false;\n      refreshToken$.next(res);\n      // 重新保存新 token\n      injector.get(YA_SERVICE_TOKEN).set(res);\n      // 重新发起请求\n      return next(reAttachToken(injector, req));\n    }),\n    catchError(err => {\n      refreshToking = false;\n      toLogin(injector);\n      return throwError(() => err);\n    })\n  );\n};\n\nfunction reAttachToken(injector: Injector, req: HttpRequest<NzSafeAny>): HttpRequest<NzSafeAny> {\n  const token = injector.get(YA_SERVICE_TOKEN).get()?.access_token;\n  return req.clone({\n    setHeaders: {\n      Authorization: `Bearer ${token}`\n    }\n  });\n}\n\nfunction refreshTokenRequest(injector: Injector): Observable<NzSafeAny> {\n  const model = injector.get(YA_SERVICE_TOKEN).get();\n  const form = new FormData();\n  form.set('refresh_token', model?.refresh_token!);\n  form.set('grant_type', 'refresh_token');\n  form.set('scope', 'webapp');\n  return injector.get(HttpClient).post(`/auth/oauth/getOrCreateToken/webapp`, form);\n}\n\nfunction buildAuthRefresh(injector: Injector): void {\n  const tokenSrv = injector.get(YA_SERVICE_TOKEN);\n  tokenSrv.refresh\n    .pipe(\n      filter(() => !refreshToking),\n      switchMap(res => {\n        log(res);\n        refreshToking = true;\n        return refreshTokenRequest(injector);\n      })\n    )\n    .subscribe({\n      next: res => {\n        res.expired = +new Date() + 1000 * 60 * 5;\n        refreshToking = false;\n        tokenSrv.set(res);\n      },\n      error: () => toLogin(injector)\n    });\n}\n\nexport function provideYunzaiBindAuthRefresh(): Provider[] {\n  return [\n    {\n      provide: APP_INITIALIZER,\n      useFactory: (injector: Injector) => () => buildAuthRefresh(injector),\n      deps: [Injector],\n      multi: true\n    }\n  ];\n}\n"]}
|