Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 1ebea02

Browse files
author
API Prod Box
committed
adding changes that were made directly to the api instance
1 parent 81c2cae commit 1ebea02

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

actions/user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ function getUserIdentityByAuth0Id(api, connection, next) {
361361
function (cb) {
362362
try {
363363
var splits = auth0id.split('|');
364-
if (splits[0] === 'ad') {
364+
if (splits[0] === 'ad' || splits[0] === 'auth0') {
365365
cb(null, [{ user_id: Number(splits[1]) }]);
366366
} else {
367367
api.helper.getProviderId(splits[0], function (err, provider) {

config/logger.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ exports.default = {
1212
logger.transports.push(function (api, winston) {
1313
return new (winston.transports.Console)({
1414
colorize: true,
15-
level: 'debug',
15+
level: 'info',
1616
timestamp: api.utils.sqlDateTime,
1717
json: false
1818
});
@@ -31,7 +31,7 @@ exports.default = {
3131
logger.transports.push(function (api, winston) {
3232
return new (winston.transports.File)({
3333
filename: api.config.general.paths.log[0] + '/actionhero-worker.log',
34-
level: 'debug',
34+
level: 'info',
3535
colorize: true,
3636
timestamp: api.utils.sqlDateTime,
3737
json: false

initializers/dataAccess.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,13 @@ exports.dataAccess = function (api, next) {
309309
return;
310310
}
311311

312-
sql = queries[queryName].sql;
312+
sql = queries[queryName].sql;
313313

314314
if (!isSafeToUseJavaBridge(sql) || !api.helper.readTransaction) {
315315
connection = connectionMap[queries[queryName].db];
316+
api.log("######### MD #########", "info");
317+
api.log(JSON.stringify(connectionMap), "info");
318+
api.log(queryName, "info");
316319
error = helper.checkObject(connection, "connection");
317320
}
318321

@@ -374,4 +377,4 @@ exports.dataAccess = function (api, next) {
374377
}
375378
};
376379
next();
377-
};
380+
};

initializers/helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,7 @@ helper.getProviderId = function (provider, callback) {
12191219
if (provider.startsWith("salesforce")) {
12201220
providerId = helper.socialProviders.salesforce;
12211221
}
1222-
if (provider.startsWith("ad")) {
1222+
if (provider.startsWith("ad") || provider.startsWith("auth0")) {
12231223
providerId = helper.socialProviders.ad;
12241224
}
12251225
if (providerId) {

0 commit comments

Comments
 (0)