@budibase/worker 2.22.4 → 2.22.7

package/__mocks__/node-fetch.ts

@@ -1,5 +1,4 @@
-import fs from "fs"
-
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 module FetchMock {
   const fetch = jest.requireActual("node-fetch")
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.22.4",
+  "version": "2.22.7",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.22.4",
-    "@budibase/pro": "2.22.4",
-    "@budibase/string-templates": "2.22.4",
-    "@budibase/types": "2.22.4",
+    "@budibase/backend-core": "2.22.7",
+    "@budibase/pro": "2.22.7",
+    "@budibase/string-templates": "2.22.7",
+    "@budibase/types": "2.22.7",
     "@koa/router": "8.0.8",
     "@techpass/passport-openidconnect": "0.3.2",
     "@types/global-agent": "2.1.1",
@@ -108,5 +108,5 @@
       }
     }
   },
-  "gitHead": "be7e99f7fdb36262e4a90563edad1ed53ec4e55e"
+  "gitHead": "a3c764383e3f2e3153d5fe6035c610b5f103c4e3"
 }

package/scripts/test.sh

@@ -4,10 +4,10 @@ set -e
 if [[ -n $CI ]]
 then
   # Running in ci, where resources are limited
-  echo "jest --coverage --maxWorkers=2  --forceExit --bail $@"
-  jest --coverage --maxWorkers=2  --forceExit --bail $@
+  echo "jest --coverage --maxWorkers=2 --forceExit --bail $@"
+  jest --coverage --maxWorkers=2 --forceExit --bail $@
 else
   # --maxWorkers performs better in development
-  echo "jest --coverage --maxWorkers=2 --forceExit $@"
-  jest --coverage --maxWorkers=2 --forceExit $@
+  echo "jest --coverage --detectOpenHandles $@"
+  jest --coverage --detectOpenHandles $@
 fi

package/src/api/controllers/global/auth.ts

@@ -225,7 +225,7 @@ export async function oidcCallbackUrl() {
   return ssoCallbackUrl(ConfigType.OIDC)
 }
 
-export const oidcStrategyFactory = async (ctx: any, configId: any) => {
+export const oidcStrategyFactory = async (ctx: any) => {
   const config = await configs.getOIDCConfig()
   if (!config) {
     return ctx.throw(400, "OIDC config not found")
@@ -247,7 +247,7 @@ export const oidcPreAuth = async (ctx: Ctx, next: any) => {
   if (!configId) {
     ctx.throw(400, "OIDC config id is required")
   }
-  const strategy = await oidcStrategyFactory(ctx, configId)
+  const strategy = await oidcStrategyFactory(ctx)
 
   setCookie(ctx, configId, Cookie.OIDC_CONFIG)
 
@@ -268,8 +268,7 @@ export const oidcPreAuth = async (ctx: Ctx, next: any) => {
 }
 
 export const oidcCallback = async (ctx: any, next: any) => {
-  const configId = getCookie(ctx, Cookie.OIDC_CONFIG)
-  const strategy = await oidcStrategyFactory(ctx, configId)
+  const strategy = await oidcStrategyFactory(ctx)
 
   return passport.authenticate(
     strategy,

package/src/api/routes/global/tests/auth.spec.ts

@@ -168,10 +168,7 @@ describe("/api/global/auth", () => {
         let user: User
 
         async function testSSOUser() {
-          const { res } = await config.api.auth.requestPasswordReset(
-            sendMailMock,
-            user.email
-          )
+          await config.api.auth.requestPasswordReset(sendMailMock, user.email)
           expect(sendMailMock).not.toHaveBeenCalled()
         }
 

package/src/api/routes/global/tests/scim.spec.ts

@@ -704,6 +704,7 @@ describe("scim", () => {
           expect(response).toEqual({
             Resources: expect.arrayContaining(
               groups.map(g => {
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 const { members, ...groupData } = g
                 return groupData
               })
@@ -723,6 +724,7 @@ describe("scim", () => {
           expect(response).toEqual({
             Resources: expect.arrayContaining(
               groups.map(g => {
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 const { members, displayName, ...groupData } = g
                 return groupData
               })
@@ -872,6 +874,7 @@ describe("scim", () => {
           qs: "excludedAttributes=members",
         })
 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { members, ...expectedResponse } = group
 
         expect(response).toEqual(expectedResponse)

package/src/features.ts

@@ -1,6 +1,7 @@
 import { features } from "@budibase/backend-core"
 import env from "./environment"
 
+// eslint-disable-next-line no-unused-vars
 enum WorkerFeature {}
 
 const featureList: WorkerFeature[] = features.processFeatureEnvVar(

package/src/migrations/functions/globalInfoSyncUsers.ts

@@ -9,7 +9,7 @@ import { platform } from "@budibase/backend-core"
  * Description:
  * Re-sync the global-db users to the global-info db users
  */
-export const run = async (globalDb: any) => {
+export const run = async () => {
   const users = (await usersSdk.db.allUsers()) as User[]
   const promises = []
   for (let user of users) {

package/src/sdk/auth/tests/auth.spec.ts

@@ -6,6 +6,8 @@ import { TestConfiguration } from "../../../tests"
 describe("auth", () => {
   const config = new TestConfiguration()
 
+  afterAll(config.afterAll)
+
   describe("resetUpdate", () => {
     it("providing a valid code will update the password", async () => {
       await context.doInTenant(structures.tenant.id(), async () => {

package/src/tests/TestConfiguration.ts

@@ -19,7 +19,6 @@ import {
   users,
   context,
   sessions,
-  auth,
   constants,
   env as coreEnv,
   db as dbCore,

package/src/tests/structures/groups.ts

@@ -5,7 +5,7 @@ import { UserGroup as UserGroupType, UserGroupRoles } from "@budibase/types"
 export function UserGroup(): UserGroupType {
   const appsCount = generator.integer({ min: 0, max: 3 })
   const roles = Array.from({ length: appsCount }).reduce(
-    (p: UserGroupRoles, v) => {
+    (p: UserGroupRoles) => {
       return {
         ...p,
         [db.generateAppID()]: generator.pickone(["ADMIN", "POWER", "BASIC"]),

package/src/utilities/templates.ts

@@ -1,12 +1,10 @@
 import { tenancy, configs } from "@budibase/backend-core"
-import { SettingsInnerConfig } from "@budibase/types"
 import {
   InternalTemplateBinding,
   LOGO_URL,
   EmailTemplatePurpose,
 } from "../constants"
 import { checkSlashesInUrl } from "./index"
-import { getLicensedConfig } from "./configs"
 
 const BASE_COMPANY = "Budibase"
 import * as pro from "@budibase/pro"