No commit message

steedos · Aug 2, 2024 · 4964719 · 4964719
2 parents 9b9299d + 860e3ce
commit 4964719
Show file tree

Hide file tree

Showing 100 changed files with 474 additions and 442 deletions.
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.4-beta.8",
+  "version": "2.7.4-beta.9",
   "main": "package.service.js",
   "scripts": {
     "build": "tsc"
@@ -11,14 +11,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/accounts": "2.7.4-beta.8",
-    "@steedos/objectql": "2.7.4-beta.8",
-    "@steedos/service-package-loader": "2.7.4-beta.8",
+    "@steedos/accounts": "2.7.4-beta.9",
+    "@steedos/objectql": "2.7.4-beta.9",
+    "@steedos/service-package-loader": "2.7.4-beta.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": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
diff --git a/lerna.json b/lerna.json
@@ -8,5 +8,5 @@
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
-  "version": "2.7.4-beta.8"
+  "version": "2.7.4-beta.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.4-beta.8",
+  "version": "2.7.4-beta.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.4-beta.8",
+    "@steedos/utils": "2.7.4-beta.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.4-beta.8",
-    "@steedos/meteor-bundle-runner": "2.7.4-beta.8",
-    "@steedos/objectql": "2.7.4-beta.8",
+    "@steedos/auth": "2.7.4-beta.9",
+    "@steedos/meteor-bundle-runner": "2.7.4-beta.9",
+    "@steedos/objectql": "2.7.4-beta.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.4-beta.8",
+    "steedos-server": "2.7.4-beta.9",
     "typescript": "4.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/auth",
   "private": false,
-  "version": "2.7.4-beta.8",
+  "version": "2.7.4-beta.9",
   "main": "lib/index.js",
   "scripts": {
     "watch": "tsc --watch",
@@ -13,8 +13,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/cachers": "2.7.4-beta.8",
-    "@steedos/objectql": "2.7.4-beta.8",
+    "@steedos/cachers": "2.7.4-beta.9",
+    "@steedos/objectql": "2.7.4-beta.9",
+    "@steedos/utils": "2.7.4-beta.9",
     "bcryptjs": "^2.4.3",
     "cookies": "^0.8.0",
     "express": "^4.16.4",
@@ -26,5 +27,5 @@
   "devDependencies": {
     "typescript": "4.6.3"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
diff --git a/packages/auth/src/utils/index.ts b/packages/auth/src/utils/index.ts
@@ -1,7 +1,14 @@
+/*
+ * @Author: [email protected]
+ * @Date: 2024-06-16 17:46:33
+ * @LastEditors: [email protected]
+ * @LastEditTime: 2024-08-02 10:55:54
+ * @Description: 
+ */
 import crypto = require('crypto');
 import { default as Random } from './random';
 import { getSteedosSchema } from '@steedos/objectql';
-const Cookies = require('cookies');
+import { setCookie, clearCookie } from '@steedos/utils';
 
 export const hashLoginToken = function (loginToken) {
   const hash = crypto.createHash('sha256');
@@ -43,19 +50,17 @@ export const insertHashedLoginToken = async function (userId, hashedToken) {
   return await userObject.update(userId, data);
 }
 
-
-
 export const setAuthCookies = function (req, res, userId, authToken, spaceId?) {
-  let cookies = new Cookies(req, res);
   let options = {
     maxAge: 90 * 60 * 60 * 24 * 1000,
     httpOnly: true,
     overwrite: true
   }
-  cookies.set("X-User-Id", userId, options);
-  cookies.set("X-Auth-Token", authToken, options);
+  setCookie(req, res, "X-User-Id", userId, options as any);
+  setCookie(req, res, "X-Auth-Token", authToken, options as any)
+
   if (spaceId) {
-    cookies.set("X-Space-Id", spaceId, options);
+    setCookie(req, res, "X-Space-Id", spaceId, options as any);
     // cookies.set("X-Space-Token", spaceId + ',' + authToken, options);
   }
 
@@ -64,16 +69,18 @@ export const setAuthCookies = function (req, res, userId, authToken, spaceId?) {
 
 
 export const clearAuthCookies = function (req, res) {
-  let cookies = new Cookies(req, res);
   let options = {
     maxAge: 0,
     httpOnly: true,
     overwrite: true
   }
-  cookies.set("X-User-Id", null, options);
-  cookies.set("X-Auth-Token", null, options);
-  cookies.set("X-Access-Token", null, options);
-  cookies.set("X-Space-Token", null, options);
+
+  clearCookie(req, res, "X-User-Id", options as any)
+  clearCookie(req, res, "X-Auth-Token", options as any)
+
+  clearCookie(req, res, "X-Access-Token", options as any)
+  clearCookie(req, res, "X-Space-Token", options as any)
+
   return;
 }
 

diff --git a/packages/cachers/package.json b/packages/cachers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/cachers",
   "private": false,
-  "version": "2.7.4-beta.8",
+  "version": "2.7.4-beta.9",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -19,5 +19,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "steedos-cli",
-  "version": "2.7.4-beta.8",
+  "version": "2.7.4-beta.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.4-beta.8",
-    "@steedos/metadata-registrar": "2.7.4-beta.8",
+    "@steedos/metadata-core": "2.7.4-beta.9",
+    "@steedos/metadata-registrar": "2.7.4-beta.9",
     "archiver": "^5.0.2",
     "chalk": "2.4.2",
     "change-case": "^3.1.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@steedos/client",
-  "version": "2.7.4-beta.8",
+  "version": "2.7.4-beta.9",
   "description": "client lib for steedos",
   "main": "lib/index.js",
   "scripts": {
@@ -17,8 +17,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@steedos/filters": "2.7.4-beta.8",
+    "@steedos/filters": "2.7.4-beta.9",
     "node-fetch": "^2.6.7"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/core",
   "private": false,
-  "version": "2.7.4-beta.8",
+  "version": "2.7.4-beta.9",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,15 +14,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.7.4-beta.8",
-    "@steedos/filters": "2.7.4-beta.8",
-    "@steedos/i18n": "2.7.4-beta.8",
-    "@steedos/metadata-core": "2.7.4-beta.8",
-    "@steedos/migrate": "2.7.4-beta.8",
-    "@steedos/objectql": "2.7.4-beta.8",
-    "@steedos/odata-v4-mongodb": "2.7.4-beta.8",
-    "@steedos/process": "2.7.4-beta.8",
-    "@steedos/standard-objects": "2.7.4-beta.8",
+    "@steedos/auth": "2.7.4-beta.9",
+    "@steedos/filters": "2.7.4-beta.9",
+    "@steedos/i18n": "2.7.4-beta.9",
+    "@steedos/metadata-core": "2.7.4-beta.9",
+    "@steedos/migrate": "2.7.4-beta.9",
+    "@steedos/objectql": "2.7.4-beta.9",
+    "@steedos/odata-v4-mongodb": "2.7.4-beta.9",
+    "@steedos/process": "2.7.4-beta.9",
+    "@steedos/standard-objects": "2.7.4-beta.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.4-beta.8",
+    "@steedos/meteor-bundle-runner": "2.7.4-beta.9",
     "@types/express": "^4.16.1",
     "@types/node": "^11.10.4",
     "@types/underscore": "^1.8.13",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
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.4-beta.8",
+  "version": "2.7.4-beta.9",
   "keywords": [
     "react",
     "steedos"
@@ -51,5 +51,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
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.4-beta.8",
+  "version": "2.7.4-beta.9",
   "keywords": [
     "steedos"
   ],
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
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.4-beta.8",
+  "version": "2.7.4-beta.9",
   "main": "lib/index.js",
   "license": "MIT",
   "scripts": {
     "build": "rm -rf ./lib && tsc"
   },
   "dependencies": {
-    "@steedos/core": "2.7.4-beta.8",
-    "@steedos/metadata-api": "2.7.4-beta.8",
-    "@steedos/metadata-core": "2.7.4-beta.8",
-    "@steedos/objectql": "2.7.4-beta.8",
+    "@steedos/core": "2.7.4-beta.9",
+    "@steedos/metadata-api": "2.7.4-beta.9",
+    "@steedos/metadata-core": "2.7.4-beta.9",
+    "@steedos/objectql": "2.7.4-beta.9",
     "bson": "4.6.4",
     "csvtojson": "~2.0.10",
     "dotenv-flow": "^3.1.0",
@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
diff --git a/packages/filters/package.json b/packages/filters/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/filters",
   "private": false,
-  "version": "2.7.4-beta.8",
+  "version": "2.7.4-beta.9",
   "description": "filters lib for steedos",
   "main": "lib/index.js",
   "files": [
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
diff --git a/packages/formula/package.json b/packages/formula/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steedos/formula",
-  "version": "2.7.4-beta.8",
+  "version": "2.7.4-beta.9",
   "description": "Salesforce Formula Parser",
   "main": "lib/formulon.js",
   "files": [
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/i18n",
   "private": false,
-  "version": "2.7.4-beta.8",
+  "version": "2.7.4-beta.9",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/cachers": "2.7.4-beta.8",
+    "@steedos/cachers": "2.7.4-beta.9",
     "i18next": "^19.3.4",
     "i18next-sprintf-postprocessor": "^0.2.2",
     "underscore": "1.13.4"
@@ -22,5 +22,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8ac12a0c7221d87c1f391c159e8a76a4206629b1"
+  "gitHead": "dde1c37f85d1c2630d807404785c703d9c3727ad"
 }