No commit message

steedos · Dec 19, 2024 · 163f691 · 163f691
2 parents c97dc0a + 276c057
commit 163f691
Show file tree

Hide file tree

Showing 92 changed files with 415 additions and 387 deletions.
diff --git a/deploy/enterprise/app/builder6/package.json b/deploy/enterprise/app/builder6/package.json
@@ -4,6 +4,6 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "@builder6/server": "^0.7.3"
+    "@builder6/server": "^0.7.4"
   }
 }
diff --git a/deploy/enterprise/docker-compose.yml b/deploy/enterprise/docker-compose.yml
@@ -30,11 +30,19 @@ services:
       - NPM_CACHE_ENABLED=true
       - NPM_CACHE_PACKAGE_CONTENT=true
       - NPM_REGISTRY_URL=https://registry.npmmirror.com
-      - STEEDOS_WIDGETS_ADDITIONAL=@steedos-widgets/liveblocks
+      - STEEDOS_WIDGETS_ADDITIONAL=@steedos-widgets/liveblocks@6.3.11-beta.20
       - B6_SERVER_VERSION=^0.7.3
       - B6_PLUGIN_PACKAGES=@builder6/node-red@^0.7.2,lodash
       - B6_PLUGIN_SERVICES=@builder6/node-red
       - B6_PLUGIN_MODULES=@builder6/node-red
+      - STEEDOS_IDENTITY_OIDC_ENABLED=true
+      - STEEDOS_IDENTITY_OIDC_ISSUER=https://id.steedos.cn/realms/master
+      - STEEDOS_IDENTITY_OIDC_CONFIG_URL=https://id.steedos.cn/realms/master/.well-known/openid-configuration
+      - STEEDOS_IDENTITY_OIDC_CLIENT_ID=steedos-oidc-public
+      - STEEDOS_IDENTITY_OIDC_CLIENT_SECRET=none
+      - STEEDOS_IDENTITY_OIDC_NAME=Steedos ID
+      - STEEDOS_IDENTITY_OIDC_LABEL=Steedos ID
+      - STEEDOS_IDENTITY_OIDC_URL=/api/v6/oidc/default/login
     tty: true
     volumes:
       - "./steedos-storage:/steedos-storage"

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.15-beta.20",
+  "version": "2.7.15-beta.21",
   "main": "package.service.js",
   "scripts": {
     "build": "tsc"
@@ -11,14 +11,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/accounts": "2.7.15-beta.20",
-    "@steedos/objectql": "2.7.15-beta.20",
-    "@steedos/service-package-loader": "2.7.15-beta.20",
+    "@steedos/accounts": "2.7.15-beta.21",
+    "@steedos/objectql": "2.7.15-beta.21",
+    "@steedos/service-package-loader": "2.7.15-beta.21",
     "@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": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }
diff --git a/ee/sso-oidc/package.service.js b/ee/sso-oidc/package.service.js
@@ -38,7 +38,7 @@ module.exports = {
         STEEDOS_IDENTITY_OIDC_CLIENT_SECRET: process.env.STEEDOS_IDENTITY_OIDC_CLIENT_SECRET,
         STEEDOS_IDENTITY_OIDC_NAME: process.env.STEEDOS_IDENTITY_OIDC_NAME || 'Steedos',
         STEEDOS_IDENTITY_OIDC_LABEL: process.env.STEEDOS_IDENTITY_OIDC_LABEL || 'Steedos ID',
-        STEEDOS_IDENTITY_OIDC_LOGO: process.env.STEEDOS_IDENTITY_OIDC_LOGO || '/images/logo.png'
+        STEEDOS_IDENTITY_OIDC_LOGO: process.env.STEEDOS_IDENTITY_OIDC_LOGO || '/images/logo.png',
     },
 
     /**
@@ -87,7 +87,7 @@ module.exports = {
             // 检查环境变量
             const settings = this.settings;
 
-            if (settings.STEEDOS_IDENTITY_OIDC_CONFIG_URL && settings.STEEDOS_IDENTITY_OIDC_CLIENT_ID) {
+            if (settings.STEEDOS_IDENTITY_OIDC_CONFIG_URL) {
 
                 authController.oidcStrategyFactory().then((strategy)=>{
                     passport.use("oidc", strategy);
@@ -98,7 +98,13 @@ module.exports = {
                                 name: settings.STEEDOS_IDENTITY_OIDC_NAME,
                                 label: settings.STEEDOS_IDENTITY_OIDC_LABEL,
                                 logo: settings.STEEDOS_IDENTITY_OIDC_LOGO,
-                                url: '/api/global/auth/oidc/config'
+                                url: process.env.STEEDOS_IDENTITY_OIDC_URL || '/api/global/auth/oidc/config'
+                            },
+                            oidc_v6: {
+                                name: process.env.B6_OIDC_NAME,
+                                label: process.env.B6_OIDC_LABEL,
+                                logo: process.env.B6_OIDC_LOGO,
+                                url: process.env.B6_OIDC_URL || '/api/v6/oidc/default/login'
                             }
                         }
                     });
@@ -107,6 +113,20 @@ module.exports = {
                 })
             }
 
+            if (process.env.B6_OIDC_ENABLED) {
+                objectql.getSteedosConfig().setTenant({
+                    disabled_account_register: true,
+                    sso_providers: {
+                        oidc: {
+                            name: process.env.B6_OIDC_NAME,
+                            label: process.env.B6_OIDC_LABEL,
+                            logo: process.env.B6_OIDC_LOGO,
+                            url: process.env.B6_OIDC_URL || '/api/v6/oidc/default/login'
+                        }
+                    }
+                });
+            }
+
 
         } catch (error) {
             this.setError(error);

diff --git a/lerna.json b/lerna.json
@@ -8,5 +8,5 @@
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
-  "version": "2.7.15-beta.20"
+  "version": "2.7.15-beta.21"
 }
diff --git a/packages/accounts/package.json b/packages/accounts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/accounts",
   "private": false,
-  "version": "2.7.15-beta.20",
+  "version": "2.7.15-beta.21",
   "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.15-beta.20",
+    "@steedos/utils": "2.7.15-beta.21",
     "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.15-beta.20",
-    "@steedos/meteor-bundle-runner": "2.7.15-beta.20",
-    "@steedos/objectql": "2.7.15-beta.20",
+    "@steedos/auth": "2.7.15-beta.21",
+    "@steedos/meteor-bundle-runner": "2.7.15-beta.21",
+    "@steedos/objectql": "2.7.15-beta.21",
     "@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.15-beta.20",
+    "steedos-server": "2.7.15-beta.21",
     "typescript": "4.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/auth",
   "private": false,
-  "version": "2.7.15-beta.20",
+  "version": "2.7.15-beta.21",
   "main": "lib/index.js",
   "scripts": {
     "watch": "tsc --watch",
@@ -13,9 +13,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/cachers": "2.7.15-beta.20",
-    "@steedos/objectql": "2.7.15-beta.20",
-    "@steedos/utils": "2.7.15-beta.20",
+    "@steedos/cachers": "2.7.15-beta.21",
+    "@steedos/objectql": "2.7.15-beta.21",
+    "@steedos/utils": "2.7.15-beta.21",
     "bcryptjs": "^2.4.3",
     "cookies": "^0.8.0",
     "express": "^4.16.4",
@@ -27,5 +27,5 @@
   "devDependencies": {
     "typescript": "4.6.3"
   },
-  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }
diff --git a/packages/cachers/package.json b/packages/cachers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/cachers",
   "private": false,
-  "version": "2.7.15-beta.20",
+  "version": "2.7.15-beta.21",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -19,5 +19,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "steedos-cli",
-  "version": "2.7.15-beta.20",
+  "version": "2.7.15-beta.21",
   "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.15-beta.20",
-    "@steedos/metadata-registrar": "2.7.15-beta.20",
+    "@steedos/metadata-core": "2.7.15-beta.21",
+    "@steedos/metadata-registrar": "2.7.15-beta.21",
     "archiver": "^5.0.2",
     "chalk": "2.4.2",
     "change-case": "^3.1.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@steedos/client",
-  "version": "2.7.15-beta.20",
+  "version": "2.7.15-beta.21",
   "description": "client lib for steedos",
   "main": "lib/index.js",
   "scripts": {
@@ -17,8 +17,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@steedos/filters": "2.7.15-beta.20",
+    "@steedos/filters": "2.7.15-beta.21",
     "node-fetch": "^2.6.7"
   },
-  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/core",
   "private": false,
-  "version": "2.7.15-beta.20",
+  "version": "2.7.15-beta.21",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,15 +14,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.7.15-beta.20",
-    "@steedos/filters": "2.7.15-beta.20",
-    "@steedos/i18n": "2.7.15-beta.20",
-    "@steedos/metadata-core": "2.7.15-beta.20",
-    "@steedos/migrate": "2.7.15-beta.20",
-    "@steedos/objectql": "2.7.15-beta.20",
-    "@steedos/odata-v4-mongodb": "2.7.15-beta.20",
-    "@steedos/process": "2.7.15-beta.20",
-    "@steedos/standard-objects": "2.7.15-beta.20",
+    "@steedos/auth": "2.7.15-beta.21",
+    "@steedos/filters": "2.7.15-beta.21",
+    "@steedos/i18n": "2.7.15-beta.21",
+    "@steedos/metadata-core": "2.7.15-beta.21",
+    "@steedos/migrate": "2.7.15-beta.21",
+    "@steedos/objectql": "2.7.15-beta.21",
+    "@steedos/odata-v4-mongodb": "2.7.15-beta.21",
+    "@steedos/process": "2.7.15-beta.21",
+    "@steedos/standard-objects": "2.7.15-beta.21",
     "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.15-beta.20",
+    "@steedos/meteor-bundle-runner": "2.7.15-beta.21",
     "@types/express": "^4.16.1",
     "@types/node": "^11.10.4",
     "@types/underscore": "^1.8.13",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }
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.15-beta.20",
+  "version": "2.7.15-beta.21",
   "keywords": [
     "react",
     "steedos"
@@ -51,5 +51,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }
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.15-beta.20",
+  "version": "2.7.15-beta.21",
   "keywords": [
     "steedos"
   ],
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }
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.15-beta.20",
+  "version": "2.7.15-beta.21",
   "main": "lib/index.js",
   "license": "MIT",
   "scripts": {
     "build": "rm -rf ./lib && tsc"
   },
   "dependencies": {
-    "@steedos/core": "2.7.15-beta.20",
-    "@steedos/metadata-api": "2.7.15-beta.20",
-    "@steedos/metadata-core": "2.7.15-beta.20",
-    "@steedos/objectql": "2.7.15-beta.20",
+    "@steedos/core": "2.7.15-beta.21",
+    "@steedos/metadata-api": "2.7.15-beta.21",
+    "@steedos/metadata-core": "2.7.15-beta.21",
+    "@steedos/objectql": "2.7.15-beta.21",
     "bson": "4.6.4",
     "csvtojson": "~2.0.10",
     "dotenv-flow": "^3.1.0",
@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }
diff --git a/packages/filters/package.json b/packages/filters/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/filters",
   "private": false,
-  "version": "2.7.15-beta.20",
+  "version": "2.7.15-beta.21",
   "description": "filters lib for steedos",
   "main": "lib/index.js",
   "files": [
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }
diff --git a/packages/formula/package.json b/packages/formula/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steedos/formula",
-  "version": "2.7.15-beta.20",
+  "version": "2.7.15-beta.21",
   "description": "Salesforce Formula Parser",
   "main": "lib/formulon.js",
   "files": [
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
+  "gitHead": "d6e1af6ae3dabe6e4c24e21a96516dea8491c9b8"
 }