login-authorization-v2 2.0.0-beta.17 → 2.0.0-beta.19

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.
Files changed (5) hide show
  1. package/dist/index.d.ts.map +1 -1
  2. package/dist/index.esm.js +10 -12
  3. package/dist/index.umd.js +10 -12
  4. package/dist/src/request.d.ts.map +1 -1
  5. package/package.json +1 -1
package/dist/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAO3B,OAAO,EAAE,KAAK,EAAE,KAAK,UAAU,EAAc,MAAM,EAAiB,MAAM,aAAa,CAAA;AAGvF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,IAAI,GAAI,QAAQ,YAAY;uBAUb,YAAY;;;;;;;;;CAmIvC,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAO3B,OAAO,EAAE,KAAK,EAAE,KAAK,UAAU,EAAc,MAAM,EAAiB,MAAM,aAAa,CAAA;AAGvF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,IAAI,GAAI,QAAQ,YAAY;uBAUb,YAAY;;;;;;;;;CAiIvC,CAAA"}
package/dist/index.esm.js CHANGED
@@ -254,19 +254,11 @@ let instance;
254
254
  * 没找到更好的方式，只能这样做了
255
255
  */
256
256
  const initInstance = () => __awaiter(void 0, void 0, void 0, function* () {
257
- let userInfo = null;
258
- try {
259
- userInfo = yield getUserInfo();
260
- }
261
- catch (error) {
262
- console.warn('initInstance getUserInfo error:', error);
263
- }
264
257
  instance = axios.create({
265
258
  baseURL: moduleBaseUrl,
266
259
  timeout: 1.5e4,
267
260
  });
268
261
  instance.interceptors.request.use((config) => {
269
- config.headers = Object.assign(Object.assign({}, config.headers), { 'X-tenant-id': userInfo ? userInfo['custom:tenant_id'].toString() : tenantId.toString(), 'X-brand': brand.toString(), 'Authorization': `Bearer ${getAccessToken()}` });
270
262
  return config;
271
263
  }, (error) => {
272
264
  return Promise.reject(error);
@@ -297,9 +289,16 @@ const fetchLogoutHTTP = (data) => {
297
289
  });
298
290
  };
299
291
  const fetchServerListHTTP = () => {
300
- return instance({
301
- method: 'get',
302
- url: '/session/current/servers'
292
+ return getUserInfo().then(userInfo => {
293
+ return instance({
294
+ method: 'get',
295
+ url: '/session/current/servers',
296
+ headers: {
297
+ 'X-tenant-id': userInfo ? userInfo['custom:tenant_id'].toString() : tenantId.toString(),
298
+ 'X-brand': brand.toString(),
299
+ 'Authorization': `Bearer ${getAccessToken()}`,
300
+ }
301
+ });
303
302
  });
304
303
  };
305
304
 
@@ -403,7 +402,6 @@ const make = (config) => {
403
402
  clearRefreshTokenTimer();
404
403
  setAccessToken(null);
405
404
  setRefreshToken(null);
406
- window.location.href = config.loginPageUrl;
407
405
  });
408
406
  };
409
407
  const clearRefreshTokenTimer = () => {
package/dist/index.umd.js CHANGED
@@ -256,19 +256,11 @@
256
256
  * 没找到更好的方式，只能这样做了
257
257
  */
258
258
  const initInstance = () => __awaiter(void 0, void 0, void 0, function* () {
259
- let userInfo = null;
260
- try {
261
- userInfo = yield getUserInfo();
262
- }
263
- catch (error) {
264
- console.warn('initInstance getUserInfo error:', error);
265
- }
266
259
  instance = axios.create({
267
260
  baseURL: moduleBaseUrl,
268
261
  timeout: 1.5e4,
269
262
  });
270
263
  instance.interceptors.request.use((config) => {
271
- config.headers = Object.assign(Object.assign({}, config.headers), { 'X-tenant-id': userInfo ? userInfo['custom:tenant_id'].toString() : tenantId.toString(), 'X-brand': brand.toString(), 'Authorization': `Bearer ${getAccessToken()}` });
272
264
  return config;
273
265
  }, (error) => {
274
266
  return Promise.reject(error);
@@ -299,9 +291,16 @@
299
291
  });
300
292
  };
301
293
  const fetchServerListHTTP = () => {
302
- return instance({
303
- method: 'get',
304
- url: '/session/current/servers'
294
+ return getUserInfo().then(userInfo => {
295
+ return instance({
296
+ method: 'get',
297
+ url: '/session/current/servers',
298
+ headers: {
299
+ 'X-tenant-id': userInfo ? userInfo['custom:tenant_id'].toString() : tenantId.toString(),
300
+ 'X-brand': brand.toString(),
301
+ 'Authorization': `Bearer ${getAccessToken()}`,
302
+ }
303
+ });
305
304
  });
306
305
  };
307
306
 
@@ -405,7 +404,6 @@
405
404
  clearRefreshTokenTimer();
406
405
  setAccessToken(null);
407
406
  setRefreshToken(null);
408
- window.location.href = config.loginPageUrl;
409
407
  });
410
408
  };
411
409
  const clearRefreshTokenTimer = () => {
package/dist/src/request.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAY,MAAM,SAAS,CAAA;AAEnD,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAA;AAKxD;;GAEG;AACH,eAAO,MAAM,YAAY,qBAuCxB,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE;QACP,WAAW,EAAE,MAAM,CAAA;QACnB,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,MAAM,CAAA;QACf,iBAAiB,EAAE,IAAI,CAAA;QACvB,YAAY,EAAE,MAAM,CAAA;QACpB,SAAS,EAAE,QAAQ,CAAA;KACpB,CAAA;CACF,CAAA;AACD,eAAO,MAAM,qBAAqB,GAAI,cAAc,MAAM,KAOlD,YAAY,CAAC,oBAAoB,CACxC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,MAAM,OAAO,sBAM5C,CAAA;AAED,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,UAAU,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;IACtB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AACD,KAAK,kBAAkB,GAAG;IACxB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AACD,eAAO,MAAM,mBAAmB,QAIxB,YAAY,CAAC,kBAAkB,CACtC,CAAA"}
1
+ {"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAA;AAMxD;;GAEG;AACH,eAAO,MAAM,YAAY,qBA0BxB,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE;QACP,WAAW,EAAE,MAAM,CAAA;QACnB,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,MAAM,CAAA;QACf,iBAAiB,EAAE,IAAI,CAAA;QACvB,YAAY,EAAE,MAAM,CAAA;QACpB,SAAS,EAAE,QAAQ,CAAA;KACpB,CAAA;CACF,CAAA;AACD,eAAO,MAAM,qBAAqB,GAAI,cAAc,MAAM,KAOlD,YAAY,CAAC,oBAAoB,CACxC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,MAAM,OAAO,sBAM5C,CAAA;AAED,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,UAAU,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;IACtB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AACD,KAAK,kBAAkB,GAAG;IACxB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AACD,eAAO,MAAM,mBAAmB,QAWxB,YAAY,CAAC,kBAAkB,CACtC,CAAA"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "type": "module",
3
3
  "name": "login-authorization-v2",
4
- "version": "2.0.0-beta.17",
4
+ "version": "2.0.0-beta.19",
5
5
  "engines": {
6
6
  "node": "^20"
7
7
  },