@solar-taro/planets 1.6.0 → 1.6.1
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 +4 -0
- package/mercury/service.d.ts +4 -1
- package/mercury/service.js +17 -1
- package/mercury/service.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
package/mercury/service.d.ts
CHANGED
|
@@ -7,7 +7,9 @@ import { WxAuth } from './model';
|
|
|
7
7
|
export interface MercuryConfig {
|
|
8
8
|
/** mercury service host */
|
|
9
9
|
url: string;
|
|
10
|
+
/** alias */
|
|
10
11
|
app: string;
|
|
12
|
+
/** service */
|
|
11
13
|
clientId?: string;
|
|
12
14
|
fan?: Fan;
|
|
13
15
|
}
|
|
@@ -19,7 +21,8 @@ export declare class MercuryService {
|
|
|
19
21
|
tokens: Partial<AuthTokens>;
|
|
20
22
|
constructor(config: MercuryConfig);
|
|
21
23
|
auth(relogin?: boolean): Observable<Result<WxAuth>>;
|
|
22
|
-
|
|
24
|
+
wxLogin(): Observable<Result<string | AuthTokens>>;
|
|
25
|
+
wxPhoneNumberLogin(phoneNumberCode: string): Observable<Result<string | AuthTokens>>;
|
|
23
26
|
/**
|
|
24
27
|
* { code: 0, data: { access_token: string; refresh_token: string; } }，表示登录成功
|
|
25
28
|
* { code: 1, data: token }，表示手机号未注册，需要跳转到注册页面，且不需要短信验证码
|
package/mercury/service.js
CHANGED
|
@@ -43,7 +43,23 @@ export class MercuryService {
|
|
|
43
43
|
throw error;
|
|
44
44
|
}));
|
|
45
45
|
}
|
|
46
|
-
|
|
46
|
+
wxLogin() {
|
|
47
|
+
return defer(() => login()).pipe(switchMap(({ code }) => from(getUserInfo()).pipe(map(({ encryptedData, iv }) => ({ code, encryptedData, iv })))), switchMap(({ code, encryptedData, iv }) => this.http.post(`/wx/authorize`, null, {
|
|
48
|
+
headers: {
|
|
49
|
+
["X-WX-Code" /* WxHeader.Code */]: code || '',
|
|
50
|
+
["X-WX-Encrypted-Data" /* WxHeader.EncryptedData */]: encryptedData,
|
|
51
|
+
["X-WX-IV" /* WxHeader.Iv */]: iv,
|
|
52
|
+
["X-WX-APP" /* WxHeader.App */]: this.config.app,
|
|
53
|
+
},
|
|
54
|
+
context: new HttpContext()
|
|
55
|
+
.set(CATCH_RESULT_ERROR_TOKEN, false)
|
|
56
|
+
})), tap(({ code, data }) => {
|
|
57
|
+
if (code === 0) {
|
|
58
|
+
this.setTokens(data);
|
|
59
|
+
}
|
|
60
|
+
}));
|
|
61
|
+
}
|
|
62
|
+
wxPhoneNumberLogin(phoneNumberCode) {
|
|
47
63
|
return defer(() => login()).pipe(switchMap(({ code }) => this.http.post(`/wx/mobile/login`, {
|
|
48
64
|
jsCode: code,
|
|
49
65
|
code: phoneNumberCode,
|
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,IAAI,YAAY,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAc,SAAS,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/service.ts"],"names":[],"mappings":"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"}
|