No commit message

steedos · Dec 1, 2022 · 222df35 · 222df35
2 parents dccad69 + 7f10709
commit 222df35
Show file tree

Hide file tree

Showing 21 changed files with 85 additions and 75 deletions.
diff --git a/ee/sso-oidc/package.service.js b/ee/sso-oidc/package.service.js
@@ -45,7 +45,7 @@ module.exports = {
     /**
      * Dependencies
      */
-    dependencies: ['~packages-@steedos/ee_service-plugin-license'],
+    dependencies: [],
 
     /**
      * Actions

diff --git a/examples/project-template/.env b/examples/project-template/.env
@@ -26,5 +26,12 @@ METADATA_APIKEY=
 STEEDOS_IDENTITY_JWT_ENABLED=false
 STEEDOS_IDENTITY_JWT_SECRET=
 
+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_SENTRY_DSN=https://[email protected]/8
 
diff --git a/server/bundle/programs/server/packages/modules.js b/server/bundle/programs/server/packages/modules.js
@@ -466,7 +466,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/objectql",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "lib/index.js"
 };
 
@@ -493,7 +493,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/core",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "lib/index.js"
 };
 
@@ -520,7 +520,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-meteor-package-loader",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "index.js"
 };
 
@@ -547,7 +547,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-api",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "index.js"
 };
 
@@ -574,7 +574,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-metadata-server",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "index.js"
 };
 
@@ -601,7 +601,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-package-registry",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "package.service.js"
 };
 
@@ -628,7 +628,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-ui",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "package.service.js"
 };
 
@@ -655,7 +655,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-pages",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "package.service.js"
 };
 
@@ -682,7 +682,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/router",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "lib/index.js"
 };
 
@@ -709,7 +709,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/i18n",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "lib/index.js"
 };
 
@@ -736,7 +736,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/auth",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "lib/index.js"
 };
 
@@ -763,7 +763,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-workflow",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.14",
   "main": "package.service.js"
 };
 

diff --git a/...522abdd82cb862e378087a1545b4ce3bf439c5.js → ...d2c30c3240b49f4ea2f4b5b9d07a84fdaa0d17.js b/...522abdd82cb862e378087a1545b4ce3bf439c5.js → ...d2c30c3240b49f4ea2f4b5b9d07a84fdaa0d17.js
diff --git a/...2cb862e378087a1545b4ce3bf439c5.stats.json → ...40b49f4ea2f4b5b9d07a84fdaa0d17.stats.json b/...2cb862e378087a1545b4ce3bf439c5.stats.json → ...40b49f4ea2f4b5b9d07a84fdaa0d17.stats.json
@@ -4,7 +4,7 @@
     "version": "2.6.0"
   },
   "totalMinifiedBytes": 6286687,
-  "totalMinifiedGzipBytes": 1558145,
+  "totalMinifiedGzipBytes": 1558146,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,

diff --git a/...21eec5e60f495f7a225a8531c1bca8b231d45.css → ...14810a976fda36512f4b454df1ff61da5fbd2.css b/...21eec5e60f495f7a225a8531c1bca8b231d45.css → ...14810a976fda36512f4b454df1ff61da5fbd2.css
diff --git a/server/bundle/programs/web.browser.legacy/program.json b/server/bundle/programs/web.browser.legacy/program.json
@@ -2,24 +2,24 @@
   "format": "web-program-pre1",
   "manifest": [
     {
-      "path": "a6522abdd82cb862e378087a1545b4ce3bf439c5.js",
+      "path": "b9d2c30c3240b49f4ea2f4b5b9d07a84fdaa0d17.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/a6522abdd82cb862e378087a1545b4ce3bf439c5.js?meteor_js_resource=true",
+      "url": "/b9d2c30c3240b49f4ea2f4b5b9d07a84fdaa0d17.js?meteor_js_resource=true",
       "size": 6286687,
-      "hash": "a6522abdd82cb862e378087a1545b4ce3bf439c5",
-      "sri": "9aP8YnAJ/57oWykL+2i7sMgIhq8Hm+xcuyV2Ox3sbbXAFp3OmhsW44NE38sPwlXOYi6N8lWvAqC7VO+LlqpIrg=="
+      "hash": "b9d2c30c3240b49f4ea2f4b5b9d07a84fdaa0d17",
+      "sri": "H2smOWSpGCV9S7AZUKkWoVVxLYW1uNvoQGmcxmwTeb7JqCGF9bcojn0FtRq4jE5GjxgyJ29QC7FBsLsESm3Y5Q=="
     },
     {
-      "path": "a6522abdd82cb862e378087a1545b4ce3bf439c5.stats.json",
+      "path": "b9d2c30c3240b49f4ea2f4b5b9d07a84fdaa0d17.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/a6522abdd82cb862e378087a1545b4ce3bf439c5.stats.json?meteor_js_resource=true",
+      "url": "/b9d2c30c3240b49f4ea2f4b5b9d07a84fdaa0d17.stats.json?meteor_js_resource=true",
       "size": 134585,
-      "hash": "6cfe08852867b18b98576e05e2e788f6508f7ec0",
-      "sri": "OETbVEqdoj1ea23jj8CBv+/DMUqgFCgovUy/yYrzcQhIYc5m929MeW0dQAbbDwN6Kn8HGP9foCYpJC8Md9+flg=="
+      "hash": "2f5a60e518556c913b82d79e743fbcb0354cf0e7",
+      "sri": "ocx1CSGwloz1BgGPz7I32rKBXfpNnoAmTT7dD6Jjv6Bc8WXS2xUenIYGWE7Gw3klvDdfPYw1V8rorb5OydxzTw=="
     },
     {
       "path": "dynamic/node_modules/devextreme/ui/drop_down_box.js",
@@ -3192,14 +3192,14 @@
       "sri": "QHoD3eBWtoB0O5iCxYBCVvUIiHJ/4DDM/ojXZdmSFEEM+8kcGAQ3eaB2wpOenTLldZ9XhfIGTBaNisipdwarxA=="
     },
     {
-      "path": "1bf21eec5e60f495f7a225a8531c1bca8b231d45.css",
+      "path": "fb714810a976fda36512f4b454df1ff61da5fbd2.css",
       "where": "client",
       "type": "css",
       "cacheable": true,
-      "url": "/1bf21eec5e60f495f7a225a8531c1bca8b231d45.css?meteor_css_resource=true",
-      "size": 1625679,
-      "hash": "1bf21eec5e60f495f7a225a8531c1bca8b231d45",
-      "sri": "m8QgwlISuH33vnj91UC7C0KgZuF8B8T4AcT/A9+urqb0AUyIZpXLKAPvsaAXm2bPtO2+0FvgByXFYWyAHgkWTw=="
+      "url": "/fb714810a976fda36512f4b454df1ff61da5fbd2.css?meteor_css_resource=true",
+      "size": 1625661,
+      "hash": "fb714810a976fda36512f4b454df1ff61da5fbd2",
+      "sri": "nRctnYfvvkD5liKtpL375yjsd9UDcUiZb/7JyJRSMViA7x0phSwk0pBgB8q10nWqFl2obcTkfiR15nNmx3hZEw=="
     },
     {
       "path": "packages/aldeed_tabular/images/sort_asc.png",
@@ -3565,7 +3565,7 @@
       "path": "head.html",
       "where": "internal",
       "type": "head",
-      "hash": "212f12bf3a1388643f25e4df59bb0142e1aa4e57"
+      "hash": "d7f0fab434082ae0f9d82e7ed11a6e50af2b502b"
     }
   ]
 }
diff --git a/...8fda3c83148aac8e7b3ff5b4c464d9f7fc90c5.js → ...6f3028a1a950cf7438a23b3a683cd0dfffb892.js b/...8fda3c83148aac8e7b3ff5b4c464d9f7fc90c5.js → ...6f3028a1a950cf7438a23b3a683cd0dfffb892.js
diff --git a/...148aac8e7b3ff5b4c464d9f7fc90c5.stats.json → ...a950cf7438a23b3a683cd0dfffb892.stats.json b/...148aac8e7b3ff5b4c464d9f7fc90c5.stats.json → ...a950cf7438a23b3a683cd0dfffb892.stats.json
@@ -4,7 +4,7 @@
     "version": "2.6.0"
   },
   "totalMinifiedBytes": 6161736,
-  "totalMinifiedGzipBytes": 1524470,
+  "totalMinifiedGzipBytes": 1524469,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,

diff --git a/...21eec5e60f495f7a225a8531c1bca8b231d45.css → ...14810a976fda36512f4b454df1ff61da5fbd2.css b/...21eec5e60f495f7a225a8531c1bca8b231d45.css → ...14810a976fda36512f4b454df1ff61da5fbd2.css
diff --git a/server/bundle/programs/web.browser/program.json b/server/bundle/programs/web.browser/program.json
@@ -2,24 +2,24 @@
   "format": "web-program-pre1",
   "manifest": [
     {
-      "path": "c68fda3c83148aac8e7b3ff5b4c464d9f7fc90c5.js",
+      "path": "5b6f3028a1a950cf7438a23b3a683cd0dfffb892.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/c68fda3c83148aac8e7b3ff5b4c464d9f7fc90c5.js?meteor_js_resource=true",
+      "url": "/5b6f3028a1a950cf7438a23b3a683cd0dfffb892.js?meteor_js_resource=true",
       "size": 6161736,
-      "hash": "c68fda3c83148aac8e7b3ff5b4c464d9f7fc90c5",
-      "sri": "ik3kqxRkK/hWcl7/RH1hEtaQ56La54X0IHyCKyUtvlvvxeDr4bLTYrP0vsEHnCmmIZ/ZjRyLle9KElgYsc+JIA=="
+      "hash": "5b6f3028a1a950cf7438a23b3a683cd0dfffb892",
+      "sri": "DIjfzXB42qvA8Raw3yMUVzFTqeMJS+B70VjYaHJvosLTjdcaEAv6ZPzlWyIPL01Jhp5OmIM+Oxc2AFqL6+ej2w=="
     },
     {
-      "path": "c68fda3c83148aac8e7b3ff5b4c464d9f7fc90c5.stats.json",
+      "path": "5b6f3028a1a950cf7438a23b3a683cd0dfffb892.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/c68fda3c83148aac8e7b3ff5b4c464d9f7fc90c5.stats.json?meteor_js_resource=true",
+      "url": "/5b6f3028a1a950cf7438a23b3a683cd0dfffb892.stats.json?meteor_js_resource=true",
       "size": 134305,
-      "hash": "030f0bcc41bf3fa96df17f6d86aed1ac0bc582fb",
-      "sri": "3Y0q5UMLEroURlmbqU6vSGuBdOJHct4z+JvJWxfAPzpa5G+QGI9GicTpvEMhFr2cUKmomb9/NSLRmO7sCQqRDw=="
+      "hash": "1697ee3e9ac70a3d44a966280bf499df7a5adba6",
+      "sri": "NeRR7sgWYqPGD3K+mlft1+il/SvcysBORiBwpcjD+tETh8l95ZqsUW+pV+as2hY3DnxzXpEsvTDFpTc8oCkhew=="
     },
     {
       "path": "dynamic/node_modules/devextreme/ui/drop_down_box.js",
@@ -3192,14 +3192,14 @@
       "sri": "QHoD3eBWtoB0O5iCxYBCVvUIiHJ/4DDM/ojXZdmSFEEM+8kcGAQ3eaB2wpOenTLldZ9XhfIGTBaNisipdwarxA=="
     },
     {
-      "path": "1bf21eec5e60f495f7a225a8531c1bca8b231d45.css",
+      "path": "fb714810a976fda36512f4b454df1ff61da5fbd2.css",
       "where": "client",
       "type": "css",
       "cacheable": true,
-      "url": "/1bf21eec5e60f495f7a225a8531c1bca8b231d45.css?meteor_css_resource=true",
-      "size": 1625679,
-      "hash": "1bf21eec5e60f495f7a225a8531c1bca8b231d45",
-      "sri": "m8QgwlISuH33vnj91UC7C0KgZuF8B8T4AcT/A9+urqb0AUyIZpXLKAPvsaAXm2bPtO2+0FvgByXFYWyAHgkWTw=="
+      "url": "/fb714810a976fda36512f4b454df1ff61da5fbd2.css?meteor_css_resource=true",
+      "size": 1625661,
+      "hash": "fb714810a976fda36512f4b454df1ff61da5fbd2",
+      "sri": "nRctnYfvvkD5liKtpL375yjsd9UDcUiZb/7JyJRSMViA7x0phSwk0pBgB8q10nWqFl2obcTkfiR15nNmx3hZEw=="
     },
     {
       "path": "packages/aldeed_tabular/images/sort_asc.png",
@@ -3565,7 +3565,7 @@
       "path": "head.html",
       "where": "internal",
       "type": "head",
-      "hash": "212f12bf3a1388643f25e4df59bb0142e1aa4e57"
+      "hash": "d7f0fab434082ae0f9d82e7ed11a6e50af2b502b"
     }
   ]
 }
diff --git a/...d30a0120c1e5daa395f8093b205b907a94f600.js → ...be79df98b56b4d1bb18afcfde145f2a98ec812.js b/...d30a0120c1e5daa395f8093b205b907a94f600.js → ...be79df98b56b4d1bb18afcfde145f2a98ec812.js
diff --git a/...c1e5daa395f8093b205b907a94f600.stats.json → ...b56b4d1bb18afcfde145f2a98ec812.stats.json b/...c1e5daa395f8093b205b907a94f600.stats.json → ...b56b4d1bb18afcfde145f2a98ec812.stats.json
@@ -4,7 +4,7 @@
     "version": "2.6.0"
   },
   "totalMinifiedBytes": 8313685,
-  "totalMinifiedGzipBytes": 2065188,
+  "totalMinifiedGzipBytes": 2065185,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9639,
     "packages/coffeescript.js": 32,

diff --git a/...21eec5e60f495f7a225a8531c1bca8b231d45.css → ...14810a976fda36512f4b454df1ff61da5fbd2.css b/...21eec5e60f495f7a225a8531c1bca8b231d45.css → ...14810a976fda36512f4b454df1ff61da5fbd2.css
diff --git a/server/bundle/programs/web.cordova/program.json b/server/bundle/programs/web.cordova/program.json
@@ -2,34 +2,34 @@
   "format": "web-program-pre1",
   "manifest": [
     {
-      "path": "aed30a0120c1e5daa395f8093b205b907a94f600.js",
+      "path": "aebe79df98b56b4d1bb18afcfde145f2a98ec812.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/__cordova/aed30a0120c1e5daa395f8093b205b907a94f600.js?meteor_js_resource=true",
+      "url": "/__cordova/aebe79df98b56b4d1bb18afcfde145f2a98ec812.js?meteor_js_resource=true",
       "size": 8313685,
-      "hash": "aed30a0120c1e5daa395f8093b205b907a94f600",
-      "sri": "AtS/p4cdDC8Eye5bFEsgLm4AfSXDA3FdhsYvr1YdX9AHQ30RMs4nAkLUKGybgD7h9xUglk8vx+MyrHrLNDtxoA=="
+      "hash": "aebe79df98b56b4d1bb18afcfde145f2a98ec812",
+      "sri": "uARGUPgXs1wwYqNG0qDW6Xj91rKWjatqz7ZNZJwAtRyI8quDGeNynzC7EkkAtOXHBbZMxritA+MxKFCUChEeLg=="
     },
     {
-      "path": "aed30a0120c1e5daa395f8093b205b907a94f600.stats.json",
+      "path": "aebe79df98b56b4d1bb18afcfde145f2a98ec812.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/__cordova/aed30a0120c1e5daa395f8093b205b907a94f600.stats.json?meteor_js_resource=true",
+      "url": "/__cordova/aebe79df98b56b4d1bb18afcfde145f2a98ec812.stats.json?meteor_js_resource=true",
       "size": 135098,
-      "hash": "098a0d9efdaf4a5526bb793f7fce428bba542dc2",
-      "sri": "4In3go7b1Z2BEfBWIUm/d2xT6TKdshsFOdpTJbjVeGJHIPoekVmvX4NsR+uA/hroC3q+b1dyuGLjfaJpYYNmeg=="
+      "hash": "b45154c481da0ba77a13bf53ba51dcb81d5301ac",
+      "sri": "3COvkxlYsI4oW2IT3lsh/20FEgWZ5WcIs1kq8+XLe7dkw8i7Fjp9rPFf6XCdQHWca10j3YaU664spHSy/nn0mA=="
     },
     {
-      "path": "1bf21eec5e60f495f7a225a8531c1bca8b231d45.css",
+      "path": "fb714810a976fda36512f4b454df1ff61da5fbd2.css",
       "where": "client",
       "type": "css",
       "cacheable": true,
-      "url": "/__cordova/1bf21eec5e60f495f7a225a8531c1bca8b231d45.css?meteor_css_resource=true",
-      "size": 1625679,
-      "hash": "1bf21eec5e60f495f7a225a8531c1bca8b231d45",
-      "sri": "m8QgwlISuH33vnj91UC7C0KgZuF8B8T4AcT/A9+urqb0AUyIZpXLKAPvsaAXm2bPtO2+0FvgByXFYWyAHgkWTw=="
+      "url": "/__cordova/fb714810a976fda36512f4b454df1ff61da5fbd2.css?meteor_css_resource=true",
+      "size": 1625661,
+      "hash": "fb714810a976fda36512f4b454df1ff61da5fbd2",
+      "sri": "nRctnYfvvkD5liKtpL375yjsd9UDcUiZb/7JyJRSMViA7x0phSwk0pBgB8q10nWqFl2obcTkfiR15nNmx3hZEw=="
     },
     {
       "path": "packages/aldeed_tabular/images/sort_asc.png",
@@ -755,7 +755,7 @@
       "path": "head.html",
       "where": "internal",
       "type": "head",
-      "hash": "212f12bf3a1388643f25e4df59bb0142e1aa4e57"
+      "hash": "d7f0fab434082ae0f9d82e7ed11a6e50af2b502b"
     }
   ],
   "cordovaCompatibilityVersions": {

diff --git a/server/bundle/star.json b/server/bundle/star.json
@@ -36,5 +36,5 @@
   "meteorRelease": "[email protected]",
   "nodeVersion": "12.16.1",
   "npmVersion": "6.13.4",
-  "gitCommitHash": "0c90e60ce193ab9bd36d79f78e42e122c08f8427"
+  "gitCommitHash": "de812d807f7514f3f26ec2a80ef30715a2cd22ee"
 }
diff --git a/services/service-community/package.json b/services/service-community/package.json
@@ -25,6 +25,7 @@
     "@steedos/service-sentry": "2.3.2-beta.14",
     "@steedos/service-sidecar": "2.3.2-beta.14",
     "@steedos/service-steedos-server": "2.3.2-beta.14",
+    "@steedos/ee_sso-oidc": "2.3.2-beta.14",
     "@steedos/unpkg": "2.3.2-beta.14",
     "aliyun-sdk": "1.12.3",
     "async-retry": "^1.3.1",

diff --git a/services/service-community/package.service.js b/services/service-community/package.service.js
@@ -32,7 +32,10 @@ module.exports = {
 		},
 		saas: {
 			enable: validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true)
-		}
+		},
+        oidc: {
+            enable: validator.toBoolean(process.env.STEEDOS_IDENTITY_OIDC_ENABLED || 'false', true),
+        }
 	},
 
 	/**
@@ -104,6 +107,10 @@ module.exports = {
 			this.broker.createService(require("@steedos/service-identity-jwt"));
 		}
 
+        // 启动 OIDC SSO 服务
+        if (this.settings.oidc.enable) {
+            this.broker.createService(require("@steedos/ee_sso-oidc"));
+        }
 
         // 国际化
         this.broker.createService(require("@steedos/service-i18n"));

diff --git a/services/service-enterprise/package.service.js b/services/service-enterprise/package.service.js
@@ -63,11 +63,6 @@ module.exports = {
         // 启动 企业版许可证服务
         this.broker.createService(require("@steedos/ee_service-plugin-license"));
 
-        // 启动 OIDC SSO 服务
-        if (this.settings.oidc.enable) {
-            this.broker.createService(require("@steedos/ee_sso-oidc"));
-        }
-
         // 启动 报表服务
         this.broker.createService(require("@steedos/ee_stimulsoft-reports"));
 

diff --git a/.../standard-permission/main/default/objects/permission_set/buttons/permission_set.action.js b/.../standard-permission/main/default/objects/permission_set/buttons/permission_set.action.js
@@ -1,7 +1,7 @@
 module.exports = {
     customize: function (object_name, record_id, fields) {
         var doc = Creator.odata.get(object_name, record_id)
-        Creator.odata.insert(object_name, {name: doc.name, label: doc.label, type: doc.type, license: doc.license}, function(result, error){
+        Creator.odata.insert(object_name, {name: doc.name, label: doc.label, type: doc.type, license: doc.license, lockout_interval: doc.lockout_interval, max_login_attempts: doc.max_login_attempts, password_history: doc.password_history}, function(result, error){
             if(result){
                 FlowRouter.go(`/app/-/${object_name}/view/${result._id}`)
             }