@steedos/service-objectql 2.5.0-beta.9 → 2.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-objectql",
-    "version": "2.5.0-beta.9",
+    "version": "2.5.0",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -13,8 +13,8 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "a2623b433dd42632dc54d23c51b718bd4d1a2fdc",
+    "gitHead": "c4b366d1366ab52eb53da1a3ff4a80b16fd73cc0",
     "dependencies": {
-        "@steedos/objectql": "2.5.0-beta.9"
+        "@steedos/objectql": "2.5.0"
     }
 }

package/package.service.js

@@ -1,14 +1,15 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2023-03-23 15:12:14
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-03-27 17:15:39
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-18 14:33:09
  * @Description: 
  */
 "use strict";
 // @ts-check
+const objectql = require('@steedos/objectql');
+const { getObject } = objectql;
 
-const { getObject } = require('@steedos/objectql');
 
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
@@ -34,19 +35,6 @@ module.exports = {
      * Actions
      */
     actions: {
-        aggregate: {
-            params: {
-                objectName: { type: "string" },
-                query: { type: "object" },
-                externalPipeline: { type: "array", items: "object" }
-            },
-            async handler(ctx) {
-                const userSession = ctx.meta.user;
-                const { objectName, query, externalPipeline } = ctx.params;
-                const obj = getObject(objectName)
-                return await obj.aggregate(query, externalPipeline, userSession)
-            }
-        },
         find: {
             params: {
                 objectName: { type: "string" },
@@ -207,32 +195,6 @@ module.exports = {
                 }
             }
         },
-        directAggregate: {
-            params: {
-                objectName: { type: "string" },
-                query: { type: "object" },
-                externalPipeline: { type: "array", items: "object" }
-            },
-            async handler(ctx) {
-                const userSession = ctx.meta.user;
-                const { objectName, query, externalPipeline } = ctx.params;
-                const obj = getObject(objectName)
-                return await obj.directAggregate(query, externalPipeline, userSession)
-            }
-        },
-        directAggregatePrefixalPipeline: {
-            params: {
-                objectName: { type: "string" },
-                query: { type: "object" },
-                prefixalPipeline: { type: "array", items: "object" }
-            },
-            async handler(ctx) {
-                const userSession = ctx.meta.user;
-                const { objectName, query, prefixalPipeline } = ctx.params;
-                const obj = getObject(objectName)
-                return await obj.directAggregatePrefixalPipeline(query, prefixalPipeline, userSession)
-            }
-        },
         directFind: {
             params: {
                 objectName: { type: "string" },
@@ -521,6 +483,16 @@ module.exports = {
                 const obj = getObject(objectName)
                 return await obj.allowDelete(userSession);
             }
+        },
+        encryptFieldValue: {
+            params: {
+                objectName: { type: "string" },
+                doc: { type: "object", optional: true },
+            },
+            async handler(ctx) {
+                const { objectName, doc } = ctx.params;
+                return await this.encryptFieldValue(objectName, doc);
+            }
         }
 
     },
@@ -536,8 +508,50 @@ module.exports = {
      * Methods
      */
     methods: {
+        /**
+         * 获取需要加密的字段
+         * @param {*} objectName 
+         * @returns 
+         */
+        getRequireEncryptionFields: async function (objectName) {
+            const objFields = await objectql.getObject(objectName).getFields();
+            const requireEncryptionFields = {};
+            // 遍历所有字段，整理出要求加密的字段
+            for (const key in objFields) {
+                if (Object.hasOwnProperty.call(objFields, key)) {
+                    const field = objFields[key];
+                    if (field.enable_encryption) {
+                        requireEncryptionFields[key] = field;
+                    }
+                }
+            }
+            return requireEncryptionFields;
+        },
 
-
+        /**
+         * 加密字段值
+         * @param {*} objectName 
+         * @param {*} doc 
+         */
+        encryptFieldValue: async function (objectName, doc) {
+            try {
+                const datasource = objectql.getDataSource('default');
+                const requireEncryptionFields = await this.getRequireEncryptionFields(objectName);
+                for (const key in requireEncryptionFields) {
+                    if (Object.hasOwnProperty.call(requireEncryptionFields, key)) {
+                        const field = requireEncryptionFields[key];
+                        // 判断是加密字段并且值不为空，且还未加密过
+                        if (field.enable_encryption && _.has(doc, key) && doc[key] && !doc[key].buffer && !doc[key].sub_type) {
+                            doc[key] = await datasource.adapter.encryptValue(doc[key]);
+                        }
+                    }
+                }
+            } catch (error) {
+                console.error('encryptFieldValue error', objectName, doc)
+                console.error(`[字段级加密] 对象${objectName}中字段加密失败：`, error);
+            }
+            return doc;
+        }
     },
 
     /**