@budibase/server 2.4.20 → 2.4.21

package/dist/utilities/workerRequests.js

@@ -23,7 +23,7 @@ function request(ctx, request) {
         request.headers = {};
     }
     if (!ctx) {
-        request.headers[backend_core_1.constants.Header.API_KEY] = environment_1.default.INTERNAL_API_KEY;
+        request.headers[backend_core_1.constants.Header.API_KEY] = backend_core_1.env.INTERNAL_API_KEY;
         if (backend_core_1.tenancy.isTenantIdSet()) {
             request.headers[backend_core_1.constants.Header.TENANT_ID] = backend_core_1.tenancy.getTenantId();
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.4.20",
+  "version": "2.4.21",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,12 +43,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.4.20",
-    "@budibase/client": "^2.4.20",
-    "@budibase/pro": "2.4.19",
-    "@budibase/shared-core": "^2.4.20",
-    "@budibase/string-templates": "^2.4.20",
-    "@budibase/types": "^2.4.20",
+    "@budibase/backend-core": "^2.4.21",
+    "@budibase/client": "^2.4.21",
+    "@budibase/pro": "2.4.20",
+    "@budibase/shared-core": "^2.4.21",
+    "@budibase/string-templates": "^2.4.21",
+    "@budibase/types": "^2.4.21",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -175,5 +175,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "4342825b3565e1fb52e5adc19945a051aadafddd"
+  "gitHead": "212c6f1a6d232fd074c11d677ebeb996e4c5c2e6"
 }

package/src/api/index.ts

@@ -29,13 +29,6 @@ router
       br: false,
     })
   )
-  .use(async (ctx, next) => {
-    ctx.config = {
-      jwtSecret: env.JWT_SECRET,
-      useAppRootPath: true,
-    }
-    await next()
-  })
   // re-direct before any middlewares occur
   .redirect("/", "/builder")
   .use(

package/src/environment.ts

@@ -39,7 +39,6 @@ let inThread = false
 const environment = {
   // important - prefer app port to generic port
   PORT: process.env.APP_PORT || process.env.PORT,
-  JWT_SECRET: process.env.JWT_SECRET,
   COUCH_DB_URL: process.env.COUCH_DB_URL,
   MINIO_URL: process.env.MINIO_URL,
   WORKER_URL: process.env.WORKER_URL,
@@ -48,7 +47,6 @@ const environment = {
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
-  INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
   HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
   API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
   GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,

package/src/tests/utilities/TestConfiguration.ts

@@ -205,7 +205,6 @@ class TestConfiguration {
     request.appId = appId
     // fake cookies, we don't need them
     request.cookies = { set: () => {}, get: () => {} }
-    request.config = { jwtSecret: env.JWT_SECRET }
     request.user = { appId, tenantId: this.getTenantId() }
     request.query = {}
     request.request = {
@@ -332,8 +331,8 @@ class TestConfiguration {
         roleId: roleId,
         appId,
       }
-      const authToken = auth.jwt.sign(authObj, env.JWT_SECRET)
-      const appToken = auth.jwt.sign(app, env.JWT_SECRET)
+      const authToken = auth.jwt.sign(authObj, coreEnv.JWT_SECRET)
+      const appToken = auth.jwt.sign(app, coreEnv.JWT_SECRET)
 
       // returning necessary request headers
       await cache.user.invalidateUser(userId)
@@ -361,8 +360,8 @@ class TestConfiguration {
       roleId: roles.BUILTIN_ROLE_IDS.ADMIN,
       appId: this.appId,
     }
-    const authToken = auth.jwt.sign(authObj, env.JWT_SECRET)
-    const appToken = auth.jwt.sign(app, env.JWT_SECRET)
+    const authToken = auth.jwt.sign(authObj, coreEnv.JWT_SECRET)
+    const appToken = auth.jwt.sign(app, coreEnv.JWT_SECRET)
     const headers: any = {
       Accept: "application/json",
       Cookie: [

package/src/utilities/workerRequests.ts

@@ -6,6 +6,7 @@ import {
   constants,
   tenancy,
   logging,
+  env as coreEnv,
 } from "@budibase/backend-core"
 import { updateAppRole } from "./global"
 import { BBContext, User } from "@budibase/types"
@@ -15,7 +16,7 @@ export function request(ctx?: BBContext, request?: any) {
     request.headers = {}
   }
   if (!ctx) {
-    request.headers[constants.Header.API_KEY] = env.INTERNAL_API_KEY
+    request.headers[constants.Header.API_KEY] = coreEnv.INTERNAL_API_KEY
     if (tenancy.isTenantIdSet()) {
       request.headers[constants.Header.TENANT_ID] = tenancy.getTenantId()
     }