From 774fdce204b20f5abfc3672c0905a884a1e02283 Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Mon, 26 Nov 2018 12:38:06 -0800 Subject: [PATCH] Added a generic error handler with support for captian errors in app.ts --- app-backend/built/api/ApiStatusCodes.js | 15 +++++++++++ app-backend/built/api/ApiStatusCodes.js.map | 2 +- app-backend/built/api/CaptainError.js | 1 + app-backend/built/api/CaptainError.js.map | 2 +- app-backend/built/app.js | 13 +-------- app-backend/built/app.js.map | 2 +- app-backend/built/user/Authenticator.js | 2 +- app-backend/built/user/Authenticator.js.map | 2 +- app-backend/src/api/ApiStatusCodes.ts | 30 ++++++++++----------- app-backend/src/api/CaptainError.ts | 1 + app-backend/src/app.ts | 22 +-------------- app-backend/src/user/Authenticator.ts | 5 +++- 12 files changed, 43 insertions(+), 54 deletions(-) diff --git a/app-backend/built/api/ApiStatusCodes.js b/app-backend/built/api/ApiStatusCodes.js index 1f77b29..2d8f176 100644 --- a/app-backend/built/api/ApiStatusCodes.js +++ b/app-backend/built/api/ApiStatusCodes.js @@ -17,5 +17,20 @@ class ApiStatusCodes { }; } } +ApiStatusCodes.STATUS_OK_DEPLOY_STARTED = 101; +ApiStatusCodes.STATUS_ERROR_GENERIC = 1000; +ApiStatusCodes.STATUS_OK = 100; +ApiStatusCodes.STATUS_ERROR_CAPTAIN_NOT_INITIALIZED = 1001; +ApiStatusCodes.STATUS_ERROR_USER_NOT_INITIALIZED = 1101; +ApiStatusCodes.STATUS_ERROR_NOT_AUTHORIZED = 1102; +ApiStatusCodes.STATUS_ERROR_ALREADY_EXIST = 1103; +ApiStatusCodes.STATUS_ERROR_BAD_NAME = 1104; +ApiStatusCodes.STATUS_WRONG_PASSWORD = 1105; +ApiStatusCodes.STATUS_AUTH_TOKEN_INVALID = 1106; +ApiStatusCodes.VERIFICATION_FAILED = 1107; +ApiStatusCodes.ILLEGAL_OPERATION = 1108; +ApiStatusCodes.BUILD_ERROR = 1109; +ApiStatusCodes.ILLEGAL_PARAMETER = 1110; +ApiStatusCodes.NOT_FOUND = 1111; module.exports = ApiStatusCodes; //# sourceMappingURL=ApiStatusCodes.js.map \ No newline at end of file diff --git a/app-backend/built/api/ApiStatusCodes.js.map b/app-backend/built/api/ApiStatusCodes.js.map index e42a101..88f331d 100644 --- a/app-backend/built/api/ApiStatusCodes.js.map +++ b/app-backend/built/api/ApiStatusCodes.js.map @@ -1 +1 @@ -{"version":3,"file":"ApiStatusCodes.js","sourceRoot":"","sources":["../../src/api/ApiStatusCodes.ts"],"names":[],"mappings":";AAAA,iDAA6C;AAE7C,qCAAqC;AACrC,0CAA0C;AAE1C,MAAM,cAAc;IAChB,MAAM,CAAC,WAAW,CAAC,IAAY,EAAE,OAAe;QAC5C,OAAO,IAAI,2BAAY,CAAC,IAAI,EAAE,OAAO,IAAI,MAAM,CAAC,CAAA;IACpD,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,GAAa;QAC9B,OAAO,UAAS,KAAyB;YACrC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;gBACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;gBAC/D,OAAM;aACT;YAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACvB,CAAC,CAAA;IACL,CAAC;CAiBJ;AAED,iBAAS,cAAc,CAAA"} \ No newline at end of file +{"version":3,"file":"ApiStatusCodes.js","sourceRoot":"","sources":["../../src/api/ApiStatusCodes.ts"],"names":[],"mappings":";AAAA,iDAA6C;AAE7C,qCAAqC;AACrC,0CAA0C;AAE1C,MAAM,cAAc;IAChB,MAAM,CAAC,WAAW,CAAC,IAAY,EAAE,OAAe;QAC5C,OAAO,IAAI,2BAAY,CAAC,IAAI,EAAE,OAAO,IAAI,MAAM,CAAC,CAAA;IACpD,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,GAAa;QAC9B,OAAO,UAAS,KAAyB;YACrC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;gBACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;gBAC/D,OAAM;aACT;YAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACvB,CAAC,CAAA;IACL,CAAC;;AAEe,uCAAwB,GAAG,GAAG,CAAA;AAC9B,mCAAoB,GAAG,IAAI,CAAA;AAC3B,wBAAS,GAAG,GAAG,CAAA;AACf,mDAAoC,GAAG,IAAI,CAAA;AAC3C,gDAAiC,GAAG,IAAI,CAAA;AACxC,0CAA2B,GAAG,IAAI,CAAA;AAClC,yCAA0B,GAAG,IAAI,CAAA;AACjC,oCAAqB,GAAG,IAAI,CAAA;AAC5B,oCAAqB,GAAG,IAAI,CAAA;AAC5B,wCAAyB,GAAG,IAAI,CAAA;AAChC,kCAAmB,GAAG,IAAI,CAAA;AAC1B,gCAAiB,GAAG,IAAI,CAAA;AACxB,0BAAW,GAAG,IAAI,CAAA;AAClB,gCAAiB,GAAG,IAAI,CAAA;AACxB,wBAAS,GAAG,IAAI,CAAA;AAGpC,iBAAS,cAAc,CAAA"} \ No newline at end of file diff --git a/app-backend/built/api/CaptainError.js b/app-backend/built/api/CaptainError.js index 86f89ad..d6bf0c7 100644 --- a/app-backend/built/api/CaptainError.js +++ b/app-backend/built/api/CaptainError.js @@ -4,6 +4,7 @@ class CaptainError extends Error { constructor(code, msg) { super(msg); this.captainErrorType = code; + this.apiMessage = msg; } } exports.CaptainError = CaptainError; diff --git a/app-backend/built/api/CaptainError.js.map b/app-backend/built/api/CaptainError.js.map index d06aaf6..aec0137 100644 --- a/app-backend/built/api/CaptainError.js.map +++ b/app-backend/built/api/CaptainError.js.map @@ -1 +1 @@ -{"version":3,"file":"CaptainError.js","sourceRoot":"","sources":["../../src/api/CaptainError.ts"],"names":[],"mappings":";;AAAA,MAAa,YAAa,SAAQ,KAAK;IAInC,YAAY,IAAY,EAAE,GAAW;QACjC,KAAK,CAAC,GAAG,CAAC,CAAA;QACV,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAA;IAChC,CAAC;CACJ;AARD,oCAQC"} \ No newline at end of file +{"version":3,"file":"CaptainError.js","sourceRoot":"","sources":["../../src/api/CaptainError.ts"],"names":[],"mappings":";;AAAA,MAAa,YAAa,SAAQ,KAAK;IAInC,YAAY,IAAY,EAAE,GAAW;QACjC,KAAK,CAAC,GAAG,CAAC,CAAA;QACV,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAA;QAC5B,IAAI,CAAC,UAAU,GAAG,GAAG,CAAA;IACzB,CAAC;CACJ;AATD,oCASC"} \ No newline at end of file diff --git a/app-backend/built/app.js b/app-backend/built/app.js index b360b1e..20e8c64 100644 --- a/app-backend/built/app.js +++ b/app-backend/built/app.js @@ -116,11 +116,6 @@ app.use(API_PREFIX + ':apiVersionFromRequest/', function (req, res, next) { res.send(response); return; } - if (!res.locals.namespace && - !req.originalUrl.startsWith(API_PREFIX + CaptainConstants.apiVersion + '/user/webhooks/')) { - res.send(new BaseApi(ApiStatusCodes.STATUS_ERROR_GENERIC, 'no namespace')); - return; - } next(); }); // unsecured end points: @@ -136,13 +131,7 @@ app.use(function (req, res, next) { }); // error handler app.use(function (err, req, res, next) { - // set locals, only providing error in development - res.locals.message = err.message; - res.locals.error = req.app.get('env') === 'development' ? err : {}; - Logger.e(err); - // render the error page - res.status(err.status || 500); - res.render('error'); + Promise.reject(err).catch(ApiStatusCodes.createCatcher(res)); }); // Initializing with delay helps with debugging. Usually, docker didn't see the CAPTAIN service // if this was done without a delay diff --git a/app-backend/built/app.js.map b/app-backend/built/app.js.map index bacb81a..10e5781 100644 --- a/app-backend/built/app.js.map +++ b/app-backend/built/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/user/Authenticator.js b/app-backend/built/user/Authenticator.js index a01bfa9..3e244e7 100644 --- a/app-backend/built/user/Authenticator.js +++ b/app-backend/built/user/Authenticator.js @@ -145,7 +145,7 @@ class Authenticator { } static get(namespace) { if (!namespace) { - throw new Error('namespace is needed'); + throw ApiStatusCodes.createError(ApiStatusCodes.STATUS_ERROR_NOT_AUTHORIZED, 'Empty namespace'); } if (!authenticatorCache[namespace]) { const captainSalt = CaptainManager.get().getCaptainSalt(); diff --git a/app-backend/built/user/Authenticator.js.map b/app-backend/built/user/Authenticator.js.map index 55b4525..21450a7 100644 --- a/app-backend/built/user/Authenticator.js.map +++ b/app-backend/built/user/Authenticator.js.map @@ -1 +1 @@ -{"version":3,"file":"Authenticator.js","sourceRoot":"","sources":["../../src/user/Authenticator.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Authenticator.js","sourceRoot":"","sources":["../../src/user/Authenticator.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/src/api/ApiStatusCodes.ts b/app-backend/src/api/ApiStatusCodes.ts index 9282b45..3b14a91 100644 --- a/app-backend/src/api/ApiStatusCodes.ts +++ b/app-backend/src/api/ApiStatusCodes.ts @@ -21,21 +21,21 @@ class ApiStatusCodes { } } - static STATUS_OK_DEPLOY_STARTED: 101 - static STATUS_ERROR_GENERIC: 1000 - static STATUS_OK: 100 - static STATUS_ERROR_CAPTAIN_NOT_INITIALIZED: 1001 - static STATUS_ERROR_USER_NOT_INITIALIZED: 1101 - static STATUS_ERROR_NOT_AUTHORIZED: 1102 - static STATUS_ERROR_ALREADY_EXIST: 1103 - static STATUS_ERROR_BAD_NAME: 1104 - static STATUS_WRONG_PASSWORD: 1105 - static STATUS_AUTH_TOKEN_INVALID: 1106 - static VERIFICATION_FAILED: 1107 - static ILLEGAL_OPERATION: 1108 - static BUILD_ERROR: 1109 - static ILLEGAL_PARAMETER: 1110 - static NOT_FOUND: 1111 + static readonly STATUS_OK_DEPLOY_STARTED = 101 + static readonly STATUS_ERROR_GENERIC = 1000 + static readonly STATUS_OK = 100 + static readonly STATUS_ERROR_CAPTAIN_NOT_INITIALIZED = 1001 + static readonly STATUS_ERROR_USER_NOT_INITIALIZED = 1101 + static readonly STATUS_ERROR_NOT_AUTHORIZED = 1102 + static readonly STATUS_ERROR_ALREADY_EXIST = 1103 + static readonly STATUS_ERROR_BAD_NAME = 1104 + static readonly STATUS_WRONG_PASSWORD = 1105 + static readonly STATUS_AUTH_TOKEN_INVALID = 1106 + static readonly VERIFICATION_FAILED = 1107 + static readonly ILLEGAL_OPERATION = 1108 + static readonly BUILD_ERROR = 1109 + static readonly ILLEGAL_PARAMETER = 1110 + static readonly NOT_FOUND = 1111 } export = ApiStatusCodes diff --git a/app-backend/src/api/CaptainError.ts b/app-backend/src/api/CaptainError.ts index 5f9d8b1..cf8d4e8 100644 --- a/app-backend/src/api/CaptainError.ts +++ b/app-backend/src/api/CaptainError.ts @@ -5,5 +5,6 @@ export class CaptainError extends Error { constructor(code: number, msg: string) { super(msg) this.captainErrorType = code + this.apiMessage = msg } } diff --git a/app-backend/src/app.ts b/app-backend/src/app.ts index 41d318d..810262c 100644 --- a/app-backend/src/app.ts +++ b/app-backend/src/app.ts @@ -166,18 +166,6 @@ app.use(API_PREFIX + ':apiVersionFromRequest/', function(req, res, next) { return } - if ( - !res.locals.namespace && - !req.originalUrl.startsWith( - API_PREFIX + CaptainConstants.apiVersion + '/user/webhooks/' - ) - ) { - res.send( - new BaseApi(ApiStatusCodes.STATUS_ERROR_GENERIC, 'no namespace') - ) - return - } - next() }) @@ -198,15 +186,7 @@ app.use(function(req, res, next) { // error handler app.use(function(err, req, res, next) { - // set locals, only providing error in development - res.locals.message = err.message - res.locals.error = req.app.get('env') === 'development' ? err : {} - - Logger.e(err) - - // render the error page - res.status(err.status || 500) - res.render('error') + Promise.reject(err).catch(ApiStatusCodes.createCatcher(res)) } as express.ErrorRequestHandler) // Initializing with delay helps with debugging. Usually, docker didn't see the CAPTAIN service diff --git a/app-backend/src/user/Authenticator.ts b/app-backend/src/user/Authenticator.ts index 70c82b8..8376150 100644 --- a/app-backend/src/user/Authenticator.ts +++ b/app-backend/src/user/Authenticator.ts @@ -254,7 +254,10 @@ class Authenticator { static get(namespace: string): Authenticator { if (!namespace) { - throw new Error('namespace is needed') + throw ApiStatusCodes.createError( + ApiStatusCodes.STATUS_ERROR_NOT_AUTHORIZED, + 'Empty namespace' + ) } if (!authenticatorCache[namespace]) {