json-object-editor 0.10.220 → 0.10.222

package/server/plugins/money.js

@@ -1,257 +1,59 @@
+// import { Configuration, PlaidApi, PlaidEnvironments } from 'plaid';
+  
 function Money() {
+  const plaid = require('plaid');
   var self = this;
-  const plaid = require("plaid");
-  var environment = plaid.environments.development;
   var plaidClient;
   var ACCESS_TOKEN = "";
   var PUBLIC_TOKEN = null;
 
-  var ACCESS_TOKENS
-  //initPlaidClient();
+  var ACCESS_TOKENS;
 
   function initPlaidClient() {
-      //console.log('plaidinit',plaidClient);
-      if(plaidClient){ return;}
-      logit('initializing plaid client')
-    try {
-      var client_id = JOE.Cache.settings.PLAID_CLIENTID;
-      var secret = JOE.Cache.settings.PLAID_SECRET_development;
-      var public_key = JOE.Cache.settings.PLAID_PUBLIC_KEY;
-      ACCESS_TOKENS = JOE.Cache.settings.PLAID_ACCESS_TOKENS && JSON.parse(JOE.Cache.settings.PLAID_ACCESS_TOKENS);
-      //console.log(ACCESS_TOKENS);
-      plaidClient = new plaid.Client(
-        client_id,
-        secret,
-        public_key,
-        environment,
-        { version: "2018-05-22" }
-      );
-      return true;
-    } catch (e) {
-      logit("plaid client init error",e);
-      return e;
-    }
-  }
-  function checkPlaidClient(res){
-    var p = initPlaidClient();
-    if(!plaidClient){
-        res.jsonp(p);
-        return false;
-    }
-    return true;
-  }
-
-  function getAT(data){
-    var AT = ACCESS_TOKENS[data.bank];
-    if(!AT){return false;}
-    return AT.access_token;
-  }
-
-  this.getPublicToken = function(data, request, response){
-    var p = initPlaidClient();
-    if(!plaidClient){
-        return p;
-    }
-    var AT = ACCESS_TOKENS[data.bank];
-    if(!AT)return {error:'bank not found'}
-    logit(AT);
-    plaidClient.createPublicToken(AT.access_token, (err,data)=>{
-        response.jsonp({err,data})
+    //console.log('plaidinit',plaidClient);
+    if(plaidClient){ return;}
+    logit('initializing plaid client')
+  try {
+    const configuration = new Configuration({
+      basePath: PlaidEnvironments.development,
+      baseOptions: {
+        headers: {
+          'PLAID-CLIENT-ID': CLIENT_ID,
+          'PLAID-SECRET': SECRET,
+        },
+      },
     });
-    return { use_callback: true };
-  }
-  this.getItem = function(data, request, response){
-    var p = initPlaidClient();
-    if(!plaidClient){
-        return p;
-    }
-    var AT = getAT(data);
+    var client_id = JOE.Cache.settings.PLAID_CLIENTID;
+    var secret = JOE.Cache.settings.PLAID_SECRET_development;
+    var public_key = JOE.Cache.settings.PLAID_PUBLIC_KEY;
+    ACCESS_TOKENS = JOE.Cache.settings.PLAID_ACCESS_TOKENS && JSON.parse(JOE.Cache.settings.PLAID_ACCESS_TOKENS);
+    //console.log(ACCESS_TOKENS);
     
-    if(!AT){return {error:'access token not found',ACCESS_TOKENS};}
-    //plaidClient.getItem(ACCESS_TOKEN, cb);
-    plaidClient.getItem(AT, (err,pdata)=>{
-        response.jsonp({err,pdata,data})
-    });
-    return { use_callback: true };
-  }
-  
-  this.get_access_token = function(data, request, response) {
-    var p = initPlaidClient();
-    if(!plaidClient){
-        return p;
-    }
-    console.log(data);
-    PUBLIC_TOKEN = (request.query && request.query.public_token) 
-    ||(request.body && request.body.public_token);
-    plaidClient.exchangePublicToken(PUBLIC_TOKEN, function(
-      error,
-      tokenResponse
-    ) {
-      if (error != null) {
-        console.log("Could not exchange public_token!" + "\n" + error);
-        return response.jsonp({ error });
-      }
-      ACCESS_TOKEN = tokenResponse.access_token;
-      ITEM_ID = tokenResponse.item_id;
-      console.log("Access Token: " + ACCESS_TOKEN);
-      console.log("Item ID: " + ITEM_ID);
-      response.jsonp({ error: false });
-    });
-    return { use_callback: true };
-  };
-  this.accounts = function(data, request, response){
-    var p = initPlaidClient();
-    if(!plaidClient){
-        return p;
-    }
-    var AT = getAT(data);
-    if(!AT)return {error:'bank not found'}
-    plaidClient.getAccounts(AT, (err, result) => {
-        // Handle err
-        if(err){
-            response.json({error:err});
-        }else{
-        const accounts = result.accounts;
-        response.jsonp(result);
-        }
-      });
-    return { use_callback: true };
-  }
-  this.accountNumbers = function(data, request, response){
-    var p = initPlaidClient();
-    if(!plaidClient){
-        return p;
+    configuration.headers={
+      'PLAID-CLIENT-ID': client_id,
+      'PLAID-SECRET': secret,
     }
-    var AT = getAT(data);
-    if(!AT)return {error:'bank not found'}
-    plaidClient.getAuth(AT,{}, (err, result) => {
-        // Handle err
-        if(err){
-            response.json({error:err});
-        }else{
-          var accounts = result.accounts;
-          response.jsonp(result);
-        }
-      });
-    return { use_callback: true };
-  }
-  this.transactions = function(data, request, response,specs={}){
-    var p = initPlaidClient();
-    if(!plaidClient){
-        return p;
-    }
-    var request = request || (data && data.request);
-    console.log('params',data);
-    var AT = request.query.at || (data.account && data.account.access_token)|| getAT(data);
-    var account_ids = request.query.account_ids && (request.query.account_ids.split(',')) || null;
-    console.log('accounts',account_ids);
-    console.log('AT',AT)
-    var curDate = new Date();
-    var start_date  = data.start_date || curDate.getFullYear()+'-01-01';
-    var end_date  = data.end_date || new Date().format('Y-m-d');
-    var count = data.count || 500;
-    if(!AT){return {error:'access token not found',ACCESS_TOKENS};}
-    plaidClient.getTransactions(AT, start_date, end_date, {count,account_ids}, (error,pdata)=>{
-
-      if(!specs.callback){
-        if(error){
-          return response.jsonp({error})
-        }
-        if(!request.query.full){
-          return response.jsonp({error,transactions:pdata.transactions})
-        }
-        response.jsonp({error,pdata,data})
-      }else{
-        logit('[money] using callback')
-        specs.callback(error,pdata,data)
-        return;
-      }
-    });
 
-    if(!specs.async){
-      return { use_callback: true };
-    }
+    plaidClient = new PlaidApi(configuration);
+    return true;
+  } catch (e) {
+    logit("plaid client init error",e);
+    return e;
   }
-  this.institutions = function(data, req, res) {
-    var p = initPlaidClient();
-    if(!plaidClient){
-        return p;
-    }
-    var callback = function(err, mfaResponse, response) {
-      res.jsonp({
-        err: err,
-        mfaResponse: mfaResponse,
-        response: response,
-        environments: plaid.environments
-      });
-    };
-    if (data["id"]) {
-      plaid.getInstitution(data["id"], environment, callback);
-    } else {
-      plaid.getInstitutions(environment, callback);
-    }
-    return { use_callback: true };
-  };
-
-  this.authTest = function(data, req, res) {
-    if (!plaidClient) {
-      initPlaidClient();
-    }
-    try {
-      var user = data["username"] || "plaid_test";
-      var pass = data["password"] || "plaid_good";
-
-      var credentials = { username: user, password: pass };
-      var institution_type = "wells"; //wf
-      plaidClient.addAuthUser(institution_type, credentials, function(
-        err,
-        mfaResponse,
-        response
-      ) {
-        res.jsonp({ err: err, mfaResponse: mfaResponse, response: response });
-      });
-
-      return { use_callback: true };
-    } catch (e) {
-      return { error: e };
-    }
-  };
-
-  this.connect = function(data, req, res) {
-    if (!plaidClient) {
-      initPlaidClient();
-    }
-    try {
-      var user = data["username"] || "plaid_test";
-      var pass = data["password"] || "plaid_good";
+}
 
-      var credentials = { username: user, password: pass };
-      var institution_type = "wells"; //wf
-      plaidClient.addConnectUser(institution_type, credentials, function(
-        err,
-        mfaResponse,
-        response
-      ) {
-        res.jsonp({ err: err, mfaResponse: mfaResponse, response: response });
-      });
+this.LinkTest = async function(data, request, response){
+  initPlaidClient();
+  const pResponse = await plaidClient.itemPublicTokenExchange({ public_token });
+  const access_token = pResponse.data.access_token;
+  const accounts_response = await plaidClient.accountsGet({ access_token });
+  const accounts = accounts_response.data.accounts;
 
-      return { use_callback: true };
-    } catch (e) {
-      return { error: e };
-    }
-  };
+  response.jsonp({ error: false,accounts });
+  return { use_callback: true };
+}
 
-  this.token = function(data, req, res) {
-    var public_token = data["token"];
-    var callback = function(err, mfaResponse, response) {
-      res.jsonp({ err: err, mfaResponse: mfaResponse, response: response });
-    };
-    try {
-      plaidClient.exchangeToken(public_token, callback);
-    } catch (e) {
-      return { error: e };
-    }
-  };
+ 
 
   this.default = function(data, req, res) {
     res.jsonp({ data: data });

package/server/schemas/list.js

@@ -89,16 +89,11 @@ var schema = {
     fields:function(){
         return [
         'name',
-        {section_start:'notes',collapsed:function(){
-            return !(i.info || i.description)
-        }},
-            'info',
-            'description',
-        {section_end:'notes'},
         
         {section_start:'items'},
         {
             name:'items',
+            display:"existing items",
             type:'objectReference',
             values:function(list){
                 var haystack = [];
@@ -110,37 +105,50 @@ var schema = {
         },
         {name:'addingredient',label:false, type:'create',schema:'ingredient',width:'50%'},
         {name:'addtask',label:false, type:'create',schema:'task',width:'50%'},
-        {name:'custom_items',type:"objectList",properties:[
+        {name:'custom_items', display:'freeform items',type:"objectList",properties:[
             'name',
-            {name:'type',width:'120px'}
-        ]},
+            {name:'type',width:'80px'},
+            {name:'sub_complete',display:'done',type:'boolean',width:'50px'}
+            ],
+            template:function(obj,subobj){
+            var done = (subobj.sub_complete)?'joe-strike':'';
+            return`<joe-subtext>${subobj.type ||''}</joe-subtext>
+            <joe-title class="${done}">${subobj.name}</joe-title>`
+        }},
         {section_end:'items'},
-        
+        {section_start:'notes',collapsed:function(){
+            return !(i.info || i.description)
+        }},
+            'info',
+            'description',
+        {section_end:'notes'},
         {sidebar_start:'right',collapsed:function(i){
             return (i.list_type || (i.tags || i.tags.length));
         }},
-            'status',
-            {name:'date',type:'date',native:true},
-            'reports',
-            {section_start:'details'},
-            {name:'list_type',display:"List Type",
-            autocomplete:{text:true},
-            values:function(i){
-                //get list list types
-                var listTypes = [];
-                for(var l=0;l<_joe.Data.list.length;l++){
-                    let lt = _joe.Data.list[l].list_type;
-                    if(lt){
-                        listTypes.push(lt);
+            {section_start:'activity'},
+                'status',
+                {name:'date',type:'date',native:true},
+                'reports',
+            {section_start:'activity'},
+            {section_start:'classification'},
+                {name:'list_type',display:"List Type",
+                autocomplete:{text:true},
+                values:function(i){
+                    //get list list types
+                    var listTypes = [];
+                    for(var l=0;l<_joe.Data.list.length;l++){
+                        let lt = _joe.Data.list[l].list_type;
+                        if(lt){
+                            listTypes.push(lt);
+                        }
                     }
-                }
-                listTypes = Array.from(new Set(listTypes));
-                return listTypes;
-            }},
-                    'tags',
-            {section_end:'details'},   
+                    listTypes = Array.from(new Set(listTypes));
+                    return listTypes;
+                }},
+                        'tags',
+            {section_end:'classification'},   
             {section_start:'access'},
-            '_protected',
+                '_protected',
             {section_end:'access'},
         {sidebar_end:'right'},    
         {section_start:'system',collapsed:true},

package/server/schemas/page.js

@@ -136,15 +136,21 @@ var page = {
         'updated',
         {name:'preview',type:'content',run:function(item){
             if(item.site){
-                var site = _joe.Data.site.where({_id:item.site})[0]||{};
+                var site = $J.get(_joe.current.object.site);
+                 //_joe.Data.site.where({_id:item.site})[0]||{};
 
-                var path = __jsc.PORT?('/'+site.url+'/'+item.path).replace('//','/'):'//'+location.hostname+':'+__jsc.sitesPort+'/'+(site.url+'/'+item.path).replace('//','/');
+                //var path = __jsc.PORT?('/'+site.url+'/'+item.path).replace('//','/'):'//'+location.hostname+':'+__jsc.sitesPort+'/'+(site.url+'/'+item.path).replace('//','/');
+                var path = location.origin + (site.path||'')+item.path;
                 
-                
-                return `<joe-subtitle>${path}</joe-subtitle><joe-button class="joe-button joe-iconed-button joe-preview-button full-width"  \
-                 onclick="window.open('${path}?editor=true');">`
-                 +'Preview Page'
-                 +'</joe-button>';
+                return `
+                <joe-subtext>${location.origin}</joe-subtext>
+                <joe-subtitle>${(site.path||'')+item.path}</joe-subtitle>
+                <joe-button class="joe-button joe-iconed-button joe-preview-button full-width"
+                 onclick="window.open('${path}');">Preview</joe-button>
+                 <joe-button class="joe-button joe-iconed-button full-width"
+                 onclick="window.open('${path}?editor=true');">Editor</joe-button>`
+                 
+                 ;
             }else{
                 return 'no site selected';
             }
@@ -152,8 +158,15 @@ var page = {
         {section_start:'Adv'},
             {extend:'site',specs:{rerender:'preview'}},
             {name:'path',
-                onblur:'if(this.value[0] != \'/\'){this.value = \'/\'+this.value;}'
-                +'_joe.Fields.rerender(\'preview\');'/*rerender:'preview'*/,
+                // onblur:'if(this.value[0] != \'/\'){this.value = \'/\'+this.value;}'
+                // +'_joe.Fields.rerender(\'preview\');'/*rerender:'preview'*/,
+                // onblur:function(a,b,c){
+                //     console.log(a,b,c);
+                //     if(this.value[0] != "/"){this.value = "/"+this.value;};
+                //     return this.value;
+                // //+'_joe.Fields.rerender(\'preview\');'
+                // },
+                rerender:'preview',
                 comment:'use /:reference for dynamic pages'
             },
             

package/server/schemas/user.js

@@ -50,7 +50,8 @@ var user = function(){return{
             subs = subs.concat(_joe.Filter.Options.tags());
         subs.push({group_end:'tags'});
 
-        var roles = _joe.Utils.Settings('CUSTOM_ROLES');
+        var roles = _joe.Utils.Settings('CUSTOM_ROLES') || [];
+
         ss_roles = roles.map(r=>{
             return{ name:r.name,
                 filter:{custom_roles:{$in:[r._id]}}