json-object-editor 0.10.437 → 0.10.439

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## CHANGELOG
 
 ### 0.10.400
+	439 - Enhanced route handling in Sites.js to support paths with and without leading slashes.
+	438 - enhance get function with itemtype parameter, and improve notifier functionality
 	437 - tagsList optimized using cache
 	436 - tags listRender
 	435 - and add user-select property to capp-menu-label

package/js/JsonObjectEditor.jquery.craydent.js

@@ -7340,13 +7340,18 @@ Field Rendering Helpers
     }
     window.$J = window.$J || {
         _usages:{get:0,schema:0,search:0},
-        get : function(itemID,callback){
+        get : function(itemID,callback,itemtype){
+            if(typeof callback == 'string' && !itemtype){
+                itemtype = callback;
+                callback = null;
+            }
             $J._usages.get++;
-            var item = self.getDataItem(itemID) || $J.search({_id:itemID})[0] ;
+            var item = self.getDataItem(itemID,itemtype) || $J.search({_id:itemID})[0] ;
             if(item){
                 callback && callback(item);
                 return item;
             }
+            return false;
         },
         
         schema : function(schemaname,callback){
@@ -7831,6 +7836,10 @@ Field Rendering Helpers
             oldObj:$.extend({},self.current.object),
             callback:function(data){
                 self.showMessage(data.name +' updated successfully');
+                //update the cache version
+                if(self.Cache.lookup[data._id]){
+                   self.Cache.lookup[data._id] = data;
+                }
             },
             ajaxObj: self.constructObjectFromFields(self.joe_index),
             overwrites:{},

package/js/joe-full.js

@@ -18645,13 +18645,18 @@ Field Rendering Helpers
     }
     window.$J = window.$J || {
         _usages:{get:0,schema:0,search:0},
-        get : function(itemID,callback){
+        get : function(itemID,callback,itemtype){
+            if(typeof callback == 'string' && !itemtype){
+                itemtype = callback;
+                callback = null;
+            }
             $J._usages.get++;
-            var item = self.getDataItem(itemID) || $J.search({_id:itemID})[0] ;
+            var item = self.getDataItem(itemID,itemtype) || $J.search({_id:itemID})[0] ;
             if(item){
                 callback && callback(item);
                 return item;
             }
+            return false;
         },
         
         schema : function(schemaname,callback){
@@ -19136,6 +19141,10 @@ Field Rendering Helpers
             oldObj:$.extend({},self.current.object),
             callback:function(data){
                 self.showMessage(data.name +' updated successfully');
+                //update the cache version
+                if(self.Cache.lookup[data._id]){
+                   self.Cache.lookup[data._id] = data;
+                }
             },
             ajaxObj: self.constructObjectFromFields(self.joe_index),
             overwrites:{},

package/js/joe.js

@@ -7346,13 +7346,18 @@ Field Rendering Helpers
     }
     window.$J = window.$J || {
         _usages:{get:0,schema:0,search:0},
-        get : function(itemID,callback){
+        get : function(itemID,callback,itemtype){
+            if(typeof callback == 'string' && !itemtype){
+                itemtype = callback;
+                callback = null;
+            }
             $J._usages.get++;
-            var item = self.getDataItem(itemID) || $J.search({_id:itemID})[0] ;
+            var item = self.getDataItem(itemID,itemtype) || $J.search({_id:itemID})[0] ;
             if(item){
                 callback && callback(item);
                 return item;
             }
+            return false;
         },
         
         schema : function(schemaname,callback){
@@ -7837,6 +7842,10 @@ Field Rendering Helpers
             oldObj:$.extend({},self.current.object),
             callback:function(data){
                 self.showMessage(data.name +' updated successfully');
+                //update the cache version
+                if(self.Cache.lookup[data._id]){
+                   self.Cache.lookup[data._id] = data;
+                }
             },
             ajaxObj: self.constructObjectFromFields(self.joe_index),
             overwrites:{},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-object-editor",
-  "version": "0.10.437",
+  "version": "0.10.439",
   "description": "JOE the Json Object Editor | Platform Edition",
   "main": "app.js",
   "scripts": {
@@ -36,6 +36,7 @@
     "cookie-parser": "^1.4.1",
     "craydent": "^0.8.9",
     "express": "^4.16.4",
+    "googleapis": "^149.0.0",
     "got": "^12.6.0",
     "jwt-decode": "^2.2.0",
     "mailgun": "^0.5.0",
@@ -43,6 +44,7 @@
     "mysql": "^2.16.0",
     "nodemailer": "^2.7.2",
     "nodemailer-ses-transport": "^1.4.0",
+    "openai": "^5.0.1",
     "opener": "^1.4.3",
     "pem": "^1.13.2",
     "plaid": "^13.1.0",

package/server/modules/Sites.js

@@ -321,6 +321,7 @@ var Blocks = {
 
 
 SitesServer.parseRoute = function(req,res,next){
+    const origin = req?.headers?.referer && new URL(req.headers.referer).origin;
     var routeStartTimer = new Date().getTime();
     var mixins = {};
     var DYNAMIC={};
@@ -371,8 +372,10 @@ logit('\n\r'+modulename+new Date()+' siteurl: '+siteurl+' site: '+(site && site.
             datasets[ds] = JOE.Data[ds];
         });
 
-
-        var page = JOE.Data.page.where({$and:[{site:site._id},{path:route}]})[0]
+        var route = payload.siteRoute || '';
+        var routeWithSlash = route.startsWith('/') ? route : '/' + route;
+var routeWithoutSlash = route.startsWith('/') ? route.slice(1) : route;
+        var page = JOE.Data.page.where({$and:[{site:site._id},{path:{$in:[routeWithSlash,routeWithoutSlash]}}]})[0]
             || findDynamicPage(payload.originalURL,site,req);
 
             if(!page){
@@ -516,7 +519,9 @@ logit('\n\r'+modulename+new Date()+' siteurl: '+siteurl+' site: '+(site && site.
                 DATA:datasets,
                 PLUGIN:{str:pluginstr},
                 WEBCONFIG:JOE.webconfig,
-                SECTION:section_content||{}
+                SECTION:section_content||{},
+                REQUEST:req,
+                ORIGIN:origin
             };
             if (pluginstr){
                 content.PAGE.content = pluginstr;

package/server/modules/UniversalShorthand.js

@@ -6,6 +6,7 @@ function UniversalShorthand(){
         search:0
     };
         this.get = function(itemID,callback){
+            
             self._usages.get++;
             var item = JOE.Cache.lookup[itemID];
                 

package/server/plugins/notifier.js

@@ -1,62 +1,62 @@
 var nodemailer = require('nodemailer');
 var ses = require('nodemailer-ses-transport');
- 
-function Notifier(){
+
+function Notifier() {
     var self = this;
     this.info = {
-        info:"This plugin sends notifications via email",
-        specs:['notification','recipient']
-        
+        info: "This plugin sends notifications via email",
+        specs: ['notification', 'recipient']
+
     };
 
-    this.default = function(data,req,res){
+    this.default = function (data, req, res) {
         var payload = {};
         //get NOTIFICATION
-        var notificationID = data.notification||'';
-        
-        var notification = JOE.Cache.findByID('notification',notificationID);
-        if(!data.notification || !notification){
-            return {error:'notification not found'};
+        var notificationID = data.notification || '';
+
+        var notification = JOE.Cache.findByID('notification', notificationID);
+        if (!data.notification || !notification) {
+            return { error: 'notification not found' };
         }
         payload.NOTIFICATION = notification;
         //GET recipient
-        var recipientID = data.recipient||(data._recipient && data._recipient._id) || '';
-        var recipient = data._recipient || JOE.Cache.findByID(notification.dataset,recipientID);
-        if(!recipient){
-            return {error:'recipient not found'};
+        var recipientID = data.recipient || (data._recipient && data._recipient._id) || '';
+        var recipient = data._recipient || JOE.Cache.findByID(notification.dataset, recipientID);
+        if (!recipient) {
+            return { error: 'recipient not found' };
         }
         payload.RECIPIENT = recipient;
         // console.log(notificationID);
         // var notification = JOE.Cache.findByID('notification',data.recipient||'');
 
-        var ses_config = tryEval(JOE.Cache.settings.AWS_SESCONFIG)||{};
-        ses_config.correctClockSkew =true;
+        var ses_config = tryEval(JOE.Cache.settings.AWS_SESCONFIG) || {};
+        ses_config.correctClockSkew = true;
         var transporter = nodemailer.createTransport(ses(ses_config));
         var mailOptions = {
             from: notification.from, // sender address 
-            to: fillTemplate(notification.to,payload), // list of receivers
-            subject: fillTemplate(notification.subject,payload), // Subject line
-            text: fillTemplate(notification.text,payload), // plaintext body
-            html: fillTemplate(notification.content,payload) // html body
+            to: fillTemplate(notification.to, payload), // list of receivers
+            subject: fillTemplate(notification.subject, payload), // Subject line
+            text: fillTemplate(notification.text, payload), // plaintext body
+            html: fillTemplate(notification.content, payload) // html body
         };
-                
 
-        transporter.sendMail(mailOptions, function(error, info){
-            if(error){
+
+        transporter.sendMail(mailOptions, function (error, info) {
+            if (error) {
                 res && res.send(error);
                 return console.log(error);
             }
-                res && res.send({status:'success',info:info});
+            res && res.send({ status: 'success', info: info });
             return;
         });
-        
-        if(res){ 
-            return {use_callback:true};
-        }else{
-            return {data:data};
+
+        if (res) {
+            return { use_callback: true };
+        } else {
+            return { data: data };
         }
     }
-    this.sendNotification = function(notificationIDs,payload,callback){
+    this.sendNotification = function (notificationIDs, payload, callback) {
         // var notificationID = 'e9761fed-7a50-4c0f-9f59-663a2a955a2a';
         // var payload ={MEMBER:{
         //     first_name:'Corey',
@@ -64,29 +64,29 @@ function Notifier(){
         //     name:'craql'
         // }}
         //console.log(typeof notificationIDs);
-        if(typeof notificationIDs == "string"){
+        if (typeof notificationIDs == "string") {
             notificationIDs = [notificationIDs];
         }
-        (notificationIDs ||[]).map(function(notificationID){
-            if($c.isCuid(notificationID)){
-                var notification = JOE.Cache.findByID('notification',notificationID);
-            }else{
-                var notification = JOE.Cache.findByID('notification',notificationID,{idprop:'notification_code'});
+        (notificationIDs || []).map(function (notificationID) {
+            if ($c.isCuid(notificationID)) {
+                var notification = JOE.Cache.findByID('notification', notificationID);
+            } else {
+                var notification = JOE.Cache.findByID('notification', notificationID, { idprop: 'notification_code' });
             }
-            if(!notification){
-                console.log(JOE.Utils.color('[plugin]','error')+' error: notification not found sendNotification('+notificationID+') ');
-                return {error:'notification not found'};
+            if (!notification) {
+                console.log(JOE.Utils.color('[plugin]', 'error') + ' error: notification not found sendNotification(' + notificationID + ') ');
+                return { error: 'notification not found' };
             }
-            if(!notification.from){
-                return {error:'no sender for notification: '+notification.name};
+            if (!notification.from) {
+                return { error: 'no sender for notification: ' + notification.name };
             }
-            if(!notification.to || !notification.to.length){
-                return {error:'no recipient for notification: '+notification.name};
+            if (!notification.to || !notification.to.length) {
+                return { error: 'no recipient for notification: ' + notification.name };
             }
-            if(notification.notification_type == "email"){
+            if (notification.notification_type == "email") {
                 self.sendEmail(
                     notification.subject,
-                    {html:notification.content,text:notification.content},
+                    { html: notification.content, text: notification.content },
                     notification.from,
                     notification.to,
                     payload,
@@ -94,32 +94,99 @@ function Notifier(){
                 )
             }
         })
-         
+
     }
-    this.sendEmail = function(subject,content, from, recipient,payload,callback){
+    this.sendEmail = function (subject, content, from, recipient, payload, callback) {
         var payload = payload || {};
-        var ses_config = tryEval(JOE.Cache.settings.AWS_SESCONFIG)||{};
-        ses_config.correctClockSkew =true;
+        var ses_config = tryEval(JOE.Cache.settings.AWS_SESCONFIG) || {};
+        ses_config.correctClockSkew = true;
         var transporter = nodemailer.createTransport(ses(ses_config));
         var mailOptions = {
             from: from, // sender address 
-            to: fillTemplate(recipient,payload), // list of receivers
-            subject: fillTemplate(subject,payload), // Subject line
-            text: fillTemplate((content.text || content),payload), // plaintext body
-            html: fillTemplate((content.html || content),payload) // html body
+            to: fillTemplate(recipient, payload), // list of receivers
+            subject: fillTemplate(subject, payload), // Subject line
+            text: fillTemplate((content.text || content), payload), // plaintext body
+            html: fillTemplate((content.html || content), payload) // html body
         };
-        transporter.sendMail(mailOptions, function(error, info){
-            if(error){
-                
+        transporter.sendMail(mailOptions, function (error, info) {
+            if (error) {
+
                 callback && callback(error);
                 return console.log(error);
             }
-                callback && callback(null,{status:'success'});
+            callback && callback(null, { status: 'success' });
             return;
         });
     }
+    this.sendRawEmail = function (data, req, res) {
+        const payload = data.payload || {};
+        let recipients = data.to;
+
+        try {
+            // If `to` is a stringified JSON array, parse it (for GET or form cases)
+            if (typeof recipients === 'string' && recipients.startsWith('[')) {
+            recipients = JSON.parse(recipients);
+            }
+        } catch (e) {
+            return res?.send?.({ error: 'Invalid "to" field: array parsing failed' });
+        }
+        self.sendMultiTransportEmail(
+            fillTemplate(data.subject, payload),
+            {
+                text: data.text,
+                html: data.html
+            },
+            fillTemplate(data.from, payload),
+            recipients,
+            payload,
+            function (err, result) {
+                if (err) {
+                    console.error('[notifier] sendRawEmail error:', err);
+                    res?.send?.({error:err});
+                    return;
+                }
+                res?.send?.(result);
+            }
+        );
+
+        return res ? { use_callback: true } : { status: 'queued' };
+    };
+
+    this.sendMultiTransportEmail = function (subject, content, from, recipients, payload, callback) {
+        const smtpConfig = tryEval(JOE.Cache.settings.SMTP_CONFIG);
+        const sesConfig = tryEval(JOE.Cache.settings.AWS_SESCONFIG);
+
+        let transporter;
+        if (smtpConfig && smtpConfig.auth?.user) {
+            transporter = nodemailer.createTransport(smtpConfig);
+        } else if (sesConfig?.accessKeyId) {
+            sesConfig.correctClockSkew = true;
+            transporter = nodemailer.createTransport(ses(sesConfig));
+        } else {
+            const err = new Error('No valid SMTP or SES configuration found.');
+            callback?.(err);
+            return;
+        }
+  const resolvedTo = Array.isArray(recipients)
+    ? recipients.map(r => fillTemplate(r, payload)).join(', ')
+    : fillTemplate(recipients, payload);
+        const mailOptions = {
+            from,
+            to: resolvedTo,
+            subject: fillTemplate(subject, payload),
+            text: fillTemplate(content.text || content, payload),
+            html: fillTemplate(content.html || content, payload)
+        };
+
+        transporter.sendMail(mailOptions, (err, info) => {
+            if (err) return callback?.(err);
+            callback?.(null, { status: 'success', info });
+        });
+    };
+
+
 
-    this.protected = ['sendEmail','sendNotification'];
-    return self; 
+    this.protected = ['sendEmail',  'sendDynamicEmail', 'sendNotification'];
+    return self;
 }
 module.exports = new Notifier();