@das-fed/utils 7.0.7-hot.47 → 7.0.7-hot.49

package/create-api-service/thirdLogout/index.js

@@ -1694,22 +1694,22 @@ b.getAdapter = Qe.getAdapter;
 b.HttpStatusCode = le;
 b.default = b;
 const {
-  Axios: zn,
-  AxiosError: $n,
-  CanceledError: vn,
-  isCancel: Jn,
-  CancelToken: Vn,
-  VERSION: Wn,
-  all: Kn,
-  Cancel: Xn,
-  isAxiosError: Gn,
-  spread: Qn,
-  toFormData: Zn,
-  AxiosHeaders: Yn,
-  HttpStatusCode: er,
-  formToJSON: tr,
-  getAdapter: nr,
-  mergeConfig: rr
+  Axios: $n,
+  AxiosError: vn,
+  CanceledError: Jn,
+  isCancel: Vn,
+  CancelToken: Wn,
+  VERSION: Kn,
+  all: Xn,
+  Cancel: Gn,
+  isAxiosError: Qn,
+  spread: Zn,
+  toFormData: Yn,
+  AxiosHeaders: er,
+  HttpStatusCode: tr,
+  formToJSON: nr,
+  getAdapter: rr,
+  mergeConfig: sr
 } = b;
 /*! js-cookie v3.0.5 | MIT */
 function v(e) {
@@ -1784,15 +1784,15 @@ function fe(e, t) {
 var Pe = fe(kn, { path: "/" });
 const Bn = "/api/justauth/client/v1/visitor/sso-param", Dn = {
   uat: "https://sso-uat.jmc.com.cn"
-}, sr = () => {
-  const e = localStorage.getItem("thirdLogouSource");
-  return e === "zhongshen" || e === "jmc";
+}, jn = () => {
+  const e = localStorage.getItem("thirdLogouSource"), t = localStorage.getItem("loginType");
+  return e === "jmc" && t === "das" ? !1 : e === "zhongshen" || e === "jmc";
 }, tt = (e) => {
   localStorage.removeItem("thirdLogouSource"), location.href = e;
-}, jn = (e) => {
+}, In = (e) => {
   const n = `https://iam.shenyejituan.com:443/idp/profile/OAUTH2/Redirect/GLO?redirctToUrl=${encodeURIComponent(e)}&entityId=AIoT&redirectToLogin=true`;
   tt(n);
-}, In = async () => {
+}, qn = async () => {
   let e = "";
   try {
     const { baseURL: s } = nt();
@@ -1819,16 +1819,17 @@ const Bn = "/api/justauth/client/v1/visitor/sso-param", Dn = {
   }
   tt(e);
 }, or = async (e) => {
+  if (!jn()) return;
   const t = localStorage.getItem("thirdLogouSource");
   if (t === "zhongshen") {
-    jn(e);
+    In(e);
     return;
   }
-  t === "jmc" && await In();
+  t === "jmc" && await qn();
 };
 export {
-  sr as isThirdLogin,
-  In as jmcLogout,
+  jn as isThirdLogin,
+  qn as jmcLogout,
   or as thirdLogout,
-  jn as zhongshenLogout
+  In as zhongshenLogout
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "7.0.7-hot.47",
+  "version": "7.0.7-hot.49",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "7.0.7-hot.47",
+    "@das-fed/utils": "7.0.7-hot.49",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -21,8 +21,8 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@das-fed/cli": "7.0.7-hot.47",
-    "@das-fed/web": "7.0.7-hot.47",
+    "@das-fed/cli": "7.0.7-hot.49",
+    "@das-fed/web": "7.0.7-hot.49",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",