Merge pull request caprover#1330 from jonaskuske/patch-1

githubsaturn · web-flow · commit 18b6306006db · 2022-02-08T16:06:47.000-08:00
fix: provide configured captainSubDomain to frontend
diff --git a/src/routes/user/apps/appdefinition/AppDefinitionRouter.ts b/src/routes/user/apps/appdefinition/AppDefinitionRouter.ts
@@ -94,6 +94,7 @@ router.get('/', function (req, res, next) {
             baseApi.data = {
                 appDefinitions: appsArray,
                 rootDomain: dataStore.getRootDomain(),
+                captainSubDomain: CaptainConstants.configs.captainSubDomain,
                 defaultNginxConfig: defaultNginxConfig,
             }
 
diff --git a/src/routes/user/system/SystemRouter.ts b/src/routes/user/system/SystemRouter.ts
@@ -133,6 +133,7 @@ router.get('/info/', function (req, res, next) {
                 rootDomain: dataStore.hasCustomDomain()
                     ? dataStore.getRootDomain()
                     : '',
+                captainSubDomain: CaptainConstants.configs.captainSubDomain,
             }
         })
         .then(function (data) {

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ router.get('/', function (req, res, next) {`
`94`	`94`	`baseApi.data = {`
`95`	`95`	`appDefinitions: appsArray,`
`96`	`96`	`rootDomain: dataStore.getRootDomain(),`
	`97`	`+ captainSubDomain: CaptainConstants.configs.captainSubDomain,`
`97`	`98`	`defaultNginxConfig: defaultNginxConfig,`
`98`	`99`	`}`
`99`	`100`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ router.get('/info/', function (req, res, next) {`
`133`	`133`	`rootDomain: dataStore.hasCustomDomain()`
`134`	`134`	`? dataStore.getRootDomain()`
`135`	`135`	`: '',`
	`136`	`+ captainSubDomain: CaptainConstants.configs.captainSubDomain,`
`136`	`137`	`}`
`137`	`138`	`})`
`138`	`139`	`.then(function (data) {`