diff --git a/app-backend/built/api/ApiStatusCodes.js b/app-backend/built/api/ApiStatusCodes.js index 124f5fe..7f23c82 100644 --- a/app-backend/built/api/ApiStatusCodes.js +++ b/app-backend/built/api/ApiStatusCodes.js @@ -1,9 +1,21 @@ "use strict"; const CaptainError_1 = require("./CaptainError"); +const BaseApi = require("./BaseApi"); +const Logger = require("../utils/Logger"); let apiStatusCode = { createError: function (code, message) { return new CaptainError_1.CaptainError(code, message || 'NONE'); }, + createCatcher: function (res) { + return function (error) { + Logger.e(error); + if (error && error.captainErrorType) { + res.send(new BaseApi(error.captainErrorType, error.apiMessage)); + return; + } + res.sendStatus(500); + }; + }, STATUS_OK: 100, STATUS_OK_DEPLOY_STARTED: 101, STATUS_ERROR_GENERIC: 1000, diff --git a/app-backend/built/api/ApiStatusCodes.js.map b/app-backend/built/api/ApiStatusCodes.js.map index 4f1120c..64f1cb1 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,IAAI,aAAa,GAAG;IAChB,WAAW,EAAE,UAAS,IAAY,EAAE,OAAe;QAC/C,OAAO,IAAI,2BAAY,CAAC,IAAI,EAAE,OAAO,IAAI,MAAM,CAAC,CAAA;IACpD,CAAC;IAED,SAAS,EAAE,GAAG;IAEd,wBAAwB,EAAE,GAAG;IAE7B,oBAAoB,EAAE,IAAI;IAE1B,oCAAoC,EAAE,IAAI;IAE1C,iCAAiC,EAAE,IAAI;IAEvC,2BAA2B,EAAE,IAAI;IAEjC,0BAA0B,EAAE,IAAI;IAEhC,qBAAqB,EAAE,IAAI;IAE3B,qBAAqB,EAAE,IAAI;IAE3B,yBAAyB,EAAE,IAAI;IAE/B,mBAAmB,EAAE,IAAI;IAEzB,iBAAiB,EAAE,IAAI;IAEvB,WAAW,EAAE,IAAI;IAEjB,iBAAiB,EAAE,IAAI;IAEvB,SAAS,EAAE,IAAI;CAClB,CAAA;AAED,iBAAS,aAAa,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,IAAI,aAAa,GAAG;IAChB,WAAW,EAAE,UAAS,IAAY,EAAE,OAAe;QAC/C,OAAO,IAAI,2BAAY,CAAC,IAAI,EAAE,OAAO,IAAI,MAAM,CAAC,CAAA;IACpD,CAAC;IAED,aAAa,EAAE,UAAS,GAAa;QACjC,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;IAED,SAAS,EAAE,GAAG;IAEd,wBAAwB,EAAE,GAAG;IAE7B,oBAAoB,EAAE,IAAI;IAE1B,oCAAoC,EAAE,IAAI;IAE1C,iCAAiC,EAAE,IAAI;IAEvC,2BAA2B,EAAE,IAAI;IAEjC,0BAA0B,EAAE,IAAI;IAEhC,qBAAqB,EAAE,IAAI;IAE3B,qBAAqB,EAAE,IAAI;IAE3B,yBAAyB,EAAE,IAAI;IAE/B,mBAAmB,EAAE,IAAI;IAEzB,iBAAiB,EAAE,IAAI;IAEvB,WAAW,EAAE,IAAI;IAEjB,iBAAiB,EAAE,IAAI;IAEvB,SAAS,EAAE,IAAI;CAClB,CAAA;AAED,iBAAS,aAAa,CAAA"} \ No newline at end of file diff --git a/app-backend/built/api/BaseApi.js.map b/app-backend/built/api/BaseApi.js.map index 82edda7..e39908d 100644 --- a/app-backend/built/api/BaseApi.js.map +++ b/app-backend/built/api/BaseApi.js.map @@ -1 +1 @@ -{"version":3,"file":"BaseApi.js","sourceRoot":"","sources":["../../src/api/BaseApi.ts"],"names":[],"mappings":";AAEA,MAAM,OAAO;IAGT,YAAoB,MAAc,EAAU,WAAmB;QAA3C,WAAM,GAAN,MAAM,CAAQ;QAAU,gBAAW,GAAX,WAAW,CAAQ;QAC3D,EAAE;IACN,CAAC;CACJ;AAED,iBAAS,OAAO,CAAA"} \ No newline at end of file +{"version":3,"file":"BaseApi.js","sourceRoot":"","sources":["../../src/api/BaseApi.ts"],"names":[],"mappings":";AAAA,MAAM,OAAO;IAGT,YAAoB,MAAc,EAAU,WAAmB;QAA3C,WAAM,GAAN,MAAM,CAAQ;QAAU,gBAAW,GAAX,WAAW,CAAQ;QAC3D,EAAE;IACN,CAAC;CACJ;AAED,iBAAS,OAAO,CAAA"} \ No newline at end of file diff --git a/app-backend/built/routes/AppDataRouter.js b/app-backend/built/routes/AppDataRouter.js index 4bfd890..ce89a46 100644 --- a/app-backend/built/routes/AppDataRouter.js +++ b/app-backend/built/routes/AppDataRouter.js @@ -22,14 +22,7 @@ router.get('/:appName/', function (req, res, next) { baseApi.data = data; res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/:appName/', function (req, res, next) { let dataStore = res.locals.user.dataStore; @@ -41,14 +34,7 @@ router.post('/:appName/', function (req, res, next) { // nothing to do with app, just to make sure that it exists! next(); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/:appName/', upload.single('sourceFile'), function (req, res, next) { const dataStore = res.locals.user.dataStore; diff --git a/app-backend/built/routes/AppDataRouter.js.map b/app-backend/built/routes/AppDataRouter.js.map index fda66a5..64f298f 100644 --- a/app-backend/built/routes/AppDataRouter.js.map +++ b/app-backend/built/routes/AppDataRouter.js.map @@ -1 +1 @@ -{"version":3,"file":"AppDataRouter.js","sourceRoot":"","sources":["../../src/routes/AppDataRouter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"AppDataRouter.js","sourceRoot":"","sources":["../../src/routes/AppDataRouter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/routes/AppDefinitionRouter.js b/app-backend/built/routes/AppDefinitionRouter.js index a9e155a..d10ff80 100644 --- a/app-backend/built/routes/AppDefinitionRouter.js +++ b/app-backend/built/routes/AppDefinitionRouter.js @@ -39,14 +39,7 @@ router.get('/unusedImages', function (req, res, next) { baseApi.data.unusedImages = unusedImages; res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); // unused iamges router.post('/deleteImages', function (req, res, next) { @@ -61,14 +54,7 @@ router.post('/deleteImages', function (req, res, next) { let baseApi = new BaseApi(ApiStatusCodes.STATUS_OK, 'Images Deleted.'); res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); // Get All App Definitions router.get('/', function (req, res, next) { @@ -101,14 +87,7 @@ router.get('/', function (req, res, next) { baseApi.defaultNginxConfig = defaultNginxConfig; res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/enablebasedomainssl/', function (req, res, next) { let dataStore = res.locals.user.dataStore; @@ -123,14 +102,7 @@ router.post('/enablebasedomainssl/', function (req, res, next) { Logger.d(msg); res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/customdomain/', function (req, res, next) { let dataStore = res.locals.user.dataStore; @@ -151,14 +123,7 @@ router.post('/customdomain/', function (req, res, next) { Logger.d(msg); res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/removecustomdomain/', function (req, res, next) { let dataStore = res.locals.user.dataStore; @@ -177,14 +142,7 @@ router.post('/removecustomdomain/', function (req, res, next) { Logger.d(msg); res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/enablecustomdomainssl/', function (req, res, next) { let dataStore = res.locals.user.dataStore; @@ -205,14 +163,7 @@ router.post('/enablecustomdomainssl/', function (req, res, next) { Logger.d(msg); res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/register/', function (req, res, next) { let dataStore = res.locals.user.dataStore; @@ -255,14 +206,7 @@ router.post('/register/', function (req, res, next) { return createRejectionPromise(); } }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/delete/', function (req, res, next) { let dataStore = res.locals.user.dataStore; @@ -277,14 +221,7 @@ router.post('/delete/', function (req, res, next) { Logger.d('AppName is deleted: ' + appName); res.send(new BaseApi(ApiStatusCodes.STATUS_OK, 'App is deleted')); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/update/', function (req, res, next) { let dataStore = res.locals.user.dataStore; @@ -318,14 +255,7 @@ router.post('/update/', function (req, res, next) { Logger.d('AppName is updated: ' + appName); res.send(new BaseApi(ApiStatusCodes.STATUS_OK, 'Updated App Definition Saved')); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); module.exports = router; //# sourceMappingURL=AppDefinitionRouter.js.map \ No newline at end of file diff --git a/app-backend/built/routes/AppDefinitionRouter.js.map b/app-backend/built/routes/AppDefinitionRouter.js.map index 26ccf2b..d10c45f 100644 --- a/app-backend/built/routes/AppDefinitionRouter.js.map +++ b/app-backend/built/routes/AppDefinitionRouter.js.map @@ -1 +1 @@ -{"version":3,"file":"AppDefinitionRouter.js","sourceRoot":"","sources":["../../src/routes/AppDefinitionRouter.ts"],"names":[],"mappings":";AAAA,mCAAmC;AACnC,yBAAyB;AACzB,0CAA0C;AAC1C,wDAAwD;AACxD,0CAA0C;AAM1C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,6BAA6B;AAC7B,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IAC/C,EAAE,CAAC,OAAO,CAAC,SAAS,GAAG,2BAA2B,EAAE,UAAS,GAAG,EAAE,KAAK;QACnE,IAAI,GAAG,EAAE;YACL,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;YACb,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;YACnB,OAAM;SACT;QAED,IAAI,GAAG,GAAG,EAAE,CAAA;QAEZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC1B,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;aACvD;SACJ;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CACrB,cAAc,CAAC,SAAS,EACxB,gCAAgC,CACnC,CAAA;QACD,OAAO,CAAC,IAAI,GAAG,GAAG,CAAA;QAElB,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACrB,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA;AAEF,gBAAgB;AAChB,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IAC/C,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAA;IACzC,IAAI,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;IAEnD,OAAO,CAAC,OAAO,EAAE;SACZ,IAAI,CAAC;QACF,IAAI,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,IAAI,GAAG,CAAC,CAAA;QAC9D,OAAO,cAAc,CAAC,eAAe,CAAC,eAAe,CAAC,CAAA;IAC1D,CAAC,CAAC;SACD,IAAI,CAAC,UAAS,YAAY;QACvB,IAAI,OAAO,GAAG,IAAI,OAAO,CACrB,cAAc,CAAC,SAAS,EACxB,0BAA0B,CAC7B,CAAA;QACD,OAAO,CAAC,IAAI,GAAG,EAAE,CAAA;QACjB,OAAO,CAAC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAExC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACrB,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAK;QACjB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YAC/D,OAAM;SACT;QAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,gBAAgB;AAChB,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IAChD,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAA;IACzC,IAAI,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;IACnD,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;IAEtC,OAAO,CAAC,OAAO,EAAE;SACZ,IAAI,CAAC;QACF,OAAO,cAAc,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;IAChD,CAAC,CAAC;SACD,IAAI,CAAC;QACF,IAAI,OAAO,GAAG,IAAI,OAAO,CACrB,cAAc,CAAC,SAAS,EACxB,iBAAiB,CACpB,CAAA;QACD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACrB,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAK;QACjB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YAC/D,OAAM;SACT;QAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,0BAA0B;AAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IACnC,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAsB,CAAA;IACtD,IAAI,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;IACnD,IAAI,SAAS,GAAc,EAAE,CAAA;IAE7B,SAAS;SACJ,gBAAgB,EAAE;SAClB,iBAAiB,EAAE;SACnB,IAAI,CAAC,UAAS,IAAI;QACf,IAAI,QAAQ,GAAoB,EAAE,CAAA;QAElC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAS,GAAG,EAAE,KAAK;YACzC,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;YACnB,GAAG,CAAC,OAAO,GAAG,GAAG,CAAA;YACjB,GAAG,CAAC,aAAa,GAAG,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;YACrD,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC,cAAc,IAAI,SAAS,CAAA;YACpD,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACvB,CAAC,CAAC,CAAA;QAEF,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAChC,CAAC,CAAC;SACD,IAAI,CAAC;QACF,OAAO,SAAS,CAAC,wBAAwB,EAAE,CAAA;IAC/C,CAAC,CAAC;SACD,IAAI,CAAC,UAAS,kBAAkB;QAC7B,IAAI,OAAO,GAAG,IAAI,OAAO,CACrB,cAAc,CAAC,SAAS,EACxB,gCAAgC,CACnC,CAAA;QACD,OAAO,CAAC,IAAI,GAAG,SAAS,CAAA;QACxB,YAAY;QACZ,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,aAAa,EAAE,CAAA;QAC9C,YAAY;QACZ,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;QAE/C,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACrB,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAK;QACjB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YAC/D,OAAM;SACT;QAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IACxD,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAA;IACzC,IAAI,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;IAEnD,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAA;IAEhC,OAAO,OAAO,CAAC,OAAO,EAAE;SACnB,IAAI,CAAC;QACF,OAAO,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IAClD,CAAC,CAAC;SACD,IAAI,CAAC;QACF,IAAI,GAAG,GAAG,8BAA8B,GAAG,OAAO,CAAA;QAClD,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACb,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAA;IACxD,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAK;QACjB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YAC/D,OAAM;SACT;QAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IACjD,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAA;IACzC,IAAI,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;IAEnD,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAA;IAC9B,IAAI,YAAY,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;IAE9D,0DAA0D;IAC1D,4CAA4C;IAE5C,OAAO,OAAO,CAAC,OAAO,EAAE;SACnB,IAAI,CAAC;QACF,OAAO,cAAc,CAAC,eAAe,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IAChE,CAAC,CAAC;SACD,IAAI,CAAC;QACF,IAAI,GAAG,GACH,gCAAgC;YAChC,OAAO;YACP,MAAM;YACN,YAAY,CAAA;QAChB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACb,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAA;IACxD,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAK;QACjB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YAC/D,OAAM;SACT;QAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IACvD,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAA;IACzC,IAAI,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;IAEnD,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAA;IAC9B,IAAI,YAAY,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;IAE9D,OAAO,OAAO,CAAC,OAAO,EAAE;SACnB,IAAI,CAAC;QACF,OAAO,cAAc,CAAC,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IACnE,CAAC,CAAC;SACD,IAAI,CAAC;QACF,IAAI,GAAG,GACH,gCAAgC;YAChC,OAAO;YACP,MAAM;YACN,YAAY,CAAA;QAChB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACb,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAA;IACxD,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAK;QACjB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YAC/D,OAAM;SACT;QAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IAC1D,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAA;IACzC,IAAI,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;IAEnD,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAA;IAC9B,IAAI,YAAY,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;IAE9D,2EAA2E;IAC3E,4DAA4D;IAE5D,OAAO,OAAO,CAAC,OAAO,EAAE;SACnB,IAAI,CAAC;QACF,OAAO,cAAc,CAAC,qBAAqB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IACtE,CAAC,CAAC;SACD,IAAI,CAAC;QACF,IAAI,GAAG,GACH,oCAAoC;YACpC,OAAO;YACP,MAAM;YACN,YAAY,CAAA;QAChB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACb,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAA;IACxD,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAK;QACjB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YAC/D,OAAM;SACT;QAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IAC7C,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAsB,CAAA;IACtD,IAAI,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAgC,CAAA;IAErE,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAiB,CAAA;IACxC,IAAI,iBAAiB,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAA;IAEpD,IAAI,UAAU,GAAG,KAAK,CAAA;IAEtB,MAAM,CAAC,CAAC,CAAC,2BAA2B,GAAG,OAAO,CAAC,CAAA;IAE/C,SAAS;SACJ,gBAAgB,EAAE;SAClB,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,CAAC;SACjD,IAAI,CAAC;QACF,UAAU,GAAG,IAAI,CAAA;IACrB,CAAC,CAAC;SACD,IAAI,CAAC;QACF,OAAO,cAAc,CAAC,WAAW,CAC7B,OAAO,EACP,SAAS,CAAC,0BAA0B,EACpC,EAAE,CACL,CAAA;IACL,CAAC,CAAC;SACD,IAAI,CAAC,UAAS,OAAe;QAC1B,OAAO,cAAc,CAAC,6BAA6B,CAC/C,OAAO,EACP,OAAO,CACV,CAAA;IACL,CAAC,CAAC;SACD,IAAI,CAAC;QACF,MAAM,CAAC,CAAC,CAAC,oBAAoB,GAAG,OAAO,CAAC,CAAA;QACxC,GAAG,CAAC,IAAI,CACJ,IAAI,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAChE,CAAA;IACL,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAmB;QAC/B,SAAS,sBAAsB;YAC3B,OAAO,IAAI,OAAO,CAAO,UAAS,OAAO,EAAE,MAAM;gBAC7C,MAAM,CAAC,KAAK,CAAC,CAAA;YACjB,CAAC,CAAC,CAAA;QACN,CAAC;QAED,IAAI,UAAU,EAAE;YACZ,OAAO,SAAS;iBACX,gBAAgB,EAAE;iBAClB,mBAAmB,CAAC,OAAO,CAAC;iBAC5B,IAAI,CAAC;gBACF,OAAO,sBAAsB,EAAE,CAAA;YACnC,CAAC,CAAC,CAAA;SACT;aAAM;YACH,OAAO,sBAAsB,EAAE,CAAA;SAClC;IACL,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAmB;QAC/B,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YAC/D,OAAM;SACT;QAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IAC3C,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAA;IACzC,IAAI,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;IAEnD,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAA;IAE9B,MAAM,CAAC,CAAC,CAAC,wBAAwB,GAAG,OAAO,CAAC,CAAA;IAE5C,OAAO,CAAC,OAAO,EAAE;SACZ,IAAI,CAAC;QACF,OAAO,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC,CAAC;SACD,IAAI,CAAC;QACF,MAAM,CAAC,CAAC,CAAC,sBAAsB,GAAG,OAAO,CAAC,CAAA;QAC1C,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAA;IACrE,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAK;QACjB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YAC/D,OAAM;SACT;QAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IAC3C,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAA;IACzC,IAAI,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAgC,CAAA;IAErE,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAA;IAC9B,IAAI,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAA;IAC5B,IAAI,iBAAiB,GAAG,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAA;IAClD,IAAI,iBAAiB,GAAG,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAA;IAClD,IAAI,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAA;IAClC,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAA;IAChC,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAA;IACpC,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAA;IACpC,IAAI,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAA;IAChC,IAAI,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,GAAG,CAAA;IACjD,IAAI,iBAAiB,GAAG,GAAG,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAA;IAExD,IAAI,QAAQ,EAAE;QACV,IAAI,QAAQ,CAAC,IAAI,EAAE;YACf,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;SACvC;QACD,IAAI,QAAQ,CAAC,IAAI,EAAE;YACf,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;SACvC;QACD,IAAI,QAAQ,CAAC,MAAM,EAAE;YACjB,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;SAC3C;KACJ;IAED,MAAM,CAAC,CAAC,CAAC,wBAAwB,GAAG,OAAO,CAAC,CAAA;IAE5C,cAAc;SACT,mBAAmB,CAChB,OAAO,EACP,MAAM,CAAC,aAAa,CAAC,EACrB,OAAO,EACP,OAAO,EACP,MAAM,EACN,iBAAiB,EACjB,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,iBAAiB,EACjB,iBAAiB,CACpB;SACA,IAAI,CAAC;QACF,MAAM,CAAC,CAAC,CAAC,sBAAsB,GAAG,OAAO,CAAC,CAAA;QAC1C,GAAG,CAAC,IAAI,CACJ,IAAI,OAAO,CACP,cAAc,CAAC,SAAS,EACxB,8BAA8B,CACjC,CACJ,CAAA;IACL,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAmB;QAC/B,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEf,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YAC/D,OAAM;SACT;QAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,iBAAS,MAAM,CAAA"} \ No newline at end of file +{"version":3,"file":"AppDefinitionRouter.js","sourceRoot":"","sources":["../../src/routes/AppDefinitionRouter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/routes/LoginRouter.js b/app-backend/built/routes/LoginRouter.js index e655355..23d8377 100644 --- a/app-backend/built/routes/LoginRouter.js +++ b/app-backend/built/routes/LoginRouter.js @@ -4,7 +4,6 @@ const TokenApi = require("../api/TokenApi"); const BaseApi = require("../api/BaseApi"); const Authenticator = require("../user/Authenticator"); const ApiStatusCodes = require("../api/ApiStatusCodes"); -const Logger = require("../utils/Logger"); const CaptainConstants = require("../utils/CaptainConstants"); const router = express.Router(); router.post('/', function (req, res, next) { @@ -25,15 +24,7 @@ router.post('/', function (req, res, next) { res.cookie(CaptainConstants.header.cookieAuth, cookieAuth); res.send(new TokenApi(authToken)); }) - .catch(function (error) { - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - } - else { - Logger.e(error); - res.sendStatus(500); - } - }); + .catch(ApiStatusCodes.createCatcher(res)); }); module.exports = router; //# sourceMappingURL=LoginRouter.js.map \ No newline at end of file diff --git a/app-backend/built/routes/LoginRouter.js.map b/app-backend/built/routes/LoginRouter.js.map index b8aa1a4..8931c6a 100644 --- a/app-backend/built/routes/LoginRouter.js.map +++ b/app-backend/built/routes/LoginRouter.js.map @@ -1 +1 @@ -{"version":3,"file":"LoginRouter.js","sourceRoot":"","sources":["../../src/routes/LoginRouter.ts"],"names":[],"mappings":";AAAA,mCAAmC;AACnC,4CAA4C;AAC5C,0CAA0C;AAC1C,uDAAuD;AACvD,wDAAwD;AACxD,0CAA0C;AAC1C,8DAA8D;AAE9D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IACpC,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;IAEtC,IAAI,CAAC,QAAQ,EAAE;QACX,IAAI,QAAQ,GAAG,IAAI,OAAO,CACtB,cAAc,CAAC,oBAAoB,EACnC,oBAAoB,CACvB,CAAA;QACD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAClB,OAAM;KACT;IAED,IAAI,SAAiB,CAAA;IAErB,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;SAClC,YAAY,CAAC,QAAQ,CAAC;SACtB,IAAI,CAAC,UAAS,KAAK;QAChB,SAAS,GAAG,KAAK,CAAA;QACjB,OAAO,aAAa,CAAC,GAAG,CACpB,GAAG,CAAC,MAAM,CAAC,SAAS,CACvB,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC,CAAC;SACD,IAAI,CAAC,UAAS,UAAU;QACrB,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;QAC1D,GAAG,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAA;IACrC,CAAC,CAAC;SACD,KAAK,CAAC,UAAS,KAAK;QACjB,IAAI,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;SAClE;aAAM;YACH,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YACf,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;SACtB;IACL,CAAC,CAAC,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,iBAAS,MAAM,CAAA"} \ No newline at end of file +{"version":3,"file":"LoginRouter.js","sourceRoot":"","sources":["../../src/routes/LoginRouter.ts"],"names":[],"mappings":";AAAA,mCAAmC;AACnC,4CAA4C;AAC5C,0CAA0C;AAC1C,uDAAuD;AACvD,wDAAwD;AAExD,8DAA8D;AAE9D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAS,GAAG,EAAE,GAAG,EAAE,IAAI;IACpC,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;IAEtC,IAAI,CAAC,QAAQ,EAAE;QACX,IAAI,QAAQ,GAAG,IAAI,OAAO,CACtB,cAAc,CAAC,oBAAoB,EACnC,oBAAoB,CACvB,CAAA;QACD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAClB,OAAM;KACT;IAED,IAAI,SAAiB,CAAA;IAErB,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;SAClC,YAAY,CAAC,QAAQ,CAAC;SACtB,IAAI,CAAC,UAAS,KAAK;QAChB,SAAS,GAAG,KAAK,CAAA;QACjB,OAAO,aAAa,CAAC,GAAG,CACpB,GAAG,CAAC,MAAM,CAAC,SAAS,CACvB,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC,CAAC;SACD,IAAI,CAAC,UAAS,UAAU;QACrB,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;QAC1D,GAAG,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAA;IACrC,CAAC,CAAC;SACD,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA;AAEF,iBAAS,MAAM,CAAA"} \ No newline at end of file diff --git a/app-backend/built/routes/RegistriesRouter.js b/app-backend/built/routes/RegistriesRouter.js index 50f87eb..15f99cb 100644 --- a/app-backend/built/routes/RegistriesRouter.js +++ b/app-backend/built/routes/RegistriesRouter.js @@ -20,14 +20,7 @@ router.post('/insert/', function (req, res, next) { Logger.d(msg); res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.get('/all/', function (req, res, next) { const captainManager = CaptainManager.get(); @@ -47,14 +40,7 @@ router.get('/all/', function (req, res, next) { baseApi.data.defaultPushRegistryId = defaultPush; res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/delete/', function (req, res, next) { let registryId = req.body.registryId + ''; @@ -67,14 +53,7 @@ router.post('/delete/', function (req, res, next) { let baseApi = new BaseApi(ApiStatusCodes.STATUS_OK, 'Registry deleted'); res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/setpush/', function (req, res, next) { let registryId = req.body.registryId + ''; @@ -87,14 +66,7 @@ router.post('/setpush/', function (req, res, next) { let baseApi = new BaseApi(ApiStatusCodes.STATUS_OK, 'Push Registry changed'); res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); module.exports = router; //# sourceMappingURL=RegistriesRouter.js.map \ No newline at end of file diff --git a/app-backend/built/routes/RegistriesRouter.js.map b/app-backend/built/routes/RegistriesRouter.js.map index ef70e5b..beaee86 100644 --- a/app-backend/built/routes/RegistriesRouter.js.map +++ b/app-backend/built/routes/RegistriesRouter.js.map @@ -1 +1 @@ -{"version":3,"file":"RegistriesRouter.js","sourceRoot":"","sources":["../../src/routes/RegistriesRouter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"RegistriesRouter.js","sourceRoot":"","sources":["../../src/routes/RegistriesRouter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/routes/SystemRouter.js b/app-backend/built/routes/SystemRouter.js index f028563..acc55c9 100644 --- a/app-backend/built/routes/SystemRouter.js +++ b/app-backend/built/routes/SystemRouter.js @@ -31,15 +31,7 @@ router.post('/changerootdomain/', function (req, res, next) { .then(function () { res.send(new BaseApi(ApiStatusCodes.STATUS_OK, 'Root domain changed.')); }) - .catch(function (error) { - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - } - else { - Logger.e(error); - res.sendStatus(500); - } - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/enablessl/', function (req, res, next) { const emailAddress = req.body.emailAddress || ''; @@ -59,15 +51,7 @@ router.post('/enablessl/', function (req, res, next) { .then(function () { res.send(new BaseApi(ApiStatusCodes.STATUS_OK, 'Root SSL Enabled.')); }) - .catch(function (error) { - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - } - else { - Logger.e(error); // - res.sendStatus(500); // - } - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/forcessl/', function (req, res, next) { let isEnabled = !!req.body.isEnabled; @@ -77,15 +61,7 @@ router.post('/forcessl/', function (req, res, next) { res.send(new BaseApi(ApiStatusCodes.STATUS_OK, 'Non-SSL traffic is now ' + (isEnabled ? 'rejected.' : 'allowed.'))); }) - .catch(function (error) { - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - } - else { - Logger.e(error); - res.sendStatus(500); - } - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/enableregistryssl/', function (req, res, next) { return Promise.resolve() @@ -99,14 +75,7 @@ router.post('/enableregistryssl/', function (req, res, next) { Logger.d(msg); res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/enableregistry/', function (req, res, next) { const LOCAL = 'local'; @@ -159,14 +128,7 @@ router.post('/enableregistry/', function (req, res, next) { .then(function () { return captainManager.resetSelf(); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.get('/info/', function (req, res, next) { const dataStore = res.locals.user.dataStore; @@ -192,14 +154,7 @@ router.get('/info/', function (req, res, next) { baseApi.data = data; res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.get('/loadbalancerinfo/', function (req, res, next) { const dataStore = res.locals.user.dataStore; @@ -214,14 +169,7 @@ router.get('/loadbalancerinfo/', function (req, res, next) { baseApi.data = data; res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.get('/versionInfo/', function (req, res, next) { return Promise.resolve() @@ -264,14 +212,7 @@ router.get('/versionInfo/', function (req, res, next) { }; res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/versionInfo/', function (req, res, next) { let latestVersion = req.body.latestVersion; @@ -283,14 +224,7 @@ router.post('/versionInfo/', function (req, res, next) { let baseApi = new BaseApi(ApiStatusCodes.STATUS_OK, 'Captain update process has started...'); res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.get('/netdata/', function (req, res, next) { const dataStore = res.locals.user.dataStore; @@ -308,14 +242,7 @@ router.get('/netdata/', function (req, res, next) { baseApi.data = data; res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/netdata/', function (req, res, next) { let netDataInfo = req.body.netDataInfo; @@ -329,14 +256,7 @@ router.post('/netdata/', function (req, res, next) { let baseApi = new BaseApi(ApiStatusCodes.STATUS_OK, 'Netdata info is updated'); res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.get('/nginxconfig/', function (req, res, next) { return Promise.resolve() @@ -348,14 +268,7 @@ router.get('/nginxconfig/', function (req, res, next) { baseApi.data = data; res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/nginxconfig/', function (req, res, next) { let baseConfigCustomValue = req.body.baseConfig.customValue; @@ -368,14 +281,7 @@ router.post('/nginxconfig/', function (req, res, next) { let baseApi = new BaseApi(ApiStatusCodes.STATUS_OK, 'Nginx config is updated'); res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.get('/nodes/', function (req, res, next) { return Promise.resolve() @@ -387,14 +293,7 @@ router.get('/nodes/', function (req, res, next) { baseApi.data = data; res.send(baseApi); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); router.post('/nodes/', function (req, res, next) { const MANAGER = 'manager'; @@ -435,14 +334,7 @@ router.post('/nodes/', function (req, res, next) { Logger.d(msg); res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)); }) - .catch(function (error) { - Logger.e(error); - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - return; - } - res.sendStatus(500); - }); + .catch(ApiStatusCodes.createCatcher(res)); }); module.exports = router; //# sourceMappingURL=SystemRouter.js.map \ No newline at end of file diff --git a/app-backend/built/routes/SystemRouter.js.map b/app-backend/built/routes/SystemRouter.js.map index 7af4fbd..216290c 100644 --- a/app-backend/built/routes/SystemRouter.js.map +++ b/app-backend/built/routes/SystemRouter.js.map @@ -1 +1 @@ -{"version":3,"file":"SystemRouter.js","sourceRoot":"","sources":["../../src/routes/SystemRouter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"SystemRouter.js","sourceRoot":"","sources":["../../src/routes/SystemRouter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/routes/UserRouter.js b/app-backend/built/routes/UserRouter.js index 51f4382..08f71b4 100644 --- a/app-backend/built/routes/UserRouter.js +++ b/app-backend/built/routes/UserRouter.js @@ -8,7 +8,6 @@ const WebhooksRouter = require("./WebhooksRouter"); const AppDefinitionRouter = require("./AppDefinitionRouter"); const AppDataRouter = require("./AppDataRouter"); const Authenticator = require("../user/Authenticator"); -const Logger = require("../utils/Logger"); const onFinished = require("on-finished"); const router = express.Router(); const threadLockNamespace = {}; @@ -63,15 +62,7 @@ router.post('/changepassword/', function (req, res, next) { .then(function () { res.send(new BaseApi(ApiStatusCodes.STATUS_OK, 'Password changed.')); }) - .catch(function (error) { - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)); - } - else { - Logger.e(error); - res.sendStatus(500); - } - }); + .catch(ApiStatusCodes.createCatcher(res)); }); // semi-secured end points: router.use('/webhooks/', WebhooksRouter); diff --git a/app-backend/built/routes/UserRouter.js.map b/app-backend/built/routes/UserRouter.js.map index c6e5ff7..ee9566f 100644 --- a/app-backend/built/routes/UserRouter.js.map +++ b/app-backend/built/routes/UserRouter.js.map @@ -1 +1 @@ -{"version":3,"file":"UserRouter.js","sourceRoot":"","sources":["../../src/routes/UserRouter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"UserRouter.js","sourceRoot":"","sources":["../../src/routes/UserRouter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/utils/Logger.js b/app-backend/built/utils/Logger.js index bb3b08f..d883d28 100644 --- a/app-backend/built/utils/Logger.js +++ b/app-backend/built/utils/Logger.js @@ -15,21 +15,22 @@ function getTime() { moment().format('MMMM Do YYYY, h:mm:ss.SSS a ') + '\x1b[0m'); } -module.exports = { - d: function (msg) { +class Logger { + static d(msg) { console.log(getTime() + msg + ''); - }, - w: function (msg) { + } + static w(msg) { console.log(getTime() + msg + ''); - }, - dev: function (msg) { + } + static dev(msg) { if (CaptainConstants.isDebug) { console.log(getTime() + '########### ' + msg + ''); } - }, - e: function (msgOrError) { + } + static e(msgOrError) { let err = errorize(msgOrError); console.error(getTime() + err + '\n' + err.stack); - }, -}; + } +} +module.exports = Logger; //# sourceMappingURL=Logger.js.map \ No newline at end of file diff --git a/app-backend/built/utils/Logger.js.map b/app-backend/built/utils/Logger.js.map index 9262aca..e6f8cf1 100644 --- a/app-backend/built/utils/Logger.js.map +++ b/app-backend/built/utils/Logger.js.map @@ -1 +1 @@ -{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/utils/Logger.ts"],"names":[],"mappings":";AAEA;;GAEG;AACH,MAAM,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACtD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEhC,SAAS,QAAQ,CAAC,KAAe;IAC7B,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE;QAC3B,OAAO,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;KAC3D;IAED,OAAO,KAAK,CAAA;AAChB,CAAC;AAED,SAAS,OAAO;IACZ,OAAO,CACH,UAAU;QACV,MAAM,EAAE,CAAC,MAAM,CAAC,iCAAiC,CAAC;QAClD,SAAS,CACZ,CAAA;AACL,CAAC;AAED,iBAAS;IACL,CAAC,EAAE,UAAS,GAAW;QACnB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,CAAA;IACrC,CAAC;IAED,CAAC,EAAE,UAAS,GAAW;QACnB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,CAAA;IACrC,CAAC;IAED,GAAG,EAAE,UAAS,GAAW;QACrB,IAAI,gBAAgB,CAAC,OAAO,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,cAAc,GAAG,GAAG,GAAG,EAAE,CAAC,CAAA;SACrD;IACL,CAAC;IAED,CAAC,EAAE,UAAS,UAAoB;QAC5B,IAAI,GAAG,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAA;QAC9B,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;IACrD,CAAC;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/utils/Logger.ts"],"names":[],"mappings":";AAEA;;GAEG;AACH,MAAM,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACtD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEhC,SAAS,QAAQ,CAAC,KAAe;IAC7B,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE;QAC3B,OAAO,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;KAC3D;IAED,OAAO,KAAK,CAAA;AAChB,CAAC;AAED,SAAS,OAAO;IACZ,OAAO,CACH,UAAU;QACV,MAAM,EAAE,CAAC,MAAM,CAAC,iCAAiC,CAAC;QAClD,SAAS,CACZ,CAAA;AACL,CAAC;AAED,MAAM,MAAM;IACR,MAAM,CAAC,CAAC,CAAC,GAAW;QAChB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,CAAA;IACrC,CAAC;IAED,MAAM,CAAC,CAAC,CAAC,GAAW;QAChB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,CAAA;IACrC,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,GAAW;QAClB,IAAI,gBAAgB,CAAC,OAAO,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,cAAc,GAAG,GAAG,GAAG,EAAE,CAAC,CAAA;SACrD;IACL,CAAC;IAED,MAAM,CAAC,CAAC,CAAC,UAAoB;QACzB,IAAI,GAAG,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAA;QAC9B,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;IACrD,CAAC;CACJ;AACD,iBAAS,MAAM,CAAA"} \ No newline at end of file diff --git a/app-backend/src/api/ApiStatusCodes.ts b/app-backend/src/api/ApiStatusCodes.ts index 68233a3..e360165 100644 --- a/app-backend/src/api/ApiStatusCodes.ts +++ b/app-backend/src/api/ApiStatusCodes.ts @@ -1,10 +1,26 @@ import { CaptainError } from './CaptainError' +import { Response } from 'express' +import BaseApi = require('./BaseApi') +import Logger = require('../utils/Logger') let apiStatusCode = { createError: function(code: number, message: string) { return new CaptainError(code, message || 'NONE') }, + createCatcher: function(res: Response) { + return function(error: CaptainError | any) { + Logger.e(error) + + if (error && error.captainErrorType) { + res.send(new BaseApi(error.captainErrorType, error.apiMessage)) + return + } + + res.sendStatus(500) + } + }, + STATUS_OK: 100, STATUS_OK_DEPLOY_STARTED: 101, diff --git a/app-backend/src/api/BaseApi.ts b/app-backend/src/api/BaseApi.ts index a17b009..59507e9 100644 --- a/app-backend/src/api/BaseApi.ts +++ b/app-backend/src/api/BaseApi.ts @@ -1,5 +1,3 @@ -import ApiStatusCode = require('./ApiStatusCodes') - class BaseApi { public data: any diff --git a/app-backend/src/routes/AppDataRouter.ts b/app-backend/src/routes/AppDataRouter.ts index 56530c9..8088057 100644 --- a/app-backend/src/routes/AppDataRouter.ts +++ b/app-backend/src/routes/AppDataRouter.ts @@ -29,16 +29,7 @@ router.get('/:appName/', function(req, res, next) { baseApi.data = data res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/:appName/', function(req, res, next) { @@ -52,16 +43,7 @@ router.post('/:appName/', function(req, res, next) { // nothing to do with app, just to make sure that it exists! next() }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/:appName/', upload.single('sourceFile'), function( diff --git a/app-backend/src/routes/AppDefinitionRouter.ts b/app-backend/src/routes/AppDefinitionRouter.ts index 749d5b0..d362533 100644 --- a/app-backend/src/routes/AppDefinitionRouter.ts +++ b/app-backend/src/routes/AppDefinitionRouter.ts @@ -57,16 +57,7 @@ router.get('/unusedImages', function(req, res, next) { res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) // unused iamges @@ -86,16 +77,7 @@ router.post('/deleteImages', function(req, res, next) { ) res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) // Get All App Definitions @@ -136,16 +118,7 @@ router.get('/', function(req, res, next) { res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/enablebasedomainssl/', function(req, res, next) { @@ -163,16 +136,7 @@ router.post('/enablebasedomainssl/', function(req, res, next) { Logger.d(msg) res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/customdomain/', function(req, res, next) { @@ -198,16 +162,7 @@ router.post('/customdomain/', function(req, res, next) { Logger.d(msg) res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/removecustomdomain/', function(req, res, next) { @@ -230,16 +185,7 @@ router.post('/removecustomdomain/', function(req, res, next) { Logger.d(msg) res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/enablecustomdomainssl/', function(req, res, next) { @@ -265,16 +211,7 @@ router.post('/enablecustomdomainssl/', function(req, res, next) { Logger.d(msg) res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/register/', function(req, res, next) { @@ -331,16 +268,7 @@ router.post('/register/', function(req, res, next) { return createRejectionPromise() } }) - .catch(function(error: CaptainError) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/delete/', function(req, res, next) { @@ -359,16 +287,7 @@ router.post('/delete/', function(req, res, next) { Logger.d('AppName is deleted: ' + appName) res.send(new BaseApi(ApiStatusCodes.STATUS_OK, 'App is deleted')) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/update/', function(req, res, next) { @@ -424,16 +343,7 @@ router.post('/update/', function(req, res, next) { ) ) }) - .catch(function(error: CaptainError) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) export = router diff --git a/app-backend/src/routes/LoginRouter.ts b/app-backend/src/routes/LoginRouter.ts index 293bba1..f13430e 100644 --- a/app-backend/src/routes/LoginRouter.ts +++ b/app-backend/src/routes/LoginRouter.ts @@ -34,14 +34,7 @@ router.post('/', function(req, res, next) { res.cookie(CaptainConstants.header.cookieAuth, cookieAuth) res.send(new TokenApi(authToken)) }) - .catch(function(error) { - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - } else { - Logger.e(error) - res.sendStatus(500) - } - }) + .catch(ApiStatusCodes.createCatcher(res)) }) export = router diff --git a/app-backend/src/routes/RegistriesRouter.ts b/app-backend/src/routes/RegistriesRouter.ts index d0c80ac..f498ba5 100644 --- a/app-backend/src/routes/RegistriesRouter.ts +++ b/app-backend/src/routes/RegistriesRouter.ts @@ -30,16 +30,7 @@ router.post('/insert/', function(req, res, next) { Logger.d(msg) res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.get('/all/', function(req, res, next) { @@ -64,16 +55,7 @@ router.get('/all/', function(req, res, next) { baseApi.data.defaultPushRegistryId = defaultPush res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/delete/', function(req, res, next) { @@ -91,16 +73,7 @@ router.post('/delete/', function(req, res, next) { ) res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/setpush/', function(req, res, next) { @@ -118,16 +91,7 @@ router.post('/setpush/', function(req, res, next) { ) res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) export = router diff --git a/app-backend/src/routes/SystemRouter.ts b/app-backend/src/routes/SystemRouter.ts index 014c003..773cdbc 100644 --- a/app-backend/src/routes/SystemRouter.ts +++ b/app-backend/src/routes/SystemRouter.ts @@ -43,14 +43,7 @@ router.post('/changerootdomain/', function(req, res, next) { new BaseApi(ApiStatusCodes.STATUS_OK, 'Root domain changed.') ) }) - .catch(function(error) { - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - } else { - Logger.e(error) - res.sendStatus(500) - } - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/enablessl/', function(req, res, next) { @@ -80,14 +73,7 @@ router.post('/enablessl/', function(req, res, next) { .then(function() { res.send(new BaseApi(ApiStatusCodes.STATUS_OK, 'Root SSL Enabled.')) }) - .catch(function(error) { - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - } else { - Logger.e(error) // - res.sendStatus(500) // - } - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/forcessl/', function(req, res, next) { @@ -104,14 +90,7 @@ router.post('/forcessl/', function(req, res, next) { ) ) }) - .catch(function(error) { - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - } else { - Logger.e(error) - res.sendStatus(500) - } - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/enableregistryssl/', function(req, res, next) { @@ -126,16 +105,7 @@ router.post('/enableregistryssl/', function(req, res, next) { Logger.d(msg) res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/enableregistry/', function(req, res, next) { @@ -195,16 +165,7 @@ router.post('/enableregistry/', function(req, res, next) { .then(function() { return captainManager.resetSelf() }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.get('/info/', function(req, res, next) { @@ -236,16 +197,7 @@ router.get('/info/', function(req, res, next) { baseApi.data = data res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.get('/loadbalancerinfo/', function(req, res, next) { @@ -265,16 +217,7 @@ router.get('/loadbalancerinfo/', function(req, res, next) { baseApi.data = data res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.get('/versionInfo/', function(req, res, next) { @@ -329,16 +272,7 @@ router.get('/versionInfo/', function(req, res, next) { res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/versionInfo/', function(req, res, next) { @@ -355,16 +289,7 @@ router.post('/versionInfo/', function(req, res, next) { ) res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.get('/netdata/', function(req, res, next) { @@ -387,16 +312,7 @@ router.get('/netdata/', function(req, res, next) { baseApi.data = data res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/netdata/', function(req, res, next) { @@ -415,16 +331,7 @@ router.post('/netdata/', function(req, res, next) { ) res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.get('/nginxconfig/', function(req, res, next) { @@ -440,16 +347,7 @@ router.get('/nginxconfig/', function(req, res, next) { baseApi.data = data res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/nginxconfig/', function(req, res, next) { @@ -470,16 +368,7 @@ router.post('/nginxconfig/', function(req, res, next) { ) res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.get('/nodes/', function(req, res, next) { @@ -495,16 +384,7 @@ router.get('/nodes/', function(req, res, next) { baseApi.data = data res.send(baseApi) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) router.post('/nodes/', function(req, res, next) { @@ -570,16 +450,7 @@ router.post('/nodes/', function(req, res, next) { Logger.d(msg) res.send(new BaseApi(ApiStatusCodes.STATUS_OK, msg)) }) - .catch(function(error) { - Logger.e(error) - - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - return - } - - res.sendStatus(500) - }) + .catch(ApiStatusCodes.createCatcher(res)) }) export = router diff --git a/app-backend/src/routes/UserRouter.ts b/app-backend/src/routes/UserRouter.ts index 0fc46d2..1a3dce5 100644 --- a/app-backend/src/routes/UserRouter.ts +++ b/app-backend/src/routes/UserRouter.ts @@ -92,14 +92,7 @@ router.post('/changepassword/', function(req, res, next) { .then(function() { res.send(new BaseApi(ApiStatusCodes.STATUS_OK, 'Password changed.')) }) - .catch(function(error) { - if (error && error.captainErrorType) { - res.send(new BaseApi(error.captainErrorType, error.apiMessage)) - } else { - Logger.e(error) - res.sendStatus(500) - } - }) + .catch(ApiStatusCodes.createCatcher(res)) }) // semi-secured end points: diff --git a/app-backend/src/utils/Logger.ts b/app-backend/src/utils/Logger.ts index a8bd3ef..1d594f4 100644 --- a/app-backend/src/utils/Logger.ts +++ b/app-backend/src/utils/Logger.ts @@ -1,4 +1,4 @@ -import { AnyError } from "../models/OtherTypes"; +import { AnyError } from '../models/OtherTypes' /** * Created by kasra on 27/06/17. @@ -22,23 +22,24 @@ function getTime() { ) } -export = { - d: function(msg: string) { +class Logger { + static d(msg: string) { console.log(getTime() + msg + '') - }, + } - w: function(msg: string) { + static w(msg: string) { console.log(getTime() + msg + '') - }, + } - dev: function(msg: string) { + static dev(msg: string) { if (CaptainConstants.isDebug) { console.log(getTime() + '########### ' + msg + '') } - }, + } - e: function(msgOrError: AnyError) { + static e(msgOrError: AnyError) { let err = errorize(msgOrError) console.error(getTime() + err + '\n' + err.stack) - }, + } } +export = Logger