Minor changes

linlin2018 · Apr 20, 2020 · 5d775ed · 5d775ed
1 parent f283e80
commit 5d775ed
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/etc/schemas/config_schema.json b/etc/schemas/config_schema.json
@@ -144,8 +144,7 @@
                     "minItems": 1,
                     "uniqueItems": true
                 }
-            },
-            "required": ["transport"]
+            }
         }
     },
     "required": ["apiVersion", "spec"]

diff --git a/mod/rest/rest.js b/mod/rest/rest.js
@@ -18,13 +18,17 @@ const FilesUtil = require('@routr/utils/files_util')
 const System = Java.type('java.lang.System')
 const isEmpty = require('@routr/utils/obj_util')
 const config = require('@routr/core/config_util')()
+const defaults = require('@routr/core/config/config_defaults')(
+  new Date().getTime()
+)
 const { Status } = require('@routr/core/status')
 const getJWTToken = require('@routr/rest/jwt_token_generator')
 const resourcesService = require('@routr/rest/resources_service')
 const locationService = require('@routr/rest/location_service')
 const parameterAuthFilter = require('@routr/rest/parameter_auth_filter')
 const basicAuthFilter = require('@routr/rest/basic_auth_filter')
 const moment = require('moment')
+const merge = require('deepmerge')
 
 const LogsHandler = Java.type('io.routr.core.LogsHandler')
 const GRPCClient = Java.type('io.routr.core.GRPCClient')
@@ -165,7 +169,17 @@ class Rest {
         JSON.stringify(CoreUtils.buildResponse(Status.OK, config.system))
       )
 
-      get('/system/config', (req, res) => JSON.stringify(configApi.getConfig()))
+      get('/system/config', (req, res) => {
+        if (req.queryParams('full') === 'true') {
+          const merged = merge(defaults, configApi.getConfig().data)
+          const result = configApi.getConfig()
+          result.data = merged
+          delete result.data.system
+          return JSON.stringify(result)
+        } else {
+          return JSON.stringify(configApi.getConfig())
+        }
+      })
 
       put('/system/config', (req, res) => {
         const c = JSON.parse(req.body())