@budibase/worker 2.1.40-alpha.6 → 2.1.42

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.1.40-alpha.6",
+  "version": "2.1.42",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -22,7 +22,7 @@
     "build:docker": "docker build . -t worker-service --label version=$BUDIBASE_RELEASE_VERSION",
     "dev:stack:init": "node ./scripts/dev/manage.js init",
     "dev:builder": "npm run dev:stack:init && nodemon",
-    "test": "jest --coverage --runInBand",
+    "test": "jest --runInBand",
     "test:watch": "jest --watch",
     "env:multi:enable": "node scripts/multiTenancy.js enable",
     "env:multi:disable": "node scripts/multiTenancy.js disable",
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.1.40-alpha.6",
-    "@budibase/pro": "2.1.40-alpha.5",
-    "@budibase/string-templates": "2.1.40-alpha.6",
-    "@budibase/types": "2.1.40-alpha.6",
+    "@budibase/backend-core": "^2.1.42",
+    "@budibase/pro": "2.1.41",
+    "@budibase/string-templates": "^2.1.42",
+    "@budibase/types": "^2.1.42",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -71,28 +71,38 @@
   },
   "devDependencies": {
     "@types/jest": "26.0.23",
-    "@types/jsonwebtoken": "8.5.1",
     "@types/koa": "2.13.4",
     "@types/koa__router": "8.0.11",
     "@types/node": "14.18.20",
-    "@types/node-fetch": "2.6.1",
     "@types/pouchdb": "6.4.0",
     "@types/uuid": "8.3.4",
-    "@typescript-eslint/parser": "5.45.0",
+    "@typescript-eslint/parser": "5.12.0",
     "copyfiles": "2.4.1",
     "eslint": "6.8.0",
-    "jest": "28.1.1",
+    "jest": "27.4.7",
     "nodemon": "2.0.15",
     "pouchdb-adapter-memory": "7.2.2",
     "prettier": "2.3.1",
     "rimraf": "3.0.2",
     "supertest": "6.2.2",
     "timekeeper": "2.2.0",
-    "ts-jest": "28.0.4",
-    "ts-node": "10.8.1",
+    "ts-jest": "27.1.3",
+    "ts-node": "10.4.0",
     "tsconfig-paths": "4.0.0",
-    "typescript": "4.7.3",
+    "typescript": "4.5.5",
     "update-dotenv": "1.1.1"
   },
-  "gitHead": "bd527a02929f9749d7cfd085cdeaf7a0c3d6d427"
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node",
+    "moduleNameMapper": {
+      "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
+      "@budibase/backend-core": "<rootDir>/../backend-core/src",
+      "@budibase/types": "<rootDir>/../types/src"
+    },
+    "setupFiles": [
+      "./scripts/jestSetup.js"
+    ]
+  },
+  "gitHead": "8078cfadfe5336aa51b59a1e81a5330aaad6d2a7"
 }

package/{src/tests/jestSetup.ts → scripts/jestSetup.js}

@@ -1,21 +1,12 @@
-import env from "../environment"
+const env = require("../src/environment")
 
-env._set("SELF_HOSTED", "0")
+env._set("SELF_HOSTED", "1")
 env._set("NODE_ENV", "jest")
 env._set("JWT_SECRET", "test-jwtsecret")
 env._set("LOG_LEVEL", "silent")
 env._set("MULTI_TENANCY", true)
-env._set("MINIO_URL", "http://localhost")
-env._set("MINIO_ACCESS_KEY", "test")
-env._set("MINIO_SECRET_KEY", "test")
-env._set("PLATFORM_URL", "http://localhost:10000")
-env._set("INTERNAL_API_KEY", "test")
-env._set("DISABLE_ACCOUNT_PORTAL", false)
 
-import { mocks } from "@budibase/backend-core/tests"
-
-// must explicitly enable fetch mock
-mocks.fetch.enable()
+const { mocks } = require("@budibase/backend-core/tests")
 
 // mock all dates to 2020-01-01T00:00:00.000Z
 // use tk.reset() to use real dates in individual tests

package/scripts/localdomain.js

@@ -2,36 +2,6 @@
 const updateDotEnv = require("update-dotenv")
 
 const arg = process.argv.slice(2)[0]
-const isEnable = arg === "enable"
-
-let domain = process.argv.slice(2)[1]
-if (!domain) {
-  domain = "local.com"
-}
-
-const getAccountPortalUrl = () => {
-  if (isEnable) {
-    return `http://account.${domain}:10001`
-  } else {
-    return `http://localhost:10001`
-  }
-}
-
-const getBudibaseUrl = () => {
-  if (isEnable) {
-    return `http://${domain}:10000`
-  } else {
-    return `http://localhost:10000`
-  }
-}
-
-const getCookieDomain = () => {
-  if (isEnable) {
-    return `.${domain}`
-  } else {
-    return ""
-  }
-}
 
 /**
  * For testing multi tenancy sub domains locally.
@@ -46,7 +16,11 @@ const getCookieDomain = () => {
  * 127.0.0.1   t2.local.com
  */
 updateDotEnv({
-  ACCOUNT_PORTAL_URL: getAccountPortalUrl(),
-  COOKIE_DOMAIN: getCookieDomain(),
-  PLATFORM_URL: getBudibaseUrl(),
+  ACCOUNT_PORTAL_URL:
+    arg === "enable"
+      ? "http://account.local.com:10001"
+      : "http://localhost:10001",
+  COOKIE_DOMAIN: arg === "enable" ? ".local.com" : "",
+  PLATFORM_URL:
+    arg === "enable" ? "http://local.com:10000" : "http://localhost:10000",
 }).then(() => console.log("Updated worker!"))

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

@@ -1,30 +1,22 @@
-import {
-  auth,
-  constants,
-  context,
-  db as dbCore,
-  events,
-  tenancy,
-  users as usersCore,
-  utils,
-} from "@budibase/backend-core"
-import { EmailTemplatePurpose } from "../../../constants"
-import { isEmailConfigured, sendEmail } from "../../../utilities/email"
-import { checkResetPasswordCode } from "../../../utilities/redis"
-import env from "../../../environment"
+const core = require("@budibase/backend-core")
+const { Configs, EmailTemplatePurpose } = require("../../../constants")
+const { sendEmail, isEmailConfigured } = require("../../../utilities/email")
+const { setCookie, getCookie, clearCookie, hash, platformLogout } = core.utils
+const { Cookies, Headers } = core.constants
+const { passport, ssoCallbackUrl, google, oidc } = core.auth
+const { checkResetPasswordCode } = require("../../../utilities/redis")
+const { getGlobalDB } = require("@budibase/backend-core/tenancy")
+const env = require("../../../environment")
+import { events, users as usersCore, context } from "@budibase/backend-core"
 import sdk from "../../../sdk"
-import { Config, ConfigType, User } from "@budibase/types"
+import { User } from "@budibase/types"
 
-const { setCookie, getCookie, clearCookie, hash, platformLogout } = utils
-const { Cookie, Header } = constants
-const { passport, ssoCallbackUrl, google, oidc } = auth
-
-export async function googleCallbackUrl(config?: { callbackURL?: string }) {
-  return ssoCallbackUrl(tenancy.getGlobalDB(), config, ConfigType.GOOGLE)
+export const googleCallbackUrl = async (config: any) => {
+  return ssoCallbackUrl(getGlobalDB(), config, "google")
 }
 
-export async function oidcCallbackUrl(config?: { callbackURL?: string }) {
-  return ssoCallbackUrl(tenancy.getGlobalDB(), config, ConfigType.OIDC)
+export const oidcCallbackUrl = async (config: any) => {
+  return ssoCallbackUrl(getGlobalDB(), config, "oidc")
 }
 
 async function authInternal(ctx: any, user: any, err = null, info = null) {
@@ -38,13 +30,13 @@ async function authInternal(ctx: any, user: any, err = null, info = null) {
   }
 
   // set a cookie for browser access
-  setCookie(ctx, user.token, Cookie.Auth, { sign: false })
+  setCookie(ctx, user.token, Cookies.Auth, { sign: false })
   // set the token in a header as well for APIs
-  ctx.set(Header.TOKEN, user.token)
+  ctx.set(Headers.TOKEN, user.token)
   // get rid of any app cookies on login
   // have to check test because this breaks cypress
   if (!env.isTest()) {
-    clearCookie(ctx, Cookie.CurrentApp)
+    clearCookie(ctx, Cookies.CurrentApp)
   }
 }
 
@@ -63,15 +55,15 @@ export const authenticate = async (ctx: any, next: any) => {
 
 export const setInitInfo = (ctx: any) => {
   const initInfo = ctx.request.body
-  setCookie(ctx, initInfo, Cookie.Init)
+  setCookie(ctx, initInfo, Cookies.Init)
   ctx.status = 200
 }
 
 export const getInitInfo = (ctx: any) => {
   try {
-    ctx.body = getCookie(ctx, Cookie.Init) || {}
+    ctx.body = getCookie(ctx, Cookies.Init) || {}
   } catch (err) {
-    clearCookie(ctx, Cookie.Init)
+    clearCookie(ctx, Cookies.Init)
     ctx.body = {}
   }
 }
@@ -114,7 +106,7 @@ export const resetUpdate = async (ctx: any) => {
   const { resetCode, password } = ctx.request.body
   try {
     const { userId } = await checkResetPasswordCode(resetCode)
-    const db = tenancy.getGlobalDB()
+    const db = getGlobalDB()
     const user = await db.get(userId)
     user.password = await hash(password)
     await db.put(user)
@@ -139,7 +131,7 @@ export const logout = async (ctx: any) => {
 
 export const datasourcePreAuth = async (ctx: any, next: any) => {
   const provider = ctx.params.provider
-  const { middleware } = require(`@budibase/backend-core`)
+  const middleware = require(`@budibase/backend-core/middleware`)
   const handler = middleware.datasource[provider]
 
   setCookie(
@@ -149,16 +141,16 @@ export const datasourcePreAuth = async (ctx: any, next: any) => {
       appId: ctx.query.appId,
       datasourceId: ctx.query.datasourceId,
     },
-    Cookie.DatasourceAuth
+    Cookies.DatasourceAuth
   )
 
   return handler.preAuth(passport, ctx, next)
 }
 
 export const datasourceAuth = async (ctx: any, next: any) => {
-  const authStateCookie = getCookie(ctx, Cookie.DatasourceAuth)
+  const authStateCookie = getCookie(ctx, Cookies.DatasourceAuth)
   const provider = authStateCookie.provider
-  const { middleware } = require(`@budibase/backend-core`)
+  const middleware = require(`@budibase/backend-core/middleware`)
   const handler = middleware.datasource[provider]
   return handler.postAuth(passport, ctx, next)
 }
@@ -168,13 +160,13 @@ export const datasourceAuth = async (ctx: any, next: any) => {
  * On a successful login, you will be redirected to the googleAuth callback route.
  */
 export const googlePreAuth = async (ctx: any, next: any) => {
-  const db = tenancy.getGlobalDB()
+  const db = getGlobalDB()
 
-  const config = await dbCore.getScopedConfig(db, {
-    type: ConfigType.GOOGLE,
+  const config = await core.db.getScopedConfig(db, {
+    type: Configs.GOOGLE,
     workspace: ctx.query.workspace,
   })
-  let callbackUrl = await googleCallbackUrl(config)
+  let callbackUrl = await exports.googleCallbackUrl(config)
   const strategy = await google.strategyFactory(
     config,
     callbackUrl,
@@ -189,13 +181,13 @@ export const googlePreAuth = async (ctx: any, next: any) => {
 }
 
 export const googleAuth = async (ctx: any, next: any) => {
-  const db = tenancy.getGlobalDB()
+  const db = getGlobalDB()
 
-  const config = await dbCore.getScopedConfig(db, {
-    type: ConfigType.GOOGLE,
+  const config = await core.db.getScopedConfig(db, {
+    type: Configs.GOOGLE,
     workspace: ctx.query.workspace,
   })
-  const callbackUrl = await googleCallbackUrl(config)
+  const callbackUrl = await exports.googleCallbackUrl(config)
   const strategy = await google.strategyFactory(
     config,
     callbackUrl,
@@ -216,14 +208,14 @@ export const googleAuth = async (ctx: any, next: any) => {
 }
 
 export const oidcStrategyFactory = async (ctx: any, configId: any) => {
-  const db = tenancy.getGlobalDB()
-  const config = await dbCore.getScopedConfig(db, {
-    type: ConfigType.OIDC,
+  const db = getGlobalDB()
+  const config = await core.db.getScopedConfig(db, {
+    type: Configs.OIDC,
     group: ctx.query.group,
   })
 
   const chosenConfig = config.configs.filter((c: any) => c.uuid === configId)[0]
-  let callbackUrl = await oidcCallbackUrl(chosenConfig)
+  let callbackUrl = await exports.oidcCallbackUrl(chosenConfig)
 
   //Remote Config
   const enrichedConfig = await oidc.fetchStrategyConfig(
@@ -241,11 +233,11 @@ export const oidcPreAuth = async (ctx: any, next: any) => {
   const { configId } = ctx.params
   const strategy = await oidcStrategyFactory(ctx, configId)
 
-  setCookie(ctx, configId, Cookie.OIDC_CONFIG)
+  setCookie(ctx, configId, Cookies.OIDC_CONFIG)
 
-  const db = tenancy.getGlobalDB()
-  const config = await dbCore.getScopedConfig(db, {
-    type: ConfigType.OIDC,
+  const db = getGlobalDB()
+  const config = await core.db.getScopedConfig(db, {
+    type: Configs.OIDC,
     group: ctx.query.group,
   })
 
@@ -263,7 +255,7 @@ export const oidcPreAuth = async (ctx: any, next: any) => {
 }
 
 export const oidcAuth = async (ctx: any, next: any) => {
-  const configId = getCookie(ctx, Cookie.OIDC_CONFIG)
+  const configId = getCookie(ctx, Cookies.OIDC_CONFIG)
   const strategy = await oidcStrategyFactory(ctx, configId)
 
   return passport.authenticate(