sumor 3.2.1 → 3.2.3
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshToken.d.ts","sourceRoot":"","sources":["../../../web/api/refreshToken.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,wBAA8B,YAAY,CAAC,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"refreshToken.d.ts","sourceRoot":"","sources":["../../../web/api/refreshToken.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,wBAA8B,YAAY,CAAC,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAkDhF"}
|
|
@@ -22,10 +22,22 @@ export default async function refreshToken(force = false) {
|
|
|
22
22
|
console.log('[Sumor] Calling PUT /api/oauth/token...');
|
|
23
23
|
const response = await axiosInstance.put('/api/oauth/token', {});
|
|
24
24
|
console.log('[Sumor] Response received:', response);
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
console.log('[Sumor] Response data:', response.data);
|
|
26
|
+
// axios 返回的是 AxiosResponse,需要获取 response.data
|
|
27
|
+
// response.data 是 ApiResponse<OAuthTokenResponse> 结构
|
|
28
|
+
if (response.data) {
|
|
29
|
+
// 检查是否是 ApiResponse 包装的数据
|
|
30
|
+
const apiResponse = response.data;
|
|
31
|
+
if (apiResponse.data) {
|
|
32
|
+
// 如果是 ApiResponse 包装,获取其中的 data 字段
|
|
33
|
+
oauthStore.setData(apiResponse.data);
|
|
34
|
+
console.log('[Sumor] OAuth info updated from ApiResponse:', oauthStore.getData());
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
// 如果直接是 OAuthTokenResponse,直接使用
|
|
38
|
+
oauthStore.setData(apiResponse);
|
|
39
|
+
console.log('[Sumor] OAuth info updated directly:', oauthStore.getData());
|
|
40
|
+
}
|
|
29
41
|
console.log('[Sumor] User info updated:', oauthStore.getUser());
|
|
30
42
|
}
|
|
31
43
|
oauthStore.markAsLoaded();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshToken.js","sourceRoot":"","sources":["../../../web/api/refreshToken.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAsB,MAAM,eAAe,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAGhD,MAAM,SAAS,GAAG,OAAO,CAAA,CAAC,WAAW;AAErC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CAAC,QAAiB,KAAK;IAC/D,eAAe;IACf,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAA;QACtE,OAAM;IACR,CAAC;IAED,uBAAuB;IACvB,IAAI,CAAC,KAAK,IAAI,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;QACjD,OAAM;IACR,CAAC;IAED,IAAI,CAAC;QACH,iCAAiC;QACjC,gDAAgD;QAChD,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAA;QACtD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,GAAG,CACtC,kBAAkB,EAClB,EAAE,CACH,CAAA;QACD,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,QAAQ,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"refreshToken.js","sourceRoot":"","sources":["../../../web/api/refreshToken.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAsB,MAAM,eAAe,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAGhD,MAAM,SAAS,GAAG,OAAO,CAAA,CAAC,WAAW;AAErC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CAAC,QAAiB,KAAK;IAC/D,eAAe;IACf,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAA;QACtE,OAAM;IACR,CAAC;IAED,uBAAuB;IACvB,IAAI,CAAC,KAAK,IAAI,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;QACjD,OAAM;IACR,CAAC;IAED,IAAI,CAAC;QACH,iCAAiC;QACjC,gDAAgD;QAChD,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAA;QACtD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,GAAG,CACtC,kBAAkB,EAClB,EAAE,CACH,CAAA;QACD,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,QAAQ,CAAC,CAAA;QACnD,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;QAEpD,8CAA8C;QAC9C,qDAAqD;QACrD,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,0BAA0B;YAC1B,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAuC,CAAA;YACpE,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;gBACrB,mCAAmC;gBACnC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBACpC,OAAO,CAAC,GAAG,CAAC,8CAA8C,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;YACnF,CAAC;iBAAM,CAAC;gBACN,gCAAgC;gBAChC,UAAU,CAAC,OAAO,CAAC,WAA4C,CAAC,CAAA;gBAChE,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;YAC3E,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;QACjE,CAAC;QAED,UAAU,CAAC,YAAY,EAAE,CAAA;IAC3B,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAA;QAE7D,0BAA0B;QAC1B,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;YAC5E,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAA;YAC1E,UAAU,CAAC,KAAK,EAAE,CAAA;QACpB,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.d.ts","sourceRoot":"","sources":["../../web/axiosInstance.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAc,EAAE,aAAa,EAAkC,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"axiosInstance.d.ts","sourceRoot":"","sources":["../../web/axiosInstance.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAc,EAAE,aAAa,EAAkC,MAAM,OAAO,CAAA;AA8G5E,eAAO,MAAM,aAAa,eAAwB,CAAA"}
|
|
@@ -42,9 +42,21 @@ function createAxiosInstance() {
|
|
|
42
42
|
});
|
|
43
43
|
const response = await refreshInstance.put('/api/oauth/token', {});
|
|
44
44
|
if (response.status === 200) {
|
|
45
|
-
//
|
|
46
|
-
|
|
47
|
-
|
|
45
|
+
// 响应数据结构: response.data = { code, message, data: { user, endpoint, authorizeUrl } }
|
|
46
|
+
// 从 response.data 中提取用户信息
|
|
47
|
+
if (response.data && response.data.data) {
|
|
48
|
+
const oauthData = response.data.data;
|
|
49
|
+
// 如果包含用户信息,更新到 OAuthStore
|
|
50
|
+
if (oauthData.user) {
|
|
51
|
+
oauthStore.setUser(oauthData.user);
|
|
52
|
+
}
|
|
53
|
+
// 如果包含 endpoint 和 authorizeUrl,也更新它们
|
|
54
|
+
if (oauthData.endpoint) {
|
|
55
|
+
oauthStore.setEndpoint(oauthData.endpoint);
|
|
56
|
+
}
|
|
57
|
+
if (oauthData.authorizeUrl) {
|
|
58
|
+
oauthStore.setAuthorizeUrl(oauthData.authorizeUrl);
|
|
59
|
+
}
|
|
48
60
|
}
|
|
49
61
|
oauthStore.setIsRefreshing(false);
|
|
50
62
|
oauthStore.onTokenRefreshed();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../web/axiosInstance.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAwD,MAAM,OAAO,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AASzC;;GAEG;AACH,SAAS,mBAAmB;IAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,KAAK;QACd,OAAO,EAAE;YACP,cAAc,EAAE,gCAAgC;SACjD;QACD,eAAe,EAAE,IAAI;KACtB,CAAC,CAAA;IAEF;;OAEG;IACH,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAC/B,MAAM,CAAC,EAAE;QACP,OAAO,MAAM,CAAA;IACf,CAAC,EACD,KAAK,CAAC,EAAE;QACN,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC,CACF,CAAA;IAED;;OAEG;IACH,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAChC,QAAQ,CAAC,EAAE;QACT,OAAO,QAAQ,CAAA;IACjB,CAAC,EACD,KAAK,EAAE,KAAiB,EAAE,EAAE;QAC1B,MAAM,eAAe,GAAG,KAAK,CAAC,MAAgD,CAAA;QAE9E,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,IAAI,eAAe,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;YACjF,eAAe,CAAC,MAAM,GAAG,IAAI,CAAA;YAE7B,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,EAAE,CAAC;gBAClC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;gBAEhC,IAAI,CAAC;oBACH,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,CAAC;wBACnC,OAAO,EAAE,EAAE;wBACX,eAAe,EAAE,IAAI;qBACtB,CAAC,CAAA;oBAEF,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;oBAElE,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;wBAC5B
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../web/axiosInstance.ts"],"names":[],"mappings":"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"}
|