No commit message

steedos · Sep 25, 2024 · 8c7b76e · 8c7b76e
2 parents 81bb3af + 8f2816e
commit 8c7b76e
Show file tree

Hide file tree

Showing 91 changed files with 422 additions and 405 deletions.
diff --git a/deploy/enterprise/app/nodered/settings.js b/deploy/enterprise/app/nodered/settings.js
@@ -38,25 +38,7 @@ module.exports = {
         title: "Steedos Flows",
     },
     uiPort,
-    // adminAuth: {
-    //     type: "credentials",
-    //     users: [{
-    //         username: "admin",
-    //         permissions: "*"
-    //     }],
-    //     authenticate: function(username, password) {
-    //         if (username === 'admin') {
-    //             // 将环境变量中的密码与输入的密码进行比较
-    //             if (password === process.env.NODERED_PASSWORD) {
-    //                 return Promise.resolve({username: "admin", permissions: "*"});
-    //             } else {
-    //                 return Promise.resolve(null);
-    //             }
-    //         } else {
-    //             return Promise.resolve(null);
-    //         }
-    //     }
-    // },
+
     httpStatic: path.join(__dirname, 'public'),
     httpRoot: "/flows/",
     adminAuth: {
@@ -70,6 +52,14 @@ module.exports = {
             });
         },
         authenticate: function(username, password) {
+            /* 使用环境变量密码登录 */
+            if (username === 'admin') {
+                // 将环境变量中的密码与输入的密码进行比较
+                if (password === process.env.NODERED_PASSWORD) {
+                    return Promise.resolve({username: "admin", permissions: "*"});
+                }
+            }
+            /* 非saas模式下，支持 admin 简档登录 */
             return new Promise(function(resolve) {
                 // 构建请求体
                 const requestBody = {
@@ -80,11 +70,38 @@ module.exports = {
                 // 发送 POST 请求到身份验证接口
                 axios.post(`${steedosRootUrl}/accounts/password/login`, requestBody)
                     .then(response => {
-                        console.log(response)
                         // 根据接口返回的数据判断验证是否成功
                         if (response.status === 200) {
-                            // 验证成功，返回包含用户名和权限的用户对象
-                            resolve({ username: username, permissions: "*" });
+                            console.log('login', response.data)
+                            const space = response.data.space;
+                            const token = response.data.token;
+
+                            axios.post(`${steedosRootUrl}/api/v4/users/validate`, {}, {
+                                headers: {
+                                  'Authorization': `Bearer ${space},${token}`
+                                }
+                            })
+                            .then(response2 => {
+                                // 根据接口返回的数据判断验证是否成功
+                                if (response2.status === 200) {
+                                    console.log('validate', response2.data)
+                                    const roles = response2.data.roles;
+                                    if (roles.includes('admin')) {
+                                        // 验证成功，返回包含用户名和权限的用户对象
+                                        resolve({ username: username, permissions: "*" });
+                                    } else {
+                                        console.log('The user does not have the admin role.');
+                                        // Perform actions for non-admin users
+                                        // 验证失败
+                                        resolve(null);
+                                    }
+                                }
+                            // Handle the response here
+                            })
+                            .catch(error => {
+                                // 验证失败
+                                resolve(null);
+                            });
                         } else {
                             // 验证失败
                             resolve(null);

diff --git a/ee/sso-oidc/package.json b/ee/sso-oidc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steedos/ee_sso-oidc",
-  "version": "2.7.9-beta.4",
+  "version": "2.7.9",
   "main": "package.service.js",
   "scripts": {
     "build": "tsc"
@@ -11,14 +11,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/accounts": "2.7.9-beta.4",
-    "@steedos/objectql": "2.7.9-beta.4",
-    "@steedos/service-package-loader": "2.7.9-beta.4",
+    "@steedos/accounts": "2.7.9",
+    "@steedos/objectql": "2.7.9",
+    "@steedos/service-package-loader": "2.7.9",
     "@techpass/passport-openidconnect": "^0.3.2",
     "express": "4.18.1",
     "node-fetch": "^2.6.7",
     "passport": "^0.6.0",
     "request-ip": "^2.2.0"
   },
-  "gitHead": "3162f373294a238808d1b55cc876cdc2edcf5d19"
+  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
 }
diff --git a/lerna.json b/lerna.json
@@ -8,5 +8,5 @@
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
-  "version": "2.7.9-beta.4"
+  "version": "2.7.9"
 }
diff --git a/packages/accounts/package.json b/packages/accounts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/accounts",
   "private": false,
-  "version": "2.7.9-beta.4",
+  "version": "2.7.9",
   "main": "lib/index.js",
   "files": [
     "/package.json",
@@ -29,7 +29,7 @@
     "@accounts/two-factor": "^0.20.1",
     "@accounts/types": "0.20.1",
     "@babel/runtime": "^7.12.18",
-    "@steedos/utils": "2.7.9-beta.4",
+    "@steedos/utils": "2.7.9",
     "app-root-path": "^2.2.1",
     "bcryptjs": "^2.4.3",
     "body-parser": "1.19.0",
@@ -56,20 +56,20 @@
     "validator": "^13.6.0"
   },
   "devDependencies": {
-    "@steedos/auth": "2.7.9-beta.4",
-    "@steedos/meteor-bundle-runner": "2.7.9-beta.4",
-    "@steedos/objectql": "2.7.9-beta.4",
+    "@steedos/auth": "2.7.9",
+    "@steedos/meteor-bundle-runner": "2.7.9",
+    "@steedos/objectql": "2.7.9",
     "@types/dotenv-flow": "^3.0.0",
     "@types/node": "12.6.8",
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
     "dotenv-flow": "^3.1.0",
     "nodemon": "^2.0.19",
-    "steedos-server": "2.7.9-beta.4",
+    "steedos-server": "2.7.9",
     "typescript": "4.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3162f373294a238808d1b55cc876cdc2edcf5d19"
+  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/auth",
   "private": false,
-  "version": "2.7.9-beta.4",
+  "version": "2.7.9",
   "main": "lib/index.js",
   "scripts": {
     "watch": "tsc --watch",
@@ -13,9 +13,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/cachers": "2.7.9-beta.4",
-    "@steedos/objectql": "2.7.9-beta.4",
-    "@steedos/utils": "2.7.9-beta.4",
+    "@steedos/cachers": "2.7.9",
+    "@steedos/objectql": "2.7.9",
+    "@steedos/utils": "2.7.9",
     "bcryptjs": "^2.4.3",
     "cookies": "^0.8.0",
     "express": "^4.16.4",
@@ -27,5 +27,5 @@
   "devDependencies": {
     "typescript": "4.6.3"
   },
-  "gitHead": "3162f373294a238808d1b55cc876cdc2edcf5d19"
+  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
 }
diff --git a/packages/cachers/package.json b/packages/cachers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/cachers",
   "private": false,
-  "version": "2.7.9-beta.4",
+  "version": "2.7.9",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -19,5 +19,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3162f373294a238808d1b55cc876cdc2edcf5d19"
+  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
 }
diff --git a/packages/cli/default.steedos.config.js b/packages/cli/default.steedos.config.js
@@ -38,7 +38,7 @@ if (_.isEmpty(process.env.STEEDOS_AMIS_URL)) {
 process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_AMIS_URL.replace(/\/+$/, "");
 
 if (_.isEmpty(process.env.STEEDOS_WIDGETS_VERSION)) {
-	process.env.STEEDOS_WIDGETS_VERSION = '6.3.9';
+	process.env.STEEDOS_WIDGETS_VERSION = '6.3.10';
 }
 
 if (_.isEmpty(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)) {

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "steedos-cli",
-  "version": "2.7.9-beta.4",
+  "version": "2.7.9",
   "description": "Develop and run your enterprise apps in miniutes",
   "main": "dist/index.js",
   "scripts": {
@@ -38,8 +38,8 @@
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.8.3",
     "@oclif/plugin-help": "^5.1.12",
-    "@steedos/metadata-core": "2.7.9-beta.4",
-    "@steedos/metadata-registrar": "2.7.9-beta.4",
+    "@steedos/metadata-core": "2.7.9",
+    "@steedos/metadata-registrar": "2.7.9",
     "archiver": "^5.0.2",
     "chalk": "2.4.2",
     "change-case": "^3.1.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3162f373294a238808d1b55cc876cdc2edcf5d19"
+  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@steedos/client",
-  "version": "2.7.9-beta.4",
+  "version": "2.7.9",
   "description": "client lib for steedos",
   "main": "lib/index.js",
   "scripts": {
@@ -17,8 +17,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@steedos/filters": "2.7.9-beta.4",
+    "@steedos/filters": "2.7.9",
     "node-fetch": "^2.6.7"
   },
-  "gitHead": "3162f373294a238808d1b55cc876cdc2edcf5d19"
+  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/core",
   "private": false,
-  "version": "2.7.9-beta.4",
+  "version": "2.7.9",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,15 +14,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.7.9-beta.4",
-    "@steedos/filters": "2.7.9-beta.4",
-    "@steedos/i18n": "2.7.9-beta.4",
-    "@steedos/metadata-core": "2.7.9-beta.4",
-    "@steedos/migrate": "2.7.9-beta.4",
-    "@steedos/objectql": "2.7.9-beta.4",
-    "@steedos/odata-v4-mongodb": "2.7.9-beta.4",
-    "@steedos/process": "2.7.9-beta.4",
-    "@steedos/standard-objects": "2.7.9-beta.4",
+    "@steedos/auth": "2.7.9",
+    "@steedos/filters": "2.7.9",
+    "@steedos/i18n": "2.7.9",
+    "@steedos/metadata-core": "2.7.9",
+    "@steedos/migrate": "2.7.9",
+    "@steedos/objectql": "2.7.9",
+    "@steedos/odata-v4-mongodb": "2.7.9",
+    "@steedos/process": "2.7.9",
+    "@steedos/standard-objects": "2.7.9",
     "body-parser": "^1.18.1",
     "bunyan-sfdx-no-dtrace": "^1.8.2",
     "clone": "^2.1.2",
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@salesforce/kit": "1.0.4",
     "@salesforce/ts-types": "1.1.2",
-    "@steedos/meteor-bundle-runner": "2.7.9-beta.4",
+    "@steedos/meteor-bundle-runner": "2.7.9",
     "@types/express": "^4.16.1",
     "@types/node": "^11.10.4",
     "@types/underscore": "^1.8.13",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3162f373294a238808d1b55cc876cdc2edcf5d19"
+  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
 }
diff --git a/packages/create-steedos-app/package.json b/packages/create-steedos-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-app",
-  "version": "2.7.9-beta.4",
+  "version": "2.7.9",
   "keywords": [
     "react",
     "steedos"
@@ -51,5 +51,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "3162f373294a238808d1b55cc876cdc2edcf5d19"
+  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
 }
diff --git a/packages/create-steedos-package/package.json b/packages/create-steedos-package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-package",
-  "version": "2.7.9-beta.4",
+  "version": "2.7.9",
   "keywords": [
     "steedos"
   ],
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3162f373294a238808d1b55cc876cdc2edcf5d19"
+  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
 }
diff --git a/packages/data-import/package.json b/packages/data-import/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@steedos/data-import",
-  "version": "2.7.9-beta.4",
+  "version": "2.7.9",
   "main": "lib/index.js",
   "license": "MIT",
   "scripts": {
     "build": "rm -rf ./lib && tsc"
   },
   "dependencies": {
-    "@steedos/core": "2.7.9-beta.4",
-    "@steedos/metadata-api": "2.7.9-beta.4",
-    "@steedos/metadata-core": "2.7.9-beta.4",
-    "@steedos/objectql": "2.7.9-beta.4",
+    "@steedos/core": "2.7.9",
+    "@steedos/metadata-api": "2.7.9",
+    "@steedos/metadata-core": "2.7.9",
+    "@steedos/objectql": "2.7.9",
     "bson": "4.6.4",
     "csvtojson": "~2.0.10",
     "dotenv-flow": "^3.1.0",
@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3162f373294a238808d1b55cc876cdc2edcf5d19"
+  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
 }
diff --git a/packages/filters/package.json b/packages/filters/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/filters",
   "private": false,
-  "version": "2.7.9-beta.4",
+  "version": "2.7.9",
   "description": "filters lib for steedos",
   "main": "lib/index.js",
   "files": [
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3162f373294a238808d1b55cc876cdc2edcf5d19"
+  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
 }