Skip to content

Commit bbd48a7

Browse files
sauntimosauntimo
committed
Remove debug logging + fix http errors
1 parent 2be4292 commit bbd48a7

File tree

7 files changed

+19
-98
lines changed

7 files changed

+19
-98
lines changed

‎dist/auth0-authz.extension.2.13.3.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/index.js‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,24 @@ export default async () => {
7373
if (statusCode >= 400) {
7474
request.response.output.statusCode = statusCode;
7575

76-
// Map status codes to standard HTTP error names
76+
// Preserve domain/business error names (ValidationError, NotFoundError, ArgumentError)
77+
// but map infrastructure error names (ManagementApiError, etc.) to standard HTTP error names
7778
let errorName = request.response.name;
78-
if (statusCode === 400) {
79-
errorName = "Bad Request";
80-
} else if (statusCode === 401) {
81-
errorName = "Unauthorized";
82-
} else if (statusCode === 403) {
83-
errorName = "Forbidden";
84-
} else if (statusCode === 404) {
85-
errorName = "Not Found";
86-
} else if (statusCode === 429) {
87-
errorName = "Too Many Requests";
79+
const domainErrors = ['ValidationError', 'NotFoundError', 'ArgumentError'];
80+
const shouldPreserveName = errorName && domainErrors.includes(errorName);
81+
82+
if (!shouldPreserveName) {
83+
if (statusCode === 400) {
84+
errorName = "Bad Request";
85+
} else if (statusCode === 401) {
86+
errorName = "Unauthorized";
87+
} else if (statusCode === 403) {
88+
errorName = "Forbidden";
89+
} else if (statusCode === 404) {
90+
errorName = "Not Found";
91+
} else if (statusCode === 429) {
92+
errorName = "Too Many Requests";
93+
}
8894
}
8995

9096
request.response.output.payload = {

‎server/init.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,9 @@ export default (cfg, storageContext, cb) => {
3535

3636

3737
// Initialize the storage layer.
38-
logger.info('[init] Initializing storage layer');
39-
logger.info('[init] storageContext provided:', !!storageContext);
40-
logger.info('[init] storageContext type:', typeof storageContext);
41-
4238
const provider = createProvider(storageContext);
43-
logger.info('[init] Provider created:', provider.constructor.name);
44-
4539
const database = new Database({ provider });
46-
logger.info('[init] Database created');
47-
4840
initDb(database);
49-
logger.info('[init] Database initialized in getdb');
5041

5142
// Start the server.
5243
return createServer(cb);

‎server/lib/storage/contexts/BlobRecordProvider.js‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,17 @@ const seriesQueue = require('./seriesQueue');
44
const ArgumentError = require('../../errors').ArgumentError;
55
const NotFoundError = require('../../errors').NotFoundError;
66
const ValidationError = require('../../errors').ValidationError;
7-
const logger = require('../../logger');
87

98
const getDataForCollection = function(storageContext, collectionName) {
10-
logger.info('[getDataForCollection] Reading data for collection:', collectionName);
119
return storageContext.read()
1210
.then(function(data) {
13-
logger.info('[getDataForCollection] Data read successfully, keys:', Object.keys(data || {}));
1411
data[collectionName] = data[collectionName] || [];
15-
logger.info('[getDataForCollection] Collection', collectionName, 'has', data[collectionName].length, 'items');
1612
return data;
17-
})
18-
.catch(function(err) {
19-
logger.info('[getDataForCollection] Error reading data:', err.message || err);
20-
throw err;
2113
});
2214
};
2315

2416
// Simple promise retry implementation
2517
const promiseRetry = function(fn, options) {
26-
logger.info('[promiseRetry] Starting with options:', JSON.stringify(options));
2718
let attempt = 0;
2819
const maxRetries = options.retries || 10;
2920
const factor = options.factor || 2;
@@ -32,26 +23,20 @@ const promiseRetry = function(fn, options) {
3223

3324
const retry = function(err) {
3425
attempt++;
35-
logger.info('[promiseRetry] Retry attempt', attempt, 'of', maxRetries);
36-
logger.info('[promiseRetry] Retry error:', err.message || err);
3726
if (attempt > maxRetries) {
38-
logger.info('[promiseRetry] Max retries exceeded, rejecting');
3927
return Promise.reject(err);
4028
}
4129

4230
// Calculate timeout with exponential backoff
4331
const timeout = Math.min(minTimeout * Math.pow(factor, attempt - 1), maxTimeout);
44-
logger.info('[promiseRetry] Waiting', timeout, 'ms before retry');
4532

4633
return new Promise(function(resolve) {
4734
setTimeout(resolve, timeout);
4835
}).then(function() {
49-
logger.info('[promiseRetry] Retrying function after timeout');
5036
return fn(retry);
5137
});
5238
};
5339

54-
logger.info('[promiseRetry] Executing function (attempt 0)');
5540
return fn(retry);
5641
};
5742

@@ -65,27 +50,16 @@ const withRetry = function(storageContext, action) {
6550
};
6651

6752
return function() {
68-
logger.info('[withRetry] Starting action with retry wrapper');
6953
return promiseRetry(function(retry) {
70-
logger.info('[withRetry] Executing action');
7154
return action()
72-
.then(function(result) {
73-
logger.info('[withRetry] Action succeeded');
74-
return result;
75-
})
7655
.catch(function(err) {
77-
logger.info('[withRetry] Action failed:', err.message || err);
7856
const writeRetryCondition =
7957
storageContext.writeRetryCondition ||
8058
function() { return false; };
81-
const shouldRetry = writeRetryCondition(err);
82-
logger.info('[withRetry] Should retry:', shouldRetry);
83-
if (shouldRetry) {
84-
logger.info('[withRetry] Retrying due to write conflict');
59+
if (writeRetryCondition(err)) {
8560
return retry(err);
8661
}
8762

88-
logger.info('[withRetry] Not retrying, throwing error');
8963
throw err;
9064
});
9165
}, retryOptions);

‎server/lib/storage/contexts/WebtaskStorageContext.js‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const ArgumentError = require('../../errors').ArgumentError;
2-
const logger = require('../../logger');
32

43
/**
54
* Create a new WebtaskStorageContext.
@@ -27,29 +26,13 @@ function WebtaskStorageContext(storage, options) {
2726
*/
2827
WebtaskStorageContext.prototype.read = function() {
2928
const ctx = this;
30-
logger.info('[WebtaskStorageContext] read() called');
31-
logger.info('[WebtaskStorageContext] storage object type:', typeof ctx.storage);
32-
logger.info('[WebtaskStorageContext] storage.get type:', typeof ctx.storage.get);
33-
logger.info('[WebtaskStorageContext] options:', JSON.stringify(ctx.options));
34-
3529
return new Promise(function readWebtaskStorageContext(resolve, reject) {
36-
logger.info('[WebtaskStorageContext] Calling storage.get()...');
37-
3830
ctx.storage.get(function(err, data) {
39-
logger.info('[WebtaskStorageContext] storage.get() callback invoked');
40-
logger.info('[WebtaskStorageContext] err:', err);
41-
logger.info('[WebtaskStorageContext] data:', data ? 'present' : 'null/undefined');
42-
4331
if (err) {
44-
logger.info('[WebtaskStorageContext] Rejecting with error:', err.message || err);
4532
return reject(err);
4633
}
47-
48-
logger.info('[WebtaskStorageContext] Resolving with data');
4934
return resolve(data || ctx.defaultData);
5035
});
51-
52-
logger.info('[WebtaskStorageContext] storage.get() called, waiting for callback...');
5336
});
5437
};
5538

@@ -60,27 +43,13 @@ WebtaskStorageContext.prototype.read = function() {
6043
*/
6144
WebtaskStorageContext.prototype.write = function(data) {
6245
const ctx = this;
63-
logger.info('[WebtaskStorageContext] write() called');
64-
logger.info('[WebtaskStorageContext] data keys:', data ? Object.keys(data) : 'null/undefined');
65-
logger.info('[WebtaskStorageContext] options:', JSON.stringify(ctx.options));
66-
6746
return new Promise(function(resolve, reject) {
68-
logger.info('[WebtaskStorageContext] Calling storage.set()...');
69-
7047
ctx.storage.set(data, ctx.options, function(err) {
71-
logger.info('[WebtaskStorageContext] storage.set() callback invoked');
72-
logger.info('[WebtaskStorageContext] err:', err);
73-
7448
if (err) {
75-
logger.info('[WebtaskStorageContext] Rejecting with error:', err.message || err, 'code:', err.code);
7649
return reject(err);
7750
}
78-
79-
logger.info('[WebtaskStorageContext] Resolving write');
8051
return resolve();
8152
});
82-
83-
logger.info('[WebtaskStorageContext] storage.set() called, waiting for callback...');
8453
});
8554
};
8655

‎server/lib/storage/database.js‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import _ from 'lodash';
22
import { ArgumentError, ValidationError } from '../errors/index.js';
33
import config from '../config';
4-
import logger from '../logger';
54

65
const checkUnique = (
76
items = [],
@@ -32,24 +31,15 @@ export default class Database {
3231
}
3332

3433
getStatus() {
35-
logger.info('[Database] getStatus() called');
36-
logger.info('[Database] STORAGE_TYPE:', config('STORAGE_TYPE'));
37-
3834
if (!config('STORAGE_TYPE') || config('STORAGE_TYPE') === 'webtask') {
39-
logger.info('[Database] Reading from storageContext...');
4035
return this.provider.storageContext.read().then((data) => {
41-
logger.info('[Database] Read completed, calculating size');
4236
return {
4337
size: Buffer.byteLength(JSON.stringify(data), 'utf8'),
4438
type: 'default'
4539
};
46-
}).catch((err) => {
47-
logger.info('[Database] Read failed:', err.message || err);
48-
throw err;
4940
});
5041
}
5142

52-
logger.info('[Database] Non-webtask storage, returning null size');
5343
return Promise.resolve({ size: null, type: config('STORAGE_TYPE') });
5444
}
5545

‎server/lib/storage/providers.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,11 @@ function createProvider(storageContext) {
2424
case 'webtask':
2525
default: {
2626
logger.info('Initializing the Webtask Storage Context.');
27-
logger.info('[providers] storageContext provided:', !!storageContext);
28-
logger.info('[providers] storageContext type:', typeof storageContext);
29-
30-
if (storageContext) {
31-
logger.info('[providers] storageContext.get type:', typeof storageContext.get);
32-
logger.info('[providers] storageContext.set type:', typeof storageContext.set);
33-
logger.info('[providers] storageContext keys:', Object.keys(storageContext));
34-
}
3527

3628
const context = storageContext
3729
? new WebtaskStorageContext(storageContext, { force: 0 })
3830
: new FileStorageContext(path.join(__dirname, '../../data.json'), { mergeWrites: true });
3931

40-
logger.info('[providers] Created context type:', context.constructor.name);
4132
return new BlobRecordProvider(context, { concurrentWrites: false });
4233
}
4334
}

0 commit comments

Comments
 (0)