lee/caprover
1
0
Fork 0
mirror of https://github.com/caprover/caprover synced 2026-05-06 03:30:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor bug fixes

Browse Source
This commit is contained in:
Kasra Bigdeli
2018-12-05 21:52:19 -08:00
parent d225748113
commit d210656aff
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app-backend/built/app.js
+5 -4
View File
@@ -57,7 +57,7 @@ app.use(function (req, res, next) {
next();
});
if (!CaptainConstants.isDebug) {
app.use(express.static(path.join(__dirname, 'dist-frontend')));
app.use(express.static(path.join(__dirname, '../dist-frontend')));
}
app.use(express.static(path.join(__dirname, 'public')));
app.use(CaptainConstants.healthCheckEndPoint, function (req, res, next) {
@@ -109,7 +109,8 @@ app.use(CaptainConstants.netDataRelativePath, function (req, res, next) {
let API_PREFIX = '/api/';
app.use(API_PREFIX + ':apiVersionFromRequest/', function (req, res, next) {
if (req.params.apiVersionFromRequest !== CaptainConstants.apiVersion) {
res.send(new BaseApi(ApiStatusCodes.STATUS_ERROR_GENERIC, 'This captain instance only accepts API V1.'));
res.send(new BaseApi(ApiStatusCodes.STATUS_ERROR_GENERIC, 'This captain instance only accepts API ' +
CaptainConstants.apiVersion));
return;
}
if (!InjectionExtractor.extractGlobalsFromInjected(res).initialized) {
@@ -127,8 +128,8 @@ app.use(API_PREFIX + CaptainConstants.apiVersion + '/user/', UserRouter);
// catch 404 and forward to error handler
app.use(function (req, res, next) {
res.locals.err = new Error('Not Found');
res.locals.errorStatus = 404;
next(new Error('Not Found'));
res.locals.err.errorStatus = 404;
next(res.locals.err);
});
// error handler
app.use(function (err, req, res, next) {
app-backend/built/app.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
app-backend/src/app.ts
+5 -4
View File
@@ -76,7 +76,7 @@ app.use(function(req, res, next) {
})
if (!CaptainConstants.isDebug) {
app.use(express.static(path.join(__dirname, 'dist-frontend')))
app.use(express.static(path.join(__dirname, '../dist-frontend')))
}
app.use(express.static(path.join(__dirname, 'public')))
@@ -152,7 +152,8 @@ app.use(API_PREFIX + ':apiVersionFromRequest/', function(req, res, next) {
res.send(
new BaseApi(
ApiStatusCodes.STATUS_ERROR_GENERIC,
'This captain instance only accepts API V1.'
'This captain instance only accepts API ' +
CaptainConstants.apiVersion
)
)
return
@@ -181,8 +182,8 @@ app.use(API_PREFIX + CaptainConstants.apiVersion + '/user/', UserRouter)
// catch 404 and forward to error handler
app.use(function(req, res, next) {
res.locals.err = new Error('Not Found')
res.locals.errorStatus = 404
next(new Error('Not Found'))
res.locals.err.errorStatus = 404
next(res.locals.err)
})
// error handler