@budibase/worker 2.13.14 → 2.13.16

package/Dockerfile

@@ -5,22 +5,38 @@ LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-ho
 LABEL com.centurylinklabs.watchtower.lifecycle.post-update="scripts/watchtower-hooks/post-update.sh"
 LABEL com.centurylinklabs.watchtower.lifecycle.post-check="scripts/watchtower-hooks/post-check.sh"
 
-WORKDIR /app
 
 # handle node-gyp
-RUN apk add --no-cache --virtual .gyp python3 make g++
+RUN apk add --no-cache --virtual .gyp python3 make g++ jq
 RUN yarn global add pm2
 
+WORKDIR /
+
+COPY scripts/removeWorkspaceDependencies.sh scripts/removeWorkspaceDependencies.sh
+RUN chmod +x ./scripts/removeWorkspaceDependencies.sh
+
+
+WORKDIR /string-templates
+COPY packages/string-templates/package.json package.json
+RUN ../scripts/removeWorkspaceDependencies.sh package.json
+RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000
+COPY packages/string-templates .
+
 
-COPY package.json .
-COPY dist/yarn.lock .
-RUN yarn install --production=true --network-timeout 1000000
+WORKDIR /app
+COPY packages/worker/package.json .
+COPY packages/worker/dist/yarn.lock .
+RUN cd ../string-templates && yarn link && cd - && yarn link @budibase/string-templates
+
+RUN ../scripts/removeWorkspaceDependencies.sh package.json
+
+RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000
 # Remove unneeded data from file system to reduce image size
 RUN apk del .gyp \
     && yarn cache clean
 
-COPY dist/ dist/
-COPY docker_run.sh .
+COPY packages/worker/dist/ dist/
+COPY packages/worker/docker_run.sh .
 
 EXPOSE 4001
 
@@ -34,4 +50,9 @@ ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
 ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR
 ENV ACCOUNT_PORTAL_URL=https://account.budibase.app
 
+ARG BUDIBASE_VERSION
+# Ensuring the version argument is sent
+RUN test -n "$BUDIBASE_VERSION"
+ENV BUDIBASE_VERSION=$BUDIBASE_VERSION
+
 CMD ["./docker_run.sh"]

package/__mocks__/node-fetch.ts

@@ -1,4 +1,5 @@
 import fs from "fs"
+
 module FetchMock {
   const fetch = jest.requireActual("node-fetch")
 

package/package.json

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

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

@@ -51,10 +51,22 @@ export async function removeAppRole(ctx: Ctx) {
   const users = await sdk.users.db.allUsers()
   const bulk = []
   const cacheInvalidations = []
+  const prodAppId = dbCore.getProdAppID(appId)
   for (let user of users) {
-    if (user.roles[appId]) {
-      cacheInvalidations.push(cache.user.invalidateUser(user._id))
-      delete user.roles[appId]
+    let updated = false
+    if (user.roles[prodAppId]) {
+      cacheInvalidations.push(cache.user.invalidateUser(user._id!))
+      delete user.roles[prodAppId]
+      updated = true
+    }
+    if (user.builder && Array.isArray(user.builder?.apps)) {
+      const idx = user.builder.apps.indexOf(prodAppId)
+      if (idx !== -1) {
+        user.builder.apps.splice(idx, 1)
+        updated = true
+      }
+    }
+    if (updated) {
       bulk.push(user)
     }
   }

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

@@ -10,6 +10,7 @@ import {
 import env from "../../../environment"
 import { groups } from "@budibase/pro"
 import { UpdateSelfRequest, UpdateSelfResponse, UserCtx } from "@budibase/types"
+
 const { newid } = utils
 
 function newTestApiKey() {

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

@@ -120,28 +120,17 @@ export const adminUser = async (
       )
     }
 
-    const user: User = {
-      email: email,
-      password: password,
-      createdAt: Date.now(),
-      roles: {},
-      builder: {
-        global: true,
-      },
-      admin: {
-        global: true,
-      },
-      tenantId,
-      ssoId,
-    }
     try {
-      // always bust checklist beforehand, if an error occurs but can proceed, don't get
-      // stuck in a cycle
-      await cache.bustCache(cache.CacheKey.CHECKLIST)
-      const finalUser = await userSdk.db.save(user, {
-        hashPassword,
-        requirePassword,
-      })
+      const finalUser = await userSdk.db.createAdminUser(
+        email,
+        password,
+        tenantId,
+        {
+          ssoId,
+          hashPassword,
+          requirePassword,
+        }
+      )
 
       // events
       let account: CloudAccount | undefined

package/src/api/index.ts

@@ -1,5 +1,7 @@
 import Router from "@koa/router"
+
 const compress = require("koa-compress")
+
 import zlib from "zlib"
 import { routes } from "./routes"
 import { middleware as pro } from "@budibase/pro"

package/src/api/routes/global/templates.ts

@@ -3,6 +3,7 @@ import * as controller from "../../controllers/global/templates"
 import { TemplatePurpose, TemplateType } from "../../../constants"
 import { auth as authCore } from "@budibase/backend-core"
 import Joi from "joi"
+
 const { adminOnly, joiValidator } = authCore
 
 const router: Router = new Router()

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

@@ -7,6 +7,7 @@ import {
   structures,
   generator,
 } from "../../../../tests"
+
 const sendMailMock = mocks.email.mock()
 import { events, constants } from "@budibase/backend-core"
 import { Response } from "superagent"

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

@@ -1,6 +1,7 @@
 // mock the email system
 jest.mock("nodemailer")
 import { TestConfiguration, structures, mocks } from "../../../../tests"
+
 mocks.email.mock()
 import { events } from "@budibase/backend-core"
 import { GetPublicSettingsResponse, Config, ConfigType } from "@budibase/types"

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

@@ -1,5 +1,6 @@
 jest.mock("nodemailer")
 import { TestConfiguration, mocks } from "../../../../tests"
+
 const sendMailMock = mocks.email.mock()
 import { EmailTemplatePurpose } from "../../../../constants"
 

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

@@ -1,4 +1,5 @@
 import { TestConfiguration, mocks, structures } from "../../../../tests"
+
 const licensing = mocks.pro.licensing
 const quotas = mocks.pro.quotas
 

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

@@ -1,6 +1,7 @@
 jest.unmock("node-fetch")
 import { TestConfiguration } from "../../../../tests"
 import { EmailTemplatePurpose } from "../../../../constants"
+
 const nodemailer = require("nodemailer")
 const fetch = require("node-fetch")
 

package/src/api/routes/system/tests/status.spec.ts

@@ -1,6 +1,7 @@
 import { HealthStatusResponse } from "@budibase/types"
 import { TestConfiguration } from "../../../../tests"
 import { accounts as _accounts } from "@budibase/backend-core"
+
 const accounts = jest.mocked(_accounts)
 
 describe("/api/system/status", () => {

package/src/index.ts

@@ -18,13 +18,14 @@ import {
   timers,
   redis,
 } from "@budibase/backend-core"
+
 db.init()
-import Koa from "koa"
 import koaBody from "koa-body"
 import http from "http"
 import api from "./api"
 
 const koaSession = require("koa-session")
+
 import { userAgent } from "koa-useragent"
 
 import destroyable from "server-destroy"
@@ -40,7 +41,7 @@ if (coreEnv.ENABLE_SSO_MAINTENANCE_MODE) {
 // this will setup http and https proxies form env variables
 bootstrap()
 
-const app: Application = new Koa()
+const app: Application = new Application()
 
 app.keys = ["secret", "key"]
 

package/src/tests/TestConfiguration.ts

@@ -7,10 +7,13 @@ mocks.licenses.init(mocks.pro)
 mocks.licenses.useUnlimited()
 
 import * as dbConfig from "../db"
+
 dbConfig.init()
 import env from "../environment"
 import * as controllers from "./controllers"
+
 const supertest = require("supertest")
+
 import { Config } from "../constants"
 import {
   users,

package/src/tests/jestSetup.ts

@@ -8,6 +8,7 @@ mocks.fetch.enable()
 // mock all dates to 2020-01-01T00:00:00.000Z
 // use tk.reset() to use real dates in individual tests
 const tk = require("timekeeper")
+
 tk.freeze(mocks.date.MOCK_DATE)
 
 if (!process.env.CI) {

package/src/tests/mocks/index.ts

@@ -2,6 +2,7 @@ import * as email from "./email"
 import { mocks } from "@budibase/backend-core/tests"
 
 import * as _pro from "@budibase/pro"
+
 const pro = jest.mocked(_pro, { shallow: false })
 
 export default {

package/src/utilities/email.ts

@@ -6,6 +6,7 @@ import { processString } from "@budibase/string-templates"
 import { User, SendEmailOpts, SMTPInnerConfig } from "@budibase/types"
 import { configs, cache } from "@budibase/backend-core"
 import ical from "ical-generator"
+
 const nodemailer = require("nodemailer")
 
 const TEST_MODE = env.ENABLE_EMAIL_TEST_MODE && env.isDev()

package/Dockerfile.v2

@@ -1,58 +0,0 @@
-FROM node:18-alpine
-
-LABEL com.centurylinklabs.watchtower.lifecycle.pre-check="scripts/watchtower-hooks/pre-check.sh"
-LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-hooks/pre-update.sh"
-LABEL com.centurylinklabs.watchtower.lifecycle.post-update="scripts/watchtower-hooks/post-update.sh"
-LABEL com.centurylinklabs.watchtower.lifecycle.post-check="scripts/watchtower-hooks/post-check.sh"
-
-
-# handle node-gyp
-RUN apk add --no-cache --virtual .gyp python3 make g++ jq
-RUN yarn global add pm2
-
-WORKDIR /
-
-COPY scripts/removeWorkspaceDependencies.sh scripts/removeWorkspaceDependencies.sh
-RUN chmod +x ./scripts/removeWorkspaceDependencies.sh
-
-
-WORKDIR /string-templates
-COPY packages/string-templates/package.json package.json
-RUN ../scripts/removeWorkspaceDependencies.sh package.json
-RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000
-COPY packages/string-templates .
-
-
-WORKDIR /app
-COPY packages/worker/package.json .
-COPY packages/worker/dist/yarn.lock .
-RUN cd ../string-templates && yarn link && cd - && yarn link @budibase/string-templates
-
-RUN ../scripts/removeWorkspaceDependencies.sh package.json
-
-RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000
-# Remove unneeded data from file system to reduce image size
-RUN apk del .gyp \
-    && yarn cache clean
-
-COPY packages/worker/dist/ dist/
-COPY packages/worker/docker_run.sh .
-
-EXPOSE 4001
-
-# have to add node environment production after install
-# due to this causing yarn to stop installing dev dependencies
-# which are actually needed to get this environment up and running
-ENV NODE_ENV=production
-ENV CLUSTER_MODE=${CLUSTER_MODE}
-ENV SERVICE=worker-service
-ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
-ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR
-ENV ACCOUNT_PORTAL_URL=https://account.budibase.app
-
-ARG BUDIBASE_VERSION
-# Ensuring the version argument is sent
-RUN test -n "$BUDIBASE_VERSION"
-ENV BUDIBASE_VERSION=$BUDIBASE_VERSION
-
-CMD ["./docker_run.sh"]