production patches

Author: wiki

Diff for: actions/docusign.js

@@ -310,7 +310,7 @@ exports.generateDocusignViewURL = {
     blockedConnectionTypes: [],
     outputExample: {},
     version: 'v2',
-    transaction: 'read',
+    transaction: 'write',
     cacheEnabled : false,
     databases: ["informixoltp", "common_oltp"],
     inputs: {

Diff for: actions/user.js

@@ -361,7 +361,7 @@ function getUserIdentityByAuth0Id(api, connection, next) {
         function (cb) {
             try {
                 var splits = auth0id.split('|');
-                if (splits[0] === 'ad') {
+                if (splits[0] === 'ad' || splits[0] === 'auth0') {
                     cb(null, [{ user_id: Number(splits[1]) }]);
                 } else {
                     api.helper.getProviderId(splits[0], function (err, provider) {

Diff for: config/logger.js

@@ -12,7 +12,7 @@ exports.default = {
             logger.transports.push(function (api, winston) {
                 return new (winston.transports.Console)({
                     colorize: true,
-                    level: 'debug',
+                    level: 'info',
                     timestamp: api.utils.sqlDateTime,
                     json: false
                 });
@@ -31,7 +31,7 @@ exports.default = {
         logger.transports.push(function (api, winston) {
             return new (winston.transports.File)({
                 filename: api.config.general.paths.log[0] + '/actionhero-worker.log',
-                level: 'debug',
+                level: 'info',
                 colorize: true,
                 timestamp: api.utils.sqlDateTime,
                 json: false

Diff for: initializers/dataAccess.js

@@ -113,14 +113,19 @@ function parameterizeQuery(query, params, callback) {
     });
 }
 
+function isSafeToUseJavaBridge(sql) {
+  var lowerSQL = sql.toLowerCase();
+  return lowerSQL.indexOf("insert") === -1 && lowerSQL.indexOf("update") === -1 && lowerSQL.indexOf("delete") === -1;
+}
+
 function executePreparedStatement(api, sql, parameters, connection, next, db) {
     async.waterfall([
         function (cb) {
             parameterizeQuery(sql, parameters, cb);
         }, function (parametrizedQuery, cb) {
             sql = parametrizedQuery;
 
-            if (api.helper.readTransaction) {
+            if (isSafeToUseJavaBridge(sql) && api.helper.readTransaction) {
                 api.log("Calling Java Bridge", "debug");
 
                 api.log(sql, "debug");
@@ -304,8 +309,13 @@ exports.dataAccess = function (api, next) {
                 return;
             }
 
-            if (!api.helper.readTransaction) {
+	    sql = queries[queryName].sql;
+
+            if (!isSafeToUseJavaBridge(sql) || !api.helper.readTransaction) {
                 connection = connectionMap[queries[queryName].db];
+		api.log("######### MD #########", "info");
+		api.log(JSON.stringify(connectionMap), "info");
+		api.log(queryName, "info");
                 error = helper.checkObject(connection, "connection");
             }
 
@@ -314,7 +324,6 @@ exports.dataAccess = function (api, next) {
                 return;
             }
 
-            sql = queries[queryName].sql;
             if (!sql) {
                 api.log('Unregistered query ' + queryName + ' is asked for.', 'error');
                 next('The query for name ' + queryName + ' is not registered');
@@ -354,7 +363,7 @@ exports.dataAccess = function (api, next) {
                 return;
             }
 
-            if (!api.helper.readTransaction) {
+            if (!isSafeToUseJavaBridge(sql) || !api.helper.readTransaction) {
                 connection = connectionMap[dbName];
                 error = helper.checkObject(connection, "connection");
             }

Diff for: initializers/helper.js

@@ -1219,7 +1219,7 @@ helper.getProviderId = function (provider, callback) {
     if (provider.startsWith("salesforce")) {
         providerId = helper.socialProviders.salesforce;
     }
-    if (provider.startsWith("ad")) {
+    if (provider.startsWith("ad") || provider.startsWith("auth0")) {
         providerId = helper.socialProviders.ad;
     }
     if (providerId) {

Diff for: package.json.org

@@ -0,0 +1,62 @@
+{
+  "author": "TCASSEMBLER",
+  "name": "tcapi",
+  "description": "",
+  "version": "0.0.1",
+  "homepage": "",
+  "repository": {
+    "type": "",
+    "url": ""
+  },
+  "keywords": "",
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "dependencies": {
+    "actionhero": "8.0.x",
+    "xml2js": "0.2.x",
+    "async": "0.2.x",
+    "underscore": "1.5.x",
+    "datejs": "0.0.x",
+    "string": "1.6.x",
+    "ldapjs": "0.7.x",
+    "nodemailer": "0.5.x",
+    "email-templates": "0.1.x",
+    "bcrypt": "0.7.x",
+    "bigdecimal": "0.6.x",
+    "bignum": "0.6.x",
+    "java": "0.3.x",
+    "informix-wrapper": "git://github.com/cloudspokes/informix-wrapper.git#469300dbd4913c5d467b6957bc4610d95c3923ed",
+    "forums-wrapper": "git://github.com/cloudspokes/forums-wrapper.git#12b57be495c2e10431173522bc9eff60e0575959",
+    "asn1": "*",
+    "crypto": "0.0.x",
+    "jsonwebtoken": "0.4.x",
+    "request": "~2.33.0",
+    "soap": "~0.3.2",
+    "moment-timezone": "0.0.x",
+    "moment": "~2.5.1",
+    "mime": "~1.2.11",
+    "xtend": "2.1.x",
+    "validator": "~3.5.0",
+    "adm-zip": "0.4.x",
+    "mkdirp": "0.3.x",
+    "archiver": "~0.6.1",
+    "redis": "0.10.x",
+    "temp": "0.7.0",
+    "ssha": "*"
+  },
+  "devDependencies": {
+    "supertest": "0.8.x",
+    "mocha": "1.x",
+    "chai": "1.8.x",
+    "fakeredis": "0.1.x",
+    "should": ">= 3.0.0"
+ },
+  "scripts": {
+    "start": "node ./node_modules/.bin/actionhero start &",
+    "test": "node_modules/.bin/mocha --recursive ./test",
+    "startCluster": "node ./node_modules/.bin/actionhero startCluster",
+    "actionHero": "node ./node_modules/.bin/actionhero",
+    "help": "node ./node_modules/.bin/actionhero help"
+  }
+}