@budibase/worker 2.1.40-alpha.6 → 2.1.42

package/src/api/routes/validation/users.ts

@@ -1,4 +1,4 @@
-import { auth } from "@budibase/backend-core"
+const { joiValidator } = require("@budibase/backend-core/auth")
 import Joi from "joi"
 
 let schema: any = {
@@ -25,7 +25,7 @@ export const buildUserSaveValidation = (isSelf = false) => {
       _rev: Joi.string(),
     }
   }
-  return auth.joiValidator.body(Joi.object(schema).required().unknown(true))
+  return joiValidator.body(Joi.object(schema).required().unknown(true))
 }
 
 export const buildUserBulkUserValidation = (isSelf = false) => {
@@ -46,5 +46,5 @@ export const buildUserBulkUserValidation = (isSelf = false) => {
     }),
   }
 
-  return auth.joiValidator.body(Joi.object(bulkSchema).required().unknown(true))
+  return joiValidator.body(Joi.object(bulkSchema).required().unknown(true))
 }

package/src/constants/{index.ts → index.js}

@@ -1,97 +1,97 @@
-import { constants } from "@budibase/backend-core"
+const { Configs } = require("@budibase/backend-core/constants")
 
-export const LOGO_URL =
+exports.LOGO_URL =
   "https://d33wubrfki0l68.cloudfront.net/aac32159d7207b5085e74a7ef67afbb7027786c5/2b1fd/img/logo/bb-emblem.svg"
 
-export enum UserStatus {
-  ACTIVE = "active",
-  INACTIVE = "inactive",
+exports.UserStatus = {
+  ACTIVE: "active",
+  INACTIVE: "inactive",
 }
 
-export const Config = constants.Config
+exports.Configs = Configs
 
-export enum ConfigUpload {
-  LOGO = "logo",
-  OIDC_LOGO = "oidc_logo",
+exports.ConfigUploads = {
+  LOGO: "logo",
+  OIDC_LOGO: "oidc_logo",
 }
 
-export enum TemplateType {
-  EMAIL = "email",
+const TemplateTypes = {
+  EMAIL: "email",
 }
 
-export enum EmailTemplatePurpose {
-  BASE = "base",
-  PASSWORD_RECOVERY = "password_recovery",
-  INVITATION = "invitation",
-  WELCOME = "welcome",
-  CUSTOM = "custom",
+const EmailTemplatePurpose = {
+  BASE: "base",
+  PASSWORD_RECOVERY: "password_recovery",
+  INVITATION: "invitation",
+  WELCOME: "welcome",
+  CUSTOM: "custom",
 }
 
-export enum InternalTemplateBinding {
-  PLATFORM_URL = "platformUrl",
-  COMPANY = "company",
-  LOGO_URL = "logoUrl",
-  EMAIL = "email",
-  USER = "user",
-  REQUEST = "request",
-  DOCS_URL = "docsUrl",
-  LOGIN_URL = "loginUrl",
-  CURRENT_YEAR = "currentYear",
-  CURRENT_DATE = "currentDate",
-  BODY = "body",
-  STYLES = "styles",
-  RESET_URL = "resetUrl",
-  RESET_CODE = "resetCode",
-  INVITE_URL = "inviteUrl",
-  INVITE_CODE = "inviteUrl",
-  CONTENTS = "contents",
+const InternalTemplateBindings = {
+  PLATFORM_URL: "platformUrl",
+  COMPANY: "company",
+  LOGO_URL: "logoUrl",
+  EMAIL: "email",
+  USER: "user",
+  REQUEST: "request",
+  DOCS_URL: "docsUrl",
+  LOGIN_URL: "loginUrl",
+  CURRENT_YEAR: "currentYear",
+  CURRENT_DATE: "currentDate",
+  BODY: "body",
+  STYLES: "styles",
+  RESET_URL: "resetUrl",
+  RESET_CODE: "resetCode",
+  INVITE_URL: "inviteUrl",
+  INVITE_CODE: "inviteUrl",
+  CONTENTS: "contents",
 }
 
-export const TemplateBindings = {
+const TemplateBindings = {
   PLATFORM_URL: {
-    name: InternalTemplateBinding.PLATFORM_URL,
+    name: InternalTemplateBindings.PLATFORM_URL,
     description: "The URL used to access the budibase platform",
   },
   COMPANY: {
-    name: InternalTemplateBinding.COMPANY,
+    name: InternalTemplateBindings.COMPANY,
     description: "The name of your organization",
   },
   LOGO_URL: {
-    name: InternalTemplateBinding.LOGO_URL,
+    name: InternalTemplateBindings.LOGO_URL,
     description: "The URL of your organizations logo.",
   },
   EMAIL: {
-    name: InternalTemplateBinding.EMAIL,
+    name: InternalTemplateBindings.EMAIL,
     description: "The recipients email address.",
   },
   USER: {
-    name: InternalTemplateBinding.USER,
+    name: InternalTemplateBindings.USER,
     description: "The recipients user object.",
   },
   REQUEST: {
-    name: InternalTemplateBinding.REQUEST,
+    name: InternalTemplateBindings.REQUEST,
     description: "Additional request metadata.",
   },
   DOCS_URL: {
-    name: InternalTemplateBinding.DOCS_URL,
+    name: InternalTemplateBindings.DOCS_URL,
     description: "Organization documentation URL.",
   },
   LOGIN_URL: {
-    name: InternalTemplateBinding.LOGIN_URL,
+    name: InternalTemplateBindings.LOGIN_URL,
     description: "The URL used to log into the organization budibase instance.",
   },
   CURRENT_YEAR: {
-    name: InternalTemplateBinding.CURRENT_YEAR,
+    name: InternalTemplateBindings.CURRENT_YEAR,
     description: "The current year.",
   },
   CURRENT_DATE: {
-    name: InternalTemplateBinding.CURRENT_DATE,
+    name: InternalTemplateBindings.CURRENT_DATE,
     description: "The current date.",
   },
 }
 
-export const TemplateMetadata = {
-  [TemplateType.EMAIL]: [
+const TemplateMetadata = {
+  [TemplateTypes.EMAIL]: [
     {
       name: "Base format",
       description:
@@ -100,11 +100,11 @@ export const TemplateMetadata = {
       purpose: EmailTemplatePurpose.BASE,
       bindings: [
         {
-          name: InternalTemplateBinding.BODY,
+          name: InternalTemplateBindings.BODY,
           description: "The main body of another email template.",
         },
         {
-          name: InternalTemplateBinding.STYLES,
+          name: InternalTemplateBindings.STYLES,
           description: "The contents of the Styling email template.",
         },
       ],
@@ -117,12 +117,12 @@ export const TemplateMetadata = {
       purpose: EmailTemplatePurpose.PASSWORD_RECOVERY,
       bindings: [
         {
-          name: InternalTemplateBinding.RESET_URL,
+          name: InternalTemplateBindings.RESET_URL,
           description:
             "The URL the recipient must click to reset their password.",
         },
         {
-          name: InternalTemplateBinding.RESET_CODE,
+          name: InternalTemplateBindings.RESET_CODE,
           description:
             "The temporary password reset code used in the recipients password reset URL.",
         },
@@ -144,12 +144,12 @@ export const TemplateMetadata = {
       purpose: EmailTemplatePurpose.INVITATION,
       bindings: [
         {
-          name: InternalTemplateBinding.INVITE_URL,
+          name: InternalTemplateBindings.INVITE_URL,
           description:
             "The URL the recipient must click to accept the invitation and activate their account.",
         },
         {
-          name: InternalTemplateBinding.INVITE_CODE,
+          name: InternalTemplateBindings.INVITE_CODE,
           description:
             "The temporary invite code used in the recipients invitation URL.",
         },
@@ -163,7 +163,7 @@ export const TemplateMetadata = {
       purpose: EmailTemplatePurpose.CUSTOM,
       bindings: [
         {
-          name: InternalTemplateBinding.CONTENTS,
+          name: InternalTemplateBindings.CONTENTS,
           description: "Custom content body.",
         },
       ],
@@ -172,5 +172,12 @@ export const TemplateMetadata = {
 }
 
 // all purpose combined
-export { EmailTemplatePurpose as TemplatePurpose }
-export const GLOBAL_OWNER = "global"
+exports.TemplatePurpose = {
+  ...EmailTemplatePurpose,
+}
+exports.TemplateTypes = TemplateTypes
+exports.EmailTemplatePurpose = EmailTemplatePurpose
+exports.TemplateMetadata = TemplateMetadata
+exports.TemplateBindings = TemplateBindings
+exports.InternalTemplateBindings = InternalTemplateBindings
+exports.GLOBAL_OWNER = "global"

package/src/constants/templates/{index.ts → index.js}

@@ -1,15 +1,15 @@
-import { readStaticFile } from "../../utilities/fileSystem"
-import {
+const { readStaticFile } = require("../../utilities/fileSystem")
+const {
   EmailTemplatePurpose,
-  TemplateType,
+  TemplateTypes,
   TemplatePurpose,
   GLOBAL_OWNER,
-} from "../index"
-import { join } from "path"
-import { db as dbCore, tenancy } from "@budibase/backend-core"
-import { Template } from "@budibase/types"
+} = require("../index")
+const { join } = require("path")
+const { getTemplateParams } = require("@budibase/backend-core/db")
+const { getGlobalDB } = require("@budibase/backend-core/tenancy")
 
-export const EmailTemplates = {
+exports.EmailTemplates = {
   [EmailTemplatePurpose.PASSWORD_RECOVERY]: readStaticFile(
     join(__dirname, "passwordRecovery.hbs")
   ),
@@ -23,10 +23,10 @@ export const EmailTemplates = {
   [EmailTemplatePurpose.CUSTOM]: readStaticFile(join(__dirname, "custom.hbs")),
 }
 
-export function addBaseTemplates(templates: Template[], type?: string) {
+exports.addBaseTemplates = (templates, type = null) => {
   let purposeList
   switch (type) {
-    case TemplateType.EMAIL:
+    case TemplateTypes.EMAIL:
       purposeList = Object.values(EmailTemplatePurpose)
       break
     default:
@@ -38,9 +38,9 @@ export function addBaseTemplates(templates: Template[], type?: string) {
     if (templates.find(template => template.purpose === purpose)) {
       continue
     }
-    if (EmailTemplates[purpose]) {
+    if (exports.EmailTemplates[purpose]) {
       templates.push({
-        contents: EmailTemplates[purpose],
+        contents: exports.EmailTemplates[purpose],
         purpose,
         type,
       })
@@ -49,14 +49,10 @@ export function addBaseTemplates(templates: Template[], type?: string) {
   return templates
 }
 
-export async function getTemplates({
-  ownerId,
-  type,
-  id,
-}: { ownerId?: string; type?: string; id?: string } = {}) {
-  const db = tenancy.getGlobalDB()
+exports.getTemplates = async ({ ownerId, type, id } = {}) => {
+  const db = getGlobalDB()
   const response = await db.allDocs(
-    dbCore.getTemplateParams(ownerId || GLOBAL_OWNER, id, {
+    getTemplateParams(ownerId || GLOBAL_OWNER, id, {
       include_docs: true,
     })
   )
@@ -68,10 +64,10 @@ export async function getTemplates({
   if (type) {
     templates = templates.filter(template => template.type === type)
   }
-  return addBaseTemplates(templates, type)
+  return exports.addBaseTemplates(templates, type)
 }
 
-export async function getTemplateByPurpose(type: string, purpose: string) {
-  const templates = await getTemplates({ type })
-  return templates.find((template: Template) => template.purpose === purpose)
+exports.getTemplateByPurpose = async (type, purpose) => {
+  const templates = await exports.getTemplates({ type })
+  return templates.find(template => template.purpose === purpose)
 }

package/src/db/index.js

@@ -0,0 +1,11 @@
+const core = require("@budibase/backend-core")
+const env = require("../environment")
+
+exports.init = () => {
+  const dbConfig = {}
+  if (env.isTest() && !env.COUCH_DB_URL) {
+    dbConfig.inMemory = true
+    dbConfig.allDbs = true
+  }
+  core.init({ db: dbConfig })
+}

package/src/environment.ts

@@ -26,7 +26,7 @@ function parseIntSafe(number: any) {
   }
 }
 
-const environment = {
+const env = {
   // auth
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
@@ -68,7 +68,7 @@ const environment = {
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore
-    environment[key] = value
+    env[key] = value
   },
   isDev,
   isTest,
@@ -78,19 +78,17 @@ const environment = {
 }
 
 // if some var haven't been set, define them
-if (!environment.APPS_URL) {
-  environment.APPS_URL = isDev()
-    ? "http://localhost:4001"
-    : "http://app-service:4002"
+if (!env.APPS_URL) {
+  env.APPS_URL = isDev() ? "http://localhost:4001" : "http://app-service:4002"
 }
 
 // clean up any environment variable edge cases
-for (let [key, value] of Object.entries(environment)) {
+for (let [key, value] of Object.entries(env)) {
   // handle the edge case of "0" to disable an environment variable
   if (value === "0") {
     // @ts-ignore
-    environment[key] = 0
+    env[key] = 0
   }
 }
 
-export = environment
+export = env

package/src/index.ts

@@ -1,5 +1,5 @@
 // need to load environment first
-import env from "./environment"
+const env = require("./environment")
 
 // enable APM if configured
 if (process.env.ELASTIC_APM_ENABLED) {
@@ -13,18 +13,20 @@ import { Scope } from "@sentry/node"
 import { Event } from "@sentry/types/dist/event"
 import Application from "koa"
 import { bootstrap } from "global-agent"
-import * as db from "./db"
-import { auth, logging, events, pinoSettings } from "@budibase/backend-core"
+import db from "./db"
 db.init()
-import Koa from "koa"
-import koaBody from "koa-body"
-import http from "http"
-import api from "./api"
-import * as redis from "./utilities/redis"
-const Sentry = require("@sentry/node")
+const Koa = require("koa")
+const destroyable = require("server-destroy")
+const koaBody = require("koa-body")
 const koaSession = require("koa-session")
+const { passport } = require("@budibase/backend-core/auth")
+const { logAlert } = require("@budibase/backend-core/logging")
 const logger = require("koa-pino-logger")
-const destroyable = require("server-destroy")
+const http = require("http")
+const api = require("./api")
+const redis = require("./utilities/redis")
+const Sentry = require("@sentry/node")
+import { events, pinoSettings } from "@budibase/backend-core"
 
 // this will setup http and https proxies form env variables
 bootstrap()
@@ -39,8 +41,8 @@ app.use(koaSession(app))
 app.use(logger(pinoSettings()))
 
 // authentication
-app.use(auth.passport.initialize())
-app.use(auth.passport.session())
+app.use(passport.initialize())
+app.use(passport.session())
 
 // api routes
 app.use(api.routes())
@@ -79,18 +81,17 @@ server.on("close", async () => {
 
 const shutdown = () => {
   server.close()
-  // @ts-ignore
   server.destroy()
 }
 
-export = server.listen(parseInt(env.PORT || "4002"), async () => {
+export = server.listen(parseInt(env.PORT || 4002), async () => {
   console.log(`Worker running on ${JSON.stringify(server.address())}`)
   await redis.init()
 })
 
 process.on("uncaughtException", err => {
   errCode = -1
-  logging.logAlert("Uncaught exception.", err)
+  logAlert("Uncaught exception.", err)
   shutdown()
 })
 

package/src/middleware/{cloudRestricted.ts → cloudRestricted.js}

@@ -1,14 +1,13 @@
-import env from "../environment"
-import { constants } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
+const env = require("../environment")
+const { Headers } = require("@budibase/backend-core/constants")
 
 /**
  * This is a restricted endpoint in the cloud.
  * Ensure that the correct API key has been supplied.
  */
-export = async (ctx: BBContext, next: any) => {
+module.exports = async (ctx, next) => {
   if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
-    const apiKey = ctx.request.headers[constants.Header.API_KEY]
+    const apiKey = ctx.request.headers[Headers.API_KEY]
     if (apiKey !== env.INTERNAL_API_KEY) {
       ctx.throw(403, "Unauthorized")
     }