@litianxiang/portal-core 0.1.19 → 0.1.20

package/dist/index.d.ts

@@ -52,14 +52,14 @@ interface InactivityResult {
 declare function calcInactivityAction(lastActiveTime: number | null | undefined, now: number, config?: InactivityConfig): InactivityResult;
 
 interface CreateAuthHttpClientOptions {
-    axios: any;
+    axios?: any;
     baseURL?: string;
     timeout?: number;
     getUserStore: () => any;
     getLoadingStore: () => any;
     authLoginUrl?: string;
     ssoStorageKey?: string;
-    refreshUrl: string;
+    refreshUrl?: string;
     inactiveExpireMs?: number;
     inactiveBufferMs?: number;
     onShowError?: (msg: string) => void;

package/dist/index.js

@@ -223,6 +223,24 @@ function calcInactivityAction(lastActiveTime, now, config = {}) {
   };
 }
 
+// src/http/http.ts
+import axiosLib from "axios";
+
+// src/config/auth-config.ts
+var DEFAULT_SSO_STORAGE_KEY = "user-store";
+var DEFAULT_AUTH_LOGIN_ENV_KEY = "VITE_AUTH_LOGIN_URL";
+var DEFAULT_AUTH_LOGIN_PATH = "/auth/#/login";
+function getDefaultAuthLoginUrl() {
+  if (typeof window === "undefined") return "";
+  const origin = window.location.origin || "";
+  return `${origin}${DEFAULT_AUTH_LOGIN_PATH}`;
+}
+var AUTH_CONFIG = {
+  ssoStorageKey: DEFAULT_SSO_STORAGE_KEY,
+  authLoginEnvKey: DEFAULT_AUTH_LOGIN_ENV_KEY,
+  authLoginPath: DEFAULT_AUTH_LOGIN_PATH
+};
+
 // src/http/http.ts
 function createAuthHttpClient(options) {
   const {
@@ -232,20 +250,22 @@ function createAuthHttpClient(options) {
     getUserStore,
     getLoadingStore,
     authLoginUrl,
-    ssoStorageKey = "user-store",
-    refreshUrl,
+    ssoStorageKey = AUTH_CONFIG.ssoStorageKey,
+    refreshUrl = "/proxy/auth/api/token/refresh",
     inactiveExpireMs,
     inactiveBufferMs,
     onShowError
   } = options;
-  const http = axios.create({
+  const axiosInstance = axios || axiosLib;
+  const resolvedAuthLoginUrl = authLoginUrl || import.meta?.env?.[AUTH_CONFIG.authLoginEnvKey] || getDefaultAuthLoginUrl();
+  const http = axiosInstance.create({
     baseURL,
     timeout
   });
   const logoutToAuth = createLogoutToAuth({
     getUserStore,
     getLoadingStore,
-    authLoginUrl,
+    authLoginUrl: resolvedAuthLoginUrl,
     ssoStorageKey
   });
   let isRefreshing = false;
@@ -275,7 +295,7 @@ function createAuthHttpClient(options) {
       if (shouldRefresh && !isRefreshing) {
         isRefreshing = true;
         try {
-          const response = await axios.post(refreshUrl, {}, {
+          const response = await axiosInstance.post(refreshUrl, {}, {
             headers: { Authorization: `Bearer ${refreshToken}` }
           });
           const result = response.data;
@@ -842,21 +862,6 @@ function createLoadingStoreOptions() {
     }
   };
 }
-
-// src/config/auth-config.ts
-var DEFAULT_SSO_STORAGE_KEY = "user-store";
-var DEFAULT_AUTH_LOGIN_ENV_KEY = "VITE_AUTH_LOGIN_URL";
-var DEFAULT_AUTH_LOGIN_PATH = "/auth/#/login";
-function getDefaultAuthLoginUrl() {
-  if (typeof window === "undefined") return "";
-  const origin = window.location.origin || "";
-  return `${origin}${DEFAULT_AUTH_LOGIN_PATH}`;
-}
-var AUTH_CONFIG = {
-  ssoStorageKey: DEFAULT_SSO_STORAGE_KEY,
-  authLoginEnvKey: DEFAULT_AUTH_LOGIN_ENV_KEY,
-  authLoginPath: DEFAULT_AUTH_LOGIN_PATH
-};
 export {
   AUTH_CONFIG,
   DEFAULT_AUTH_LOGIN_ENV_KEY,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@litianxiang/portal-core",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "private": false,
   "type": "module",
   "main": "dist/index.js",
@@ -17,6 +17,9 @@
     "vue-router": "^4.5.0",
     "dayjs": "^1.11.0"
   },
+  "dependencies": {
+    "axios": "^1.8.4"
+  },
   "devDependencies": {
     "tsup": "^8.3.0",
     "typescript": "^5.6.3",