Merge pull request #471 from appirio-tech/md-update

adding changes that were made directly to the api instance

Author: mdesiderio

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) {

initializers/dataAccess.js

@@ -309,10 +309,13 @@ exports.dataAccess = function (api, next) {
                 return;
             }
 
-        sql = queries[queryName].sql;
+	    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");
             }
 
@@ -374,4 +377,4 @@ exports.dataAccess = function (api, next) {
         }
     };
     next();
-};
+};

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) {