@solar-taro/planets 1.4.2 → 1.5.1

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.5.0 (2025-10-18)
+
+### 🚀 Features
+
+- **planets/mercury:** add new auth interceptors
+- **ui-sun/slider-captcha:** add slider captcha component
+- **planets/earth:** support custom http-client for earth service
+
+### 🩹 Fixes
+
+- **planets/earth:** add common interceptor
+
+### ❤️ Thank You
+
+- HyperLife1119
+
+## 1.4.2 (2025-10-13)
+
+This was a version bump only for planets to align it with other projects, there were no code changes.
+
 ## 1.4.1 (2025-10-13)
 
 This was a version bump only for planets to align it with other projects, there were no code changes.

package/earth/service.d.ts

@@ -3,7 +3,8 @@ import { Category, Channel, Origin, UploadKeys } from '@solar-kit/planets/earth'
 import { Result } from '@solar-kit/planets/sun';
 export interface EarthConfig {
     /** earth service host */
-    url: string;
+    url?: string;
+    http?: HttpClient;
 }
 export declare const setupEarth: (config: EarthConfig) => void, earthService: () => EarthService;
 export declare class EarthService {

package/earth/service.js

@@ -1,17 +1,20 @@
 import { HttpClient, HttpContext, withInterceptors } from '@ngify/http';
 import { Origin } from '@solar-kit/planets/earth';
 import { defineService, overlay } from '@solar-taro/core';
-import { CACHEABLE_TOKEN, useApiInterceptor, useCacheInterceptor } from '@solar-taro/http';
+import { CACHEABLE_TOKEN, useApiInterceptor, useAutoHostInterceptor, useCacheInterceptor, useCommonInterceptor } from '@solar-taro/http';
 import { tap } from 'rxjs';
-import { useAuthInterceptor } from '../mercury/index.js';
+import { useWxAuthInterceptor } from '../mercury/index.js';
 export const [setupEarth, earthService] = defineService((config) => new EarthService(config));
 export class EarthService {
     constructor(config) {
+        var _a;
         this.config = config;
-        this.http = new HttpClient(withInterceptors([
+        this.http = (_a = this.config.http) !== null && _a !== void 0 ? _a : new HttpClient(withInterceptors([
+            useAutoHostInterceptor(this.config.url),
             useApiInterceptor(),
+            useCommonInterceptor(),
             useCacheInterceptor(),
-            useAuthInterceptor(),
+            useWxAuthInterceptor(),
         ]));
     }
     /**
@@ -20,14 +23,14 @@ export class EarthService {
      * @deprecated 使用小程序来获取手机号
      */
     sendSmsCode(cellphone) {
-        return this.http.get(`${this.config.url}/sms/code/${cellphone}`).pipe(tap(({ code }) => code === 0 && overlay.success('发送成功')));
+        return this.http.get(`/sms/code/${cellphone}`).pipe(tap(({ code }) => code === 0 && overlay.success('发送成功')));
     }
     /**
      * 获得信道
      * @param origin
      */
     channels(origin) {
-        return this.http.get(`${this.config.url}/channel/${origin}`, {
+        return this.http.get(`/channel/${origin}`, {
             context: new HttpContext().set(CACHEABLE_TOKEN, true)
         });
     }
@@ -36,7 +39,7 @@ export class EarthService {
      * @param origin
      */
     categories(origin) {
-        return this.http.get(`${this.config.url}/category/${origin}`, {
+        return this.http.get(`/category/${origin}`, {
             context: new HttpContext().set(CACHEABLE_TOKEN, true)
         });
     }
@@ -59,8 +62,8 @@ export class EarthService {
      */
     qiniuToken(bucket) {
         const url = {
-            [0]: `${this.config.url}/res/upload-token`,
-            [1]: `${this.config.url}/media/upload-token`,
+            [0]: `/res/upload-token`,
+            [1]: `/media/upload-token`,
         }[bucket];
         return this.http.get(url);
     }
@@ -69,18 +72,18 @@ export class EarthService {
      * @deprecated {@link avatarUploadKey}
      */
     avatarKey() {
-        return this.http.get(`${this.config.url}/avatar/upload-key`);
+        return this.http.get(`/avatar/upload-key`);
     }
     avatarUploadKey() {
-        return this.http.get(`${this.config.url}/qiniu/avatar/upload-key`);
+        return this.http.get(`/qiniu/avatar/upload-key`);
     }
     mediaUploadKeys(keySize = 1) {
-        return this.http.get(`${this.config.url}/qiniu/media/upload-keys`, {
+        return this.http.get(`/qiniu/media/upload-keys`, {
             params: { keySize }
         });
     }
     licenseUploadKeys(keySize = 1) {
-        return this.http.get(`${this.config.url}/qiniu/license/upload-keys`, {
+        return this.http.get(`/qiniu/license/upload-keys`, {
             params: { keySize }
         });
     }

package/earth/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/planets/src/earth/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/planets/src/earth/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAqB,MAAM,EAAc,MAAM,0BAA0B,CAAC;AAEjF,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACzI,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAC3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAQlD,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,aAAa,CAAC,CAAC,MAAmB,EAAE,EAAE,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;AAE3G,MAAM,OAAO,YAAY;IAWvB,YACkB,MAAmB;;QAAnB,WAAM,GAAN,MAAM,CAAa;QAX5B,SAAI,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,IAAI,mCAAI,IAAI,UAAU,CAChD,gBAAgB,CAAC;YACf,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,GAAI,CAAC;YACxC,iBAAiB,EAAE;YACnB,oBAAoB,EAAE;YACtB,mBAAmB,EAAE;YACrB,oBAAoB,EAAE;SACvB,CAAC,CACH,CAAC;IAIE,CAAC;IAEL;;;;OAIG;IACH,WAAW,CAAC,SAA0B;QACpC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAS,aAAa,SAAS,EAAE,CAAC,CAAC,IAAI,CACzD,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CACzD,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,QAAQ,CAAC,MAAc;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAoB,YAAY,MAAM,EAAE,EAAE;YAC5D,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC;SACtD,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,UAAU,CAAC,MAAc;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAqB,aAAa,MAAM,EAAE,EAAE;YAC9D,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC;SACtD,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED;;OAEG;IACH,YAAY;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,MAAa;QACtB,MAAM,GAAG,GAAG;YACV,CAAC,CAAC,CAAC,EAAE,mBAAmB;YACxB,CAAC,CAAC,CAAC,EAAE,qBAAqB;SAC3B,CAAC,MAAM,CAAC,CAAC;QAEV,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAiB,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,SAAS;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAiB,oBAAoB,CAAC,CAAC;IAC7D,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAqB,0BAA0B,CAAC,CAAC;IACvE,CAAC;IAED,eAAe,CAAC,OAAO,GAAG,CAAC;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAqB,0BAA0B,EAAE;YACnE,MAAM,EAAE,EAAE,OAAO,EAAE;SACpB,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,OAAO,GAAG,CAAC;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAqB,4BAA4B,EAAE;YACrE,MAAM,EAAE,EAAE,OAAO,EAAE;SACpB,CAAC,CAAC;IACL,CAAC;CACF"}

package/mercury/auth-interceptor.d.ts

@@ -0,0 +1,10 @@
+import { HttpContextToken, HttpInterceptorFn } from '@ngify/http';
+export declare const AUTH_TOKEN: HttpContextToken<boolean>;
+export declare const AUTH_REDIRECT_TOKEN: HttpContextToken<boolean>;
+/**
+ * Mercury 认证拦截器
+ * - 使用 {@link AUTH_TOKEN} 跳过该拦截器
+ * - 使用 {@link AUTH_REDIRECT_TOKEN} 关闭认证失败自动跳转到 `/login`
+ * @returns
+ */
+export declare function useAuthInterceptor(): HttpInterceptorFn;

package/mercury/auth-interceptor.js

@@ -0,0 +1,80 @@
+import { HttpContextToken, HttpStatusCode } from '@ngify/http';
+import { overlay, router } from '@solar-taro/core';
+import { cacheManager, CATCH_HTTP_ERROR_TOKEN } from '@solar-taro/http';
+import { catchError, EMPTY, finalize, map, share, switchMap } from 'rxjs';
+import { mercuryService } from './service.js';
+export const AUTH_TOKEN = new HttpContextToken(() => true);
+export const AUTH_REDIRECT_TOKEN = new HttpContextToken(() => true);
+/**
+ * Mercury 认证拦截器
+ * - 使用 {@link AUTH_TOKEN} 跳过该拦截器
+ * - 使用 {@link AUTH_REDIRECT_TOKEN} 关闭认证失败自动跳转到 `/login`
+ * @returns
+ */
+export function useAuthInterceptor() {
+    /** 令牌刷新器 */
+    let refreshToken$ = null;
+    let relaunching = false;
+    return (request, next) => {
+        /**
+        * 等待令牌后再发送请求
+        * @param request
+        * @param next
+        */
+        function waitToken(request, next) {
+            return refreshToken$.pipe(switchMap(({ data }) => (next(request.clone({
+                headers: request.headers.set('Authorization', 'Bearer ' + data.access_token)
+            })))));
+        }
+        /**
+         * 获取访问令牌
+         */
+        function updateToken() {
+            refreshToken$ || (refreshToken$ = mercuryService().refreshCertificate().pipe(map(result => {
+                if ((result === null || result === void 0 ? void 0 : result.code) !== 0) {
+                    throw result;
+                }
+                return result;
+            }), catchError(error => {
+                // 如果刷新令牌都出错了，则这些等待刷新令牌的请求也不需要捕获 HTTP 错误了
+                request.context.set(CATCH_HTTP_ERROR_TOKEN, false);
+                overlay.tips('登录状态过期，请重新登录...');
+                relaunchToLogin();
+                cacheManager.revokeAll();
+                throw error;
+            }), finalize(() => refreshToken$ = null), share()));
+        }
+        function relaunchToLogin() {
+            if (!relaunching && router.path !== router.buildUrl('login') && request.context.get(AUTH_REDIRECT_TOKEN)) {
+                relaunching = true;
+                router.relaunch('login').finally(() => relaunching = false);
+            }
+        }
+        if (!request.context.get(AUTH_TOKEN)) {
+            return next(request);
+        }
+        if (!mercuryService().tokens.refreshToken) {
+            relaunchToLogin();
+            return EMPTY;
+        }
+        if (!mercuryService().tokens.accessToken && !refreshToken$) {
+            updateToken();
+        }
+        if (refreshToken$) {
+            return waitToken(request, next);
+        }
+        request = request.clone({
+            headers: request.headers.append('Authorization', 'Bearer ' + mercuryService().tokens.accessToken)
+        });
+        return next(request).pipe(catchError((error) => {
+            if (error.status === HttpStatusCode.Unauthorized) {
+                if (!refreshToken$) {
+                    updateToken();
+                }
+                return waitToken(request, next);
+            }
+            throw error;
+        }));
+    };
+}
+//# sourceMappingURL=auth-interceptor.js.map

package/mercury/auth-interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth-interceptor.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/auth-interceptor.ts"],"names":[],"mappings":"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"}

package/mercury/index.d.ts

@@ -1,2 +1,3 @@
-export * from './auth.interceptor';
+export * from './auth-interceptor';
 export * from './service';
+export * from './wx-auth-interceptor';

package/mercury/index.js

@@ -1,3 +1,4 @@
-export * from './auth.interceptor.js';
+export * from './auth-interceptor.js';
 export * from './service.js';
+export * from './wx-auth-interceptor.js';
 //# sourceMappingURL=index.js.map

package/mercury/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,uBAAuB,CAAC"}

package/mercury/service.d.ts

@@ -1,5 +1,6 @@
 import { HttpClient } from '@ngify/http';
 import { Fan } from '@solar-kit/planets/earth';
+import { SmsLogin } from '@solar-kit/planets/mercury';
 import { AuthTokens, Result } from '@solar-kit/planets/sun';
 import { Observable } from 'rxjs';
 import { WxAuth } from './model';
@@ -7,13 +8,32 @@ export interface MercuryConfig {
     /** mercury service host */
     url: string;
     app: string;
-    fan: Fan;
+    clientId?: string;
+    fan?: Fan;
 }
+export declare const AUTH_TOKEN_STORAGE_KEY = "auth-token";
 export declare const setupMercury: (config: MercuryConfig) => void, mercuryService: () => MercuryService;
 export declare class MercuryService {
     protected readonly config: MercuryConfig;
     protected http: HttpClient;
-    tokens: AuthTokens;
+    tokens: Partial<AuthTokens>;
     constructor(config: MercuryConfig);
     auth(relogin?: boolean): Observable<Result<WxAuth>>;
+    login(phoneNumberCode: string): Observable<Result<string | AuthTokens>>;
+    /**
+     * { code: 0, data: { access_token: string; refresh_token: string; } }，表示登录成功
+     * { code: 1, data: token }，表示手机号未注册，需要跳转到注册页面，且不需要短信验证码
+     * @param data
+     * @returns
+     */
+    smsLogin(data: Partial<SmsLogin>): Observable<Result<string | {
+        access_token: string;
+        refresh_token: string;
+    }>>;
+    logout(): Promise<TaroGeneral.CallbackResult>;
+    refreshCertificate(): Observable<Result<{
+        access_token: string;
+        refresh_token: string;
+    }>>;
+    setTokens(tokens: Partial<AuthTokens>): Promise<TaroGeneral.CallbackResult>;
 }

package/mercury/service.js

@@ -1,35 +1,39 @@
-import { HttpClient, HttpStatusCode, withInterceptors } from '@ngify/http';
+import { HttpClient, HttpContext, HttpStatusCode, withInterceptors } from '@ngify/http';
 import { defineService } from '@solar-taro/core';
-import { useApiInterceptor } from '@solar-taro/http';
+import { CATCH_HTTP_ERROR_TOKEN, CATCH_RESULT_ERROR_TOKEN, useApiInterceptor, useAutoHostInterceptor, useCommonInterceptor } from '@solar-taro/http';
 import { checkSession, getStorageSync, getUserInfo, login, setStorage } from '@tarojs/taro';
+import { btoa } from 'js-base64';
 import { catchError, defer, from, map, switchMap, tap } from 'rxjs';
-const TOKEN_STORAGE_KEY = 'auth-token';
+export const AUTH_TOKEN_STORAGE_KEY = 'auth-token';
 export const [setupMercury, mercuryService] = defineService((config) => new MercuryService(config));
 export class MercuryService {
     constructor(config) {
         this.config = config;
         this.http = new HttpClient(withInterceptors([
-            useApiInterceptor()
+            useAutoHostInterceptor(this.config.url),
+            useApiInterceptor(),
+            useCommonInterceptor()
         ]));
-        this.tokens = getStorageSync(TOKEN_STORAGE_KEY) || {};
+        this.tokens = getStorageSync(AUTH_TOKEN_STORAGE_KEY) || {};
     }
     auth(relogin = false) {
         return defer(() => relogin
             ? login()
             : from(checkSession()).pipe(map(() => ({ code: null })), catchError(() => login()))).pipe(switchMap(({ code }) => from(getUserInfo()).pipe(map(({ encryptedData, iv }) => ({ code, encryptedData, iv })))), switchMap(({ code, encryptedData, iv }) => {
-            return this.http.post(`${this.config.url}/oaa/wx/auth`, null, {
+            var _a;
+            return this.http.post(`/wx/auth`, null, {
                 headers: {
                     ["X-WX-Code" /* WxHeader.Code */]: code || '',
                     ["X-WX-Encrypted-Data" /* WxHeader.EncryptedData */]: encryptedData,
                     ["X-WX-IV" /* WxHeader.Iv */]: iv,
                     ["X-WX-APP" /* WxHeader.App */]: this.config.app,
-                    ["X-WX-OPEN-ID" /* WxHeader.OpenId */]: this.config.fan.openId || '',
+                    ["X-WX-OPEN-ID" /* WxHeader.OpenId */]: ((_a = this.config.fan) === null || _a === void 0 ? void 0 : _a.openId) || '',
                 }
             });
         }), tap(({ data }) => {
             this.tokens = { accessToken: data.token.access_token };
             setStorage({
-                key: TOKEN_STORAGE_KEY,
+                key: AUTH_TOKEN_STORAGE_KEY,
                 data: this.tokens
             });
         }), catchError((error) => {
@@ -39,5 +43,73 @@ export class MercuryService {
             throw error;
         }));
     }
+    login(phoneNumberCode) {
+        return defer(() => login()).pipe(switchMap(({ code }) => this.http.post(`/wx/mobile/login`, {
+            jsCode: code,
+            code: phoneNumberCode,
+            alias: this.config.app
+        }, {
+            context: new HttpContext().set(CATCH_RESULT_ERROR_TOKEN, false)
+        })), tap(({ code, data }) => {
+            if (code === 0) {
+                this.setTokens(data);
+            }
+        }));
+    }
+    /**
+     * { code: 0, data: { access_token: string; refresh_token: string; } }，表示登录成功
+     * { code: 1, data: token }，表示手机号未注册，需要跳转到注册页面，且不需要短信验证码
+     * @param data
+     * @returns
+     */
+    smsLogin(data) {
+        return this.http.post(`/sms/login`, {
+            ...data,
+            service: this.config.clientId,
+            remember: true
+        }, {
+            context: new HttpContext().set(CATCH_RESULT_ERROR_TOKEN, false)
+        }).pipe(tap(({ code, data }) => {
+            if (code === 0) {
+                this.setTokens({
+                    accessToken: data.access_token,
+                    refreshToken: data.refresh_token
+                });
+            }
+        }));
+    }
+    logout() {
+        return this.setTokens({});
+    }
+    refreshCertificate() {
+        return this.http.post(`/auth`, null, {
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest',
+                Authorization: 'Basic ' + btoa(`${this.config.clientId}:refresh`)
+            },
+            params: {
+                client_id: this.config.clientId,
+                grant_type: 'refresh_token',
+                refresh_token: this.tokens.refreshToken
+            },
+            context: new HttpContext()
+                .set(CATCH_RESULT_ERROR_TOKEN, false)
+                .set(CATCH_HTTP_ERROR_TOKEN, false)
+        }).pipe(tap(({ code, data }) => {
+            if (code === 0) {
+                this.setTokens({
+                    accessToken: data.access_token,
+                    refreshToken: data.refresh_token
+                });
+            }
+        }));
+    }
+    setTokens(tokens) {
+        this.tokens = tokens;
+        return setStorage({
+            key: AUTH_TOKEN_STORAGE_KEY,
+            data: tokens
+        });
+    }
 }
 //# sourceMappingURL=service.js.map

package/mercury/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/service.ts"],"names":[],"mappings":"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"}

package/mercury/{auth.interceptor.d.ts → wx-auth-interceptor.d.ts}

@@ -1,3 +1,3 @@
 import type { HttpInterceptorFn } from '@ngify/http';
 /** 负责基础业务接口的认证 */
-export declare function useAuthInterceptor(): HttpInterceptorFn;
+export declare function useWxAuthInterceptor(): HttpInterceptorFn;

package/mercury/{auth.interceptor.js → wx-auth-interceptor.js}

@@ -2,7 +2,7 @@ import { HttpStatusCode } from '@ngify/http';
 import { catchError, finalize, share, switchMap } from 'rxjs';
 import { mercuryService } from './service.js';
 /** 负责基础业务接口的认证 */
-export function useAuthInterceptor() {
+export function useWxAuthInterceptor() {
     /** 令牌刷新器 */
     let refresher = null;
     /**
@@ -43,4 +43,4 @@ export function useAuthInterceptor() {
         }));
     };
 }
-//# sourceMappingURL=auth.interceptor.js.map
+//# sourceMappingURL=wx-auth-interceptor.js.map

package/mercury/wx-auth-interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wx-auth-interceptor.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/wx-auth-interceptor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAc,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,kBAAkB;AAClB,MAAM,UAAU,oBAAoB;IAClC,YAAY;IACZ,IAAI,SAAS,GAAsC,IAAI,CAAC;IAExD;;OAEG;IACH,SAAS,WAAW;QAClB,SAAS,GAAG,cAAc,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,CACtC,QAAQ,CAAC,GAAG,EAAE,CAAC,SAAS,GAAG,IAAI,CAAC,EAChC,KAAK,EAAE,CACR,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,SAAS,SAAS,CAAC,OAA6B,EAAE,IAAmB;QACnE,OAAO,SAAU,CAAC,IAAI,CACpB,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CACtB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YACjB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;SACnF,CAAC,CAAC,CACJ,CAAC,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,OAA6B,EAAE,IAAmB,EAAkC,EAAE;QAC5F,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC,MAAM,CAAC;QAEvC,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,CAAA,IAAI,CAAC,SAAS,EAAE,CAAC;YACvC,WAAW,EAAE,CAAC;QAChB,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC;SAC9E,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CACvB,UAAU,CAAC,CAAC,KAA4B,EAAE,EAAE;YAC1C,IAAI,KAAK,CAAC,MAAM,KAAK,cAAc,CAAC,YAAY,EAAE,CAAC;gBACjD,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,WAAW,EAAE,CAAC;gBAChB,CAAC;gBAED,OAAO,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAClC,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAA;AACH,CAAC"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@solar-taro/planets",
-  "version": "1.4.2",
+  "version": "1.5.1",
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "tslib": "^2.3.0"
+    "tslib": "^2.3.0",
+    "js-base64": "^3.0.0"
   },
   "exports": {
     "./package.json": "./package.json",

package/mercury/auth.interceptor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth.interceptor.js","sourceRoot":"","sources":["../../../../packages/planets/src/mercury/auth.interceptor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAc,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,kBAAkB;AAClB,MAAM,UAAU,kBAAkB;IAChC,YAAY;IACZ,IAAI,SAAS,GAAsC,IAAI,CAAC;IAExD;;OAEG;IACH,SAAS,WAAW;QAClB,SAAS,GAAG,cAAc,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,CACtC,QAAQ,CAAC,GAAG,EAAE,CAAC,SAAS,GAAG,IAAI,CAAC,EAChC,KAAK,EAAE,CACR,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,SAAS,SAAS,CAAC,OAA6B,EAAE,IAAmB;QACnE,OAAO,SAAU,CAAC,IAAI,CACpB,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CACtB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YACjB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;SACnF,CAAC,CAAC,CACJ,CAAC,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,OAA6B,EAAE,IAAmB,EAAkC,EAAE;QAC5F,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC,MAAM,CAAC;QAEvC,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,CAAA,IAAI,CAAC,SAAS,EAAE,CAAC;YACvC,WAAW,EAAE,CAAC;QAChB,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC;SAC9E,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CACvB,UAAU,CAAC,CAAC,KAA4B,EAAE,EAAE;YAC1C,IAAI,KAAK,CAAC,MAAM,KAAK,cAAc,CAAC,YAAY,EAAE,CAAC;gBACjD,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,WAAW,EAAE,CAAC;gBAChB,CAAC;gBAED,OAAO,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAClC,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAA;AACH,CAAC"}