aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers/api
diff options
context:
space:
mode:
Diffstat (limited to 'server/controllers/api')
-rw-r--r--server/controllers/api/config.ts5
1 files changed, 5 insertions, 0 deletions
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts
index 95549b724..633cf5e34 100644
--- a/server/controllers/api/config.ts
+++ b/server/controllers/api/config.ts
@@ -10,6 +10,7 @@ import { customConfigUpdateValidator } from '../../middlewares/validators/config
10import { ClientHtml } from '../../lib/client-html' 10import { ClientHtml } from '../../lib/client-html'
11import { auditLoggerFactory, CustomConfigAuditView, getAuditIdFromRes } from '../../helpers/audit-logger' 11import { auditLoggerFactory, CustomConfigAuditView, getAuditIdFromRes } from '../../helpers/audit-logger'
12import { remove, writeJSON } from 'fs-extra' 12import { remove, writeJSON } from 'fs-extra'
13import { version } from '../../tools/cli'
13 14
14const packageJSON = require('../../../../package.json') 15const packageJSON = require('../../../../package.json')
15const configRouter = express.Router() 16const configRouter = express.Router()
@@ -38,9 +39,12 @@ configRouter.delete('/custom',
38 asyncMiddleware(deleteCustomConfig) 39 asyncMiddleware(deleteCustomConfig)
39) 40)
40 41
42let serverCommit: string
41async function getConfig (req: express.Request, res: express.Response, next: express.NextFunction) { 43async function getConfig (req: express.Request, res: express.Response, next: express.NextFunction) {
42 const allowed = await isSignupAllowed() 44 const allowed = await isSignupAllowed()
43 const allowedForCurrentIP = isSignupAllowedForCurrentIP(req.ip) 45 const allowedForCurrentIP = isSignupAllowedForCurrentIP(req.ip)
46 serverCommit = (serverCommit) ? serverCommit : version()
47 if (serverCommit === packageJSON.version) serverCommit = ''
44 48
45 const enabledResolutions = Object.keys(CONFIG.TRANSCODING.RESOLUTIONS) 49 const enabledResolutions = Object.keys(CONFIG.TRANSCODING.RESOLUTIONS)
46 .filter(key => CONFIG.TRANSCODING.ENABLED === CONFIG.TRANSCODING.RESOLUTIONS[key] === true) 50 .filter(key => CONFIG.TRANSCODING.ENABLED === CONFIG.TRANSCODING.RESOLUTIONS[key] === true)
@@ -58,6 +62,7 @@ async function getConfig (req: express.Request, res: express.Response, next: exp
58 } 62 }
59 }, 63 },
60 serverVersion: packageJSON.version, 64 serverVersion: packageJSON.version,
65 serverCommit,
61 signup: { 66 signup: {
62 allowed, 67 allowed,
63 allowedForCurrentIP, 68 allowedForCurrentIP,