@solar-taro/planets 1.5.1 → 1.6.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/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,28 @@
|
|
|
1
|
+
## 1.5.2 (2025-10-23)
|
|
2
|
+
|
|
3
|
+
### 🚀 Features
|
|
4
|
+
|
|
5
|
+
- **planets/mercury:** add patchTokens method
|
|
6
|
+
- **planets/mercury:** add redirect query to relaunch to login page
|
|
7
|
+
|
|
8
|
+
### 🩹 Fixes
|
|
9
|
+
|
|
10
|
+
- **planets/mercury:** rename AUTH_TOKEN_STORAGE_KEY to AUTH_TOKENS_STORAGE_KEY
|
|
11
|
+
|
|
12
|
+
### ❤️ Thank You
|
|
13
|
+
|
|
14
|
+
- HyperLife1119
|
|
15
|
+
|
|
16
|
+
## 1.5.1 (2025-10-22)
|
|
17
|
+
|
|
18
|
+
### 🩹 Fixes
|
|
19
|
+
|
|
20
|
+
- **planets/mercury:** make clientId option optional
|
|
21
|
+
|
|
22
|
+
### ❤️ Thank You
|
|
23
|
+
|
|
24
|
+
- HyperLife1119
|
|
25
|
+
|
|
1
26
|
## 1.5.0 (2025-10-18)
|
|
2
27
|
|
|
3
28
|
### 🚀 Features
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { HttpContextToken, HttpStatusCode } from '@ngify/http';
|
|
1
|
+
import { HttpContextToken, HttpParams, HttpStatusCode } from '@ngify/http';
|
|
2
2
|
import { overlay, router } from '@solar-taro/core';
|
|
3
3
|
import { cacheManager, CATCH_HTTP_ERROR_TOKEN } from '@solar-taro/http';
|
|
4
|
+
import { encode as encodeBase64 } from 'js-base64';
|
|
4
5
|
import { catchError, EMPTY, finalize, map, share, switchMap } from 'rxjs';
|
|
5
6
|
import { mercuryService } from './service.js';
|
|
6
7
|
export const AUTH_TOKEN = new HttpContextToken(() => true);
|
|
@@ -47,7 +48,8 @@ export function useAuthInterceptor() {
|
|
|
47
48
|
function relaunchToLogin() {
|
|
48
49
|
if (!relaunching && router.path !== router.buildUrl('login') && request.context.get(AUTH_REDIRECT_TOKEN)) {
|
|
49
50
|
relaunching = true;
|
|
50
|
-
router.relaunch('login'
|
|
51
|
+
router.relaunch('login', { redirect: encodeBase64(`${router.path}?${new HttpParams(router.params)}`) })
|
|
52
|
+
.finally(() => relaunching = false);
|
|
51
53
|
}
|
|
52
54
|
}
|
|
53
55
|
if (!request.context.get(AUTH_TOKEN)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-interceptor.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/auth-interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"auth-interceptor.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/auth-interceptor.ts"],"names":[],"mappings":"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"}
|
package/mercury/service.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export interface MercuryConfig {
|
|
|
11
11
|
clientId?: string;
|
|
12
12
|
fan?: Fan;
|
|
13
13
|
}
|
|
14
|
-
export declare const
|
|
14
|
+
export declare const AUTH_TOKENS_STORAGE_KEY = "auth-tokens";
|
|
15
15
|
export declare const setupMercury: (config: MercuryConfig) => void, mercuryService: () => MercuryService;
|
|
16
16
|
export declare class MercuryService {
|
|
17
17
|
protected readonly config: MercuryConfig;
|
|
@@ -36,4 +36,5 @@ export declare class MercuryService {
|
|
|
36
36
|
refresh_token: string;
|
|
37
37
|
}>>;
|
|
38
38
|
setTokens(tokens: Partial<AuthTokens>): Promise<TaroGeneral.CallbackResult>;
|
|
39
|
+
patchTokens(tokens: Partial<AuthTokens>): Promise<TaroGeneral.CallbackResult>;
|
|
39
40
|
}
|
package/mercury/service.js
CHANGED
|
@@ -2,9 +2,9 @@ import { HttpClient, HttpContext, HttpStatusCode, withInterceptors } from '@ngif
|
|
|
2
2
|
import { defineService } from '@solar-taro/core';
|
|
3
3
|
import { CATCH_HTTP_ERROR_TOKEN, CATCH_RESULT_ERROR_TOKEN, useApiInterceptor, useAutoHostInterceptor, useCommonInterceptor } from '@solar-taro/http';
|
|
4
4
|
import { checkSession, getStorageSync, getUserInfo, login, setStorage } from '@tarojs/taro';
|
|
5
|
-
import { btoa } from 'js-base64';
|
|
5
|
+
import { btoa as encodeBase64 } from 'js-base64';
|
|
6
6
|
import { catchError, defer, from, map, switchMap, tap } from 'rxjs';
|
|
7
|
-
export const
|
|
7
|
+
export const AUTH_TOKENS_STORAGE_KEY = 'auth-tokens';
|
|
8
8
|
export const [setupMercury, mercuryService] = defineService((config) => new MercuryService(config));
|
|
9
9
|
export class MercuryService {
|
|
10
10
|
constructor(config) {
|
|
@@ -14,7 +14,7 @@ export class MercuryService {
|
|
|
14
14
|
useApiInterceptor(),
|
|
15
15
|
useCommonInterceptor()
|
|
16
16
|
]));
|
|
17
|
-
this.tokens = getStorageSync(
|
|
17
|
+
this.tokens = getStorageSync(AUTH_TOKENS_STORAGE_KEY) || {};
|
|
18
18
|
}
|
|
19
19
|
auth(relogin = false) {
|
|
20
20
|
return defer(() => relogin
|
|
@@ -33,7 +33,7 @@ export class MercuryService {
|
|
|
33
33
|
}), tap(({ data }) => {
|
|
34
34
|
this.tokens = { accessToken: data.token.access_token };
|
|
35
35
|
setStorage({
|
|
36
|
-
key:
|
|
36
|
+
key: AUTH_TOKENS_STORAGE_KEY,
|
|
37
37
|
data: this.tokens
|
|
38
38
|
});
|
|
39
39
|
}), catchError((error) => {
|
|
@@ -85,7 +85,7 @@ export class MercuryService {
|
|
|
85
85
|
return this.http.post(`/auth`, null, {
|
|
86
86
|
headers: {
|
|
87
87
|
'X-Requested-With': 'XMLHttpRequest',
|
|
88
|
-
Authorization: 'Basic ' +
|
|
88
|
+
Authorization: 'Basic ' + encodeBase64(`${this.config.clientId}:refresh`)
|
|
89
89
|
},
|
|
90
90
|
params: {
|
|
91
91
|
client_id: this.config.clientId,
|
|
@@ -107,9 +107,12 @@ export class MercuryService {
|
|
|
107
107
|
setTokens(tokens) {
|
|
108
108
|
this.tokens = tokens;
|
|
109
109
|
return setStorage({
|
|
110
|
-
key:
|
|
110
|
+
key: AUTH_TOKENS_STORAGE_KEY,
|
|
111
111
|
data: tokens
|
|
112
112
|
});
|
|
113
113
|
}
|
|
114
|
+
patchTokens(tokens) {
|
|
115
|
+
return this.setTokens({ ...this.tokens, ...tokens });
|
|
116
|
+
}
|
|
114
117
|
}
|
|
115
118
|
//# sourceMappingURL=service.js.map
|
package/mercury/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAgB,cAAc,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAItG,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,oBAAoB,EAAY,MAAM,kBAAkB,CAAC;AAC/J,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/service.ts"],"names":[],"mappings":"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"}
|