yaml-admin-api 0.0.93 → 0.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.93",
+  "version": "0.0.95",
   "license": "MIT",
   "description": "YAML Admin API package",
   "type": "commonjs",

package/src/crud/entity-api-generator.js

@@ -450,13 +450,20 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
 
         var r = await db.collection(collection_name).insertOne(entity);
         //Custom Create Tail Start
-        if(options?.listener?.entityCreated)
+        if(options?.listener?.entityCreated) {
+            let passwordField = yml_entity.fields.find(f => f.type == 'password')
+            if(passwordField)
+                entity[passwordField.name] = req.body[passwordField.name]
             await options.listener.entityCreated(db, entity_name, entity)
+        }
         //Custom Create Tail End
 
         const generatedId = entityId || r.insertedId
         entity.id = (key_field.type == 'objectId') ? generatedId?.toString() : generatedId;
-
+        let passwordField = yml_entity.fields.find(f => f.type == 'password')
+        if(passwordField)
+            delete entity[passwordField.name]
+        
         res.json(entity);
     }));
 
@@ -471,7 +478,6 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         if (entity[key_field.name] !== undefined)
             delete entity[key_field.name]
 
-
         //Custom Create Start
 
         //Custom Create End
@@ -496,12 +502,22 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         await db.collection(collection_name).updateOne(f, { $set: entity });
 
         //Custom Create Tail Start
-        if(options?.listener?.entityUpdated)
-            await options.listener.entityUpdated(db, entity_name, entity)
+        if(options?.listener?.entityUpdated) {
+            let entityWithId = { ...entity }
+            entityWithId[key_field.name] = entityId
+
+            let passwordField = yml_entity.fields.find(f => f.type == 'password')
+            if(passwordField && req.body[passwordField.name])
+                entityWithId[passwordField.name] = req.body[passwordField.name]
+            await options.listener.entityUpdated(db, entity_name, entityWithId)
+        }
         //Custom Create Tail End
 
         // Ensure React-Admin receives an `id` in the response
         entity.id = (key_field.type == 'objectId') ? entityId?.toString() : entityId
+        let passwordField = yml_entity.fields.find(f => f.type == 'password')
+        if(passwordField)
+            delete entity[passwordField.name]
 
         res.json(entity);
     }));