npm - @next-core/brick-container - Versions diffs - 2.98.4 → 2.98.6 - Mend

@next-core/brick-container 2.98.4 → 2.98.6

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.

Files changed (14) hide show

package/dist/preview.html CHANGED Viewed

	@@ -1 +1 @@
1	- <!doctype html><html lang="zh-CN" data-theme="light" data-mode="default"><head><meta charset="utf-8"/><base href="<!--# echo var='base_href' default='/' -->"/><script>window.DEVELOPER_PREVIEW = true;</script><link href="preview.5fb551513edc8051ce6c.css" rel="stylesheet"></head><body><div id="preview-root"><div id="main-mount-point"></div><div id="bg-mount-point" style="display: none"></div><div id="portal-mount-point"></div></div><script src="dll.~~3ea99c34~~.js"></script><script src="polyfill.3e88f145a0893497373b.js"></script><script src="preview.~~72e368a83355f2b8e640~~.js"></script></body></html>
1	+ <!doctype html><html lang="zh-CN" data-theme="light" data-mode="default"><head><meta charset="utf-8"/><base href="<!--# echo var='base_href' default='/' -->"/><script>window.DEVELOPER_PREVIEW = true;</script><link href="preview.5fb551513edc8051ce6c.css" rel="stylesheet"></head><body><div id="preview-root"><div id="main-mount-point"></div><div id="bg-mount-point" style="display: none"></div><div id="portal-mount-point"></div></div><script src="dll.1aba6ab3.js"></script><script src="polyfill.3e88f145a0893497373b.js"></script><script src="preview.d633590bef44d91b5fad.js"></script></body></html>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "2.98.4",
+  "version": "2.98.6",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/brick-container",
   "license": "GPL-3.0",
@@ -41,18 +41,18 @@
     "ws": "^8.11.0"
   },
   "devDependencies": {
-    "@next-core/brick-dll": "^2.50.7",
+    "@next-core/brick-dll": "^2.50.8",
     "@next-core/brick-icons": "^2.34.9",
     "@next-core/custom-antd-styles": "^1.27.1",
     "@next-core/illustrations": "^0.11.37",
     "@next-core/less-plugin-css-variables": "^0.2.8",
     "@next-core/theme": "^1.5.4",
     "@next-core/webpack-config-factory": "^2.25.2",
-    "@next-dll/ace": "^2.0.808",
+    "@next-dll/ace": "^2.0.809",
     "@next-dll/d3": "^2.0.84",
     "@next-dll/echarts": "^2.0.85",
-    "@next-dll/editor-bricks-helper": "^0.41.7",
-    "@next-dll/react-dnd": "^0.1.746",
+    "@next-dll/editor-bricks-helper": "^0.41.8",
+    "@next-dll/react-dnd": "^0.1.747",
     "babel-loader": "^8.3.0",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^6.4.1",
@@ -73,5 +73,5 @@
     "webpack-dev-server": "^4.11.1",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "6a633f931b24484c6015158c5e59e5d1c357f973"
+  "gitHead": "a8efbe1c6306e23b0a4056ec5215eba58e77348a"
 }

package/tools/utils/custom_get_token_util.py ADDED Viewed

@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+TOOLS_DIR = "/usr/local/easyops/deploy_init/tools"
+APP_ID = "brick_next"
+import sys
+sys.path.append(TOOLS_DIR)
+def get_token(user, org):
+    """
+    通过 app_id 从配置中获取 client_id 和 secret, 然后调用 get_token_util.get_token
+    参数: (user: 用户名, org: 组织名)
+    返回: token 或空字符串(当认证功能关闭时)
+    异常: 当认证功能启用但相关工具或配置缺失时抛出异常
+    """
+    # 尝试导入 deploy_init config_reader
+    try:
+        from config_reader import get_config_value
+    except ImportError:
+        return ""
+    try:
+        enable = get_config_value("deploy_init", "common", "check_auth_token.enable")
+        if str(enable).lower() != "true":
+            return ""
+    except KeyError:
+        return ""
+    except Exception as e:
+        raise Exception("get_token: failed to read check_auth_token.enable: %s" % str(e))
+    # 尝试导入 deploy_init get_token_util
+    try:
+        import get_token_util
+    except ImportError:
+        # 开关打开的情况下，如果没有找到 get_token_util 模块，则抛出异常
+        raise Exception("get_token: check_auth_token is enabled, but deploy_init get_token_util module not found!")
+    try:
+        client_id = get_config_value(APP_ID, "application", "client_id")
+        secret = get_config_value(APP_ID, "application", "secret")
+    except KeyError as ke:
+        raise Exception("get_token: required key missing in appId [%s]: %s" % (APP_ID, str(ke)))
+    except Exception as e:
+        raise Exception("get_token: failed to read clientId or secret for appId [%s]: %s" % (APP_ID, str(e)))
+    return get_token_util.get_token(user, org, client_id, secret)
+if __name__ == '__main__':
+    if len(sys.argv) != 3:
+        sys.stderr.write("Usage: python custom_get_token_util.py <user> <org>\n")
+        sys.exit(1)
+    user = sys.argv[1]
+    org = sys.argv[2]
+    token = get_token(user, org)
+    print(token)

package/tools/utils/get_headers.py CHANGED Viewed

@@ -1,25 +1,13 @@
 # -*- coding: utf-8 -*-
-import sys
-import os
+from custom_get_token_util import get_token
-TOOLS_DIR = "/usr/local/easyops/deploy_init/tools"
-sys.path.append(TOOLS_DIR)
-get_token = None
-token_util_path = os.path.join(TOOLS_DIR, "get_token_util.py")
-if os.path.exists(token_util_path):
-    from get_token_util import get_token
-APP_ID = "brick_next"
 DEFAULT_USER = "defaultUser"
 def get_headers(org, user=DEFAULT_USER):
     headers = {"org": str(org), "user": user}
-    if get_token is None:
-        return headers
-    token = get_token(user=user, org=int(org), app_id=APP_ID)
+    token = get_token(user=user, org=int(org))
     if not token:
         return headers