@gct-paas/core 6.1.1 → 6.1.2

package/dist/{redirect-index--JPC8wUS.js → redirect-index-hXpPk-AN.js}

@@ -1,2 +1,2 @@
-/*! @gct-paas/core v6.1.0-fix.0 */
+/*! @gct-paas/core v6.1.2 */
 import{createElementBlock as e,defineComponent as r,openBlock as t,unref as a}from"vue";import{useRouter as p}from"vue-router";var o=/* @__PURE__ */r({__name:"redirect-index",setup(r){const{currentRoute:o,replace:i}=p(),{params:s,query:u}=a(o),{path:m,_redirect_type:n="path"}=s;Reflect.deleteProperty(s,"_redirect_type"),Reflect.deleteProperty(s,"path");const c=Array.isArray(m)?m.join("/"):m;return i("name"===n?{name:c,query:u,params:JSON.parse(s._origin_params??"{}")}:{path:c.startsWith("/")?c:"/"+c,query:u}),(r,a)=>(t(),e("div"))}});export{o as default};

package/es/utils/auth-util/auth-util.d.ts

@@ -21,6 +21,10 @@ export declare class AuthUtil {
      * @return {*}  {Promise<void>}
      */
     clearAuthAndGoLogin(): Promise<void>;
+    /**
+     * 使用当前应用上下文跳转到登录页，供退出登录和认证失效共用。
+     */
+    private _goLogin;
     /**
      * 跳转到首页
      *

package/es/utils/auth-util/auth-util.mjs

@@ -27,16 +27,7 @@ var AuthUtil = class AuthUtil {
 	}
 	async logout(goLogin) {
 		await useUserStore().submitLoginOut();
-		if (goLogin) {
-			const url = new URL(`${location.origin}/paas-front/portal`);
-			if (_gct.env.isSandbox || _gct.env.isAppSingle) {
-				if (_gct.store.context.aid) url.searchParams.set("aid", _gct.store.context.aid);
-				url.searchParams.set("env", _gct.env.getEnv());
-				if (_gct.env.isAppSingle) url.searchParams.set("mode", "single");
-			}
-			url.hash = `/login`;
-			window.location.href = url.toString();
-		}
+		if (goLogin) this._goLogin();
 	}
 	/**
 	* 清除认证信息并跳转到登录页
@@ -46,7 +37,18 @@ var AuthUtil = class AuthUtil {
 	async clearAuthAndGoLogin() {
 		setToken();
 		setTenant();
+		this._goLogin();
+	}
+	/**
+	* 使用当前应用上下文跳转到登录页，供退出登录和认证失效共用。
+	*/
+	_goLogin() {
 		const url = new URL(`${location.origin}/paas-front/portal`);
+		if (_gct.env.isSandbox || _gct.env.isAppSingle) {
+			if (_gct.store.context.aid) url.searchParams.set("aid", _gct.store.context.aid);
+			url.searchParams.set("env", _gct.env.getEnv());
+			if (_gct.env.isAppSingle) url.searchParams.set("mode", "single");
+		}
 		url.hash = `/login`;
 		window.location.href = url.toString();
 	}

package/es/utils/tools/tools.d.ts

@@ -10,7 +10,8 @@ export declare function getToken(): string | null;
 /**
  * 设置认证令牌（目前只有 session 级别生效）
  *
- * cookie 不设置 domain 属性，绑定当前完整 hostname（host-only），按域名隔离
+ * cookie 不设置 domain 属性，绑定当前完整 hostname（host-only），按域名隔离；
+ * 写入/清除时同步清掉主域等祖先域上的历史同名 cookie，避免读取时被旧值抢先命中
  *
  * @export
  * @param {string} token

package/es/utils/tools/tools.mjs

@@ -6,9 +6,29 @@ import qs from "qs";
 import { customRef, readonly } from "vue";
 //#region src/utils/tools/tools.ts
 /**
+* 清除主域及祖先域上的同名 cookie
+*
+* 域名隔离改造前认证信息按主域（如 .zhr.cn）写入，与现在绑定当前完整域名的 host-only
+* cookie 并存时，document.cookie 中同名 cookie 按创建时间排序，旧的主域 cookie 会先被
+* getCookie 匹配到，导致读到失效 token 反复跳登录页。子域允许改写父域 cookie，这里逐级
+* 过期祖先域上的同名 cookie，保证只剩当前域的，重新登录后即可正常匹配。
+*
+* @param {string} name cookie 名称
+*/
+function clearInheritedDomainCookies(name) {
+	const { hostname, protocol } = location;
+	if (!hostname.includes(".") || /^\d+(\.\d+){3}$/.test(hostname)) return;
+	const parts = hostname.split(".");
+	for (let i = 0; i <= parts.length - 2; i++) {
+		const domain = parts.slice(i).join(".");
+		document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=.${domain}; path=/${protocol === "https:" ? "; secure" : ""}`;
+	}
+}
+/**
 * 租户 cookie 双向绑定响应式引用：get 直接读 cookie，set 直接写 cookie
 *
-* cookie 不设置 domain 属性，绑定当前完整 hostname（host-only），按域名隔离
+* cookie 不设置 domain 属性，绑定当前完整 hostname（host-only），按域名隔离；
+* 写入/清除时同步清掉主域等祖先域上的历史同名 cookie，避免读取时被旧值抢先命中
 */
 var _tenantRef = customRef((track, trigger) => ({
 	get() {
@@ -16,8 +36,13 @@ var _tenantRef = customRef((track, trigger) => ({
 		return getCookie(CoreConst.TENANT) || "";
 	},
 	set(value) {
-		if (value) setCookie(CoreConst.TENANT, value, 7, false);
-		else clearCookie(CoreConst.TENANT, false);
+		if (value) {
+			clearInheritedDomainCookies(CoreConst.TENANT);
+			setCookie(CoreConst.TENANT, value, 7, false);
+		} else {
+			clearCookie(CoreConst.TENANT, false);
+			clearInheritedDomainCookies(CoreConst.TENANT);
+		}
 		trigger();
 	}
 }));
@@ -34,14 +59,21 @@ function getToken() {
 /**
 * 设置认证令牌（目前只有 session 级别生效）
 *
-* cookie 不设置 domain 属性，绑定当前完整 hostname（host-only），按域名隔离
+* cookie 不设置 domain 属性，绑定当前完整 hostname（host-only），按域名隔离；
+* 写入/清除时同步清掉主域等祖先域上的历史同名 cookie，避免读取时被旧值抢先命中
 *
 * @export
 * @param {string} token
 */
 function setToken(token) {
-	if (token) setCookie(CoreConst.TOKEN, token, 7, false);
-	else clearCookie(CoreConst.TOKEN, false);
+	if (token) {
+		clearInheritedDomainCookies(CoreConst.TOKEN);
+		clearInheritedDomainCookies(CoreConst.TENANT);
+		setCookie(CoreConst.TOKEN, token, 7, false);
+	} else {
+		clearCookie(CoreConst.TOKEN, false);
+		clearInheritedDomainCookies(CoreConst.TOKEN);
+	}
 }
 /**
 * 从 cookie 获取租户标识

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "type": "module",
   "description": "paas 平台核心包",
   "loader": "dist/index.esm.min.js",
@@ -30,10 +30,24 @@
   },
   "license": "MIT",
   "author": "gct",
+  "scripts": {
+    "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",
+    "es:build": "vite build --config vite.dev.config.ts",
+    "build": "npm run lint && vue-tsc --noEmit && vite build --config vite.dev.config.ts && vite build --config vite.config.ts",
+    "lint": "eslint src/",
+    "test": "vitest",
+    "test:run": "vitest run",
+    "test:coverage": "vitest run --coverage",
+    "publish:next": "npm run build && npm publish --access public --tag=next --registry=https://registry.npmjs.org/",
+    "publish:dev": "npm run build && npm publish --access public --tag=dev --registry=https://registry.npmjs.org/",
+    "publish:alpha": "npm run build && npm publish --access public --tag=alpha --registry=https://registry.npmjs.org/",
+    "publish:beta": "npm run build && npm publish --access public --tag=beta --registry=https://registry.npmjs.org/",
+    "publish:npm": "npm run build && npm publish --access public --registry=https://registry.npmjs.org/"
+  },
   "dependencies": {
     "@fingerprintjs/fingerprintjs": "^5.1.0",
     "@floating-ui/dom": "^1.7.6",
-    "@gct-paas/api": "^6.0.0-dev.17",
+    "@gct-paas/api": "catalog:",
     "@module-federation/runtime": "^2.2.3",
     "@vueuse/core": "^14.1.0",
     "async-validator": "^4.2.5",
@@ -60,23 +74,10 @@
     "playwright": "^1.58.0"
   },
   "peerDependencies": {
-    "@gct-paas/api": "^6.0.0-dev.17",
+    "@gct-paas/api": "catalog:",
     "vue": ">=3",
     "vue-i18n": ">=11",
     "vue-router": ">=4"
   },
-  "scripts": {
-    "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",
-    "es:build": "vite build --config vite.dev.config.ts",
-    "build": "npm run lint && vue-tsc --noEmit && vite build --config vite.dev.config.ts && vite build --config vite.config.ts",
-    "lint": "eslint src/",
-    "test": "vitest",
-    "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage",
-    "publish:next": "npm run build && npm publish --access public --tag=next --registry=https://registry.npmjs.org/",
-    "publish:dev": "npm run build && npm publish --access public --tag=dev --registry=https://registry.npmjs.org/",
-    "publish:alpha": "npm run build && npm publish --access public --tag=alpha --registry=https://registry.npmjs.org/",
-    "publish:beta": "npm run build && npm publish --access public --tag=beta --registry=https://registry.npmjs.org/",
-    "publish:npm": "npm run build && npm publish --access public --registry=https://registry.npmjs.org/"
-  }
-}
+  "gitHead": "c9d7e05fb13a69062b6b1924292f9ab1546d8664"
+}