@budibase/worker 1.0.200-alpha.3 → 1.0.200

package/src/api/{routes/validation/users.ts → utilities/validation.js}

@@ -1,8 +1,8 @@
-import joiValidator from "../../../middleware/joi-validator"
-import Joi from "joi"
+const joiValidator = require("../../middleware/joi-validator")
+const Joi = require("joi")
 
-export const buildUserSaveValidation = (isSelf = false) => {
-  let schema: any = {
+exports.buildUserSaveValidation = (isSelf = false) => {
+  let schema = {
     email: Joi.string().allow(null, ""),
     password: Joi.string().allow(null, ""),
     forceResetPassword: Joi.boolean().optional(),

package/src/index.ts

@@ -18,7 +18,6 @@ const http = require("http")
 const api = require("./api")
 const redis = require("./utilities/redis")
 const Sentry = require("@sentry/node")
-import { events } from "@budibase/backend-core"
 
 // this will setup http and https proxies form env variables
 bootstrap()
@@ -74,7 +73,6 @@ server.on("close", async () => {
     console.log("Server Closed")
   }
   await redis.shutdown()
-  await events.shutdown()
   if (!env.isTest()) {
     process.exit(errCode)
   }

package/tsconfig.json

@@ -1,29 +1,23 @@
 {
-  "extends": "./tsconfig.build.json",
   "compilerOptions": {
-    "composite": true,
-    "declaration": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "paths": {
-      "@budibase/types": ["../types/src"],
-      "@budibase/backend-core": ["../backend-core/src"],
-      "@budibase/backend-core/*": ["../backend-core/*"]
-    }
+    "target": "es6",
+    "module": "commonjs",
+    "lib": ["es2019"],
+    "allowJs": true,
+    "outDir": "dist",
+    "strict": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "incremental": true
   },
-  "ts-node": {
-    "require": ["tsconfig-paths/register"]
-  },
-  "references": [
-    { "path": "../types" },
-    { "path": "../backend-core" },
-  ],
   "include": [
-    "src/**/*",
-    "package.json"
+    "./src/**/*"
   ],
   "exclude": [
     "node_modules",
-    "dist"
+    "**/*.json",
+    "**/*.spec.ts",
+    "**/*.spec.js"
   ]
-}
+}

package/src/api/routes/tests/self.spec.js

@@ -1,58 +0,0 @@
-jest.mock("nodemailer")
-const { config, request } = require("../../../tests")
-const { events } = require("@budibase/backend-core")
-
-describe("/api/global/self", () => {
-
-  beforeAll(async () => {
-    await config.beforeAll()
-  })
-
-  afterAll(async () => {
-    await config.afterAll()
-  })
-
-  beforeEach(() => {
-    jest.clearAllMocks()
-  })
-
-  const updateSelf = async (user) => {
-    const res = await request
-      .post(`/api/global/self`)
-      .send(user)
-      .set(config.defaultHeaders())
-      .expect("Content-Type", /json/)
-      .expect(200)
-    return res
-  }
-
-  describe("update", () => {
-
-    it("should update self", async () => {
-      const user = await config.createUser()
-
-      delete user.password
-      const res = await updateSelf(user)
-
-      expect(res.body._id).toBe(user._id)
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.user.updated).toBeCalledWith(user)
-      expect(events.user.passwordUpdated).not.toBeCalled()
-    })
-
-    it("should update password", async () => {
-      const user = await config.createUser()
-      const password = "newPassword" 
-      user.password = password
-
-      const res = await updateSelf(user)
-
-      delete user.password
-      expect(res.body._id).toBe(user._id)
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.user.updated).toBeCalledWith(user)
-      expect(events.user.passwordUpdated).toBeCalledTimes(1)
-      expect(events.user.passwordUpdated).toBeCalledWith(user)
-    })
-  })
-})

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

@@ -1 +0,0 @@
-export * as users from "./users"

package/src/sdk/index.ts

@@ -1 +0,0 @@
-export * as users from "./users"

package/src/sdk/users/events.ts

@@ -1,161 +0,0 @@
-import env from "../../environment"
-import { events, accounts, tenancy } from "@budibase/backend-core"
-import { User, UserRoles, CloudAccount } from "@budibase/types"
-
-export const handleDeleteEvents = async (user: any) => {
-  await events.user.deleted(user)
-
-  if (isBuilder(user)) {
-    await events.user.permissionBuilderRemoved(user)
-  }
-
-  if (isAdmin(user)) {
-    await events.user.permissionAdminRemoved(user)
-  }
-}
-
-const assignAppRoleEvents = async (
-  user: User,
-  roles: UserRoles,
-  existingRoles: UserRoles
-) => {
-  for (const [appId, role] of Object.entries(roles)) {
-    // app role in existing is not same as new
-    if (!existingRoles || existingRoles[appId] !== role) {
-      await events.role.assigned(user, role)
-    }
-  }
-}
-
-const unassignAppRoleEvents = async (
-  user: User,
-  roles: UserRoles,
-  existingRoles: UserRoles
-) => {
-  if (!existingRoles) {
-    return
-  }
-  for (const [appId, role] of Object.entries(existingRoles)) {
-    // app role in new is not same as existing
-    if (!roles || roles[appId] !== role) {
-      await events.role.unassigned(user, role)
-    }
-  }
-}
-
-const handleAppRoleEvents = async (user: any, existingUser: any) => {
-  const roles = user.roles
-  const existingRoles = existingUser?.roles
-
-  await assignAppRoleEvents(user, roles, existingRoles)
-  await unassignAppRoleEvents(user, roles, existingRoles)
-}
-
-export const handleSaveEvents = async (user: any, existingUser: any) => {
-  const tenantId = tenancy.getTenantId()
-  let tenantAccount: CloudAccount | undefined
-  if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
-    tenantAccount = await accounts.getAccountByTenantId(tenantId)
-  }
-  await events.identification.identifyUser(user, tenantAccount)
-
-  if (existingUser) {
-    await events.user.updated(user)
-
-    if (isRemovingBuilder(user, existingUser)) {
-      await events.user.permissionBuilderRemoved(user)
-    }
-
-    if (isRemovingAdmin(user, existingUser)) {
-      await events.user.permissionAdminRemoved(user)
-    }
-
-    if (
-      !existingUser.forceResetPassword &&
-      user.forceResetPassword &&
-      user.password
-    ) {
-      await events.user.passwordForceReset(user)
-    }
-  } else {
-    await events.user.created(user)
-  }
-
-  if (isAddingBuilder(user, existingUser)) {
-    await events.user.permissionBuilderAssigned(user)
-  }
-
-  if (isAddingAdmin(user, existingUser)) {
-    await events.user.permissionAdminAssigned(user)
-  }
-
-  await handleAppRoleEvents(user, existingUser)
-}
-
-const isBuilder = (user: any) => user.builder && user.builder.global
-const isAdmin = (user: any) => user.admin && user.admin.global
-
-export const isAddingBuilder = (user: any, existingUser: any) => {
-  return isAddingPermission(user, existingUser, isBuilder)
-}
-
-export const isRemovingBuilder = (user: any, existingUser: any) => {
-  return isRemovingPermission(user, existingUser, isBuilder)
-}
-
-const isAddingAdmin = (user: any, existingUser: any) => {
-  return isAddingPermission(user, existingUser, isAdmin)
-}
-
-const isRemovingAdmin = (user: any, existingUser: any) => {
-  return isRemovingPermission(user, existingUser, isAdmin)
-}
-
-/**
- * Check if a permission is being added to a new or existing user.
- */
-const isAddingPermission = (
-  user: any,
-  existingUser: any,
-  hasPermission: any
-) => {
-  // new user doesn't have the permission
-  if (!hasPermission(user)) {
-    return false
-  }
-
-  // existing user has the permission
-  if (existingUser && hasPermission(existingUser)) {
-    return false
-  }
-
-  // permission is being added
-  return true
-}
-
-/**
- * Check if a permission is being removed from an existing user.
- */
-const isRemovingPermission = (
-  user: any,
-  existingUser: any,
-  hasPermission: any
-) => {
-  // new user has the permission
-  if (hasPermission(user)) {
-    return false
-  }
-
-  // no existing user or existing user doesn't have the permission
-  if (!existingUser) {
-    return false
-  }
-
-  // existing user doesn't have the permission
-  if (!hasPermission(existingUser)) {
-    return false
-  }
-
-  // permission is being removed
-  return true
-}

package/src/sdk/users/index.ts

@@ -1 +0,0 @@
-export * from "./users"

package/src/sdk/users/users.ts

@@ -1,201 +0,0 @@
-import env from "../../environment"
-import { quotas } from "@budibase/pro"
-import * as apps from "../../utilities/appService"
-import * as eventHelpers from "./events"
-import {
-  tenancy,
-  utils,
-  db as dbUtils,
-  constants,
-  cache,
-  users as usersCore,
-  deprovisioning,
-  sessions,
-  HTTPError,
-  accounts,
-  migrations,
-} from "@budibase/backend-core"
-import { MigrationType } from "@budibase/types"
-
-/**
- * Retrieves all users from the current tenancy.
- */
-export const allUsers = async () => {
-  const db = tenancy.getGlobalDB()
-  const response = await db.allDocs(
-    dbUtils.getGlobalUserParams(null, {
-      include_docs: true,
-    })
-  )
-  return response.rows.map((row: any) => row.doc)
-}
-
-/**
- * Gets a user by ID from the global database, based on the current tenancy.
- */
-export const getUser = async (userId: string) => {
-  const db = tenancy.getGlobalDB()
-  let user
-  try {
-    user = await db.get(userId)
-  } catch (err: any) {
-    // no user found, just return nothing
-    if (err.status === 404) {
-      return {}
-    }
-    throw err
-  }
-  if (user) {
-    delete user.password
-  }
-  return user
-}
-
-interface SaveUserOpts {
-  hashPassword?: boolean
-  requirePassword?: boolean
-  bulkCreate?: boolean
-}
-
-export const save = async (
-  user: any,
-  opts: SaveUserOpts = {
-    hashPassword: true,
-    requirePassword: true,
-    bulkCreate: false,
-  }
-) => {
-  const tenantId = tenancy.getTenantId()
-  const db = tenancy.getGlobalDB()
-  let { email, password, _id } = user
-  // make sure another user isn't using the same email
-  let dbUser: any
-  if (opts.bulkCreate) {
-    dbUser = null
-  } else if (email) {
-    // check budibase users inside the tenant
-    dbUser = await usersCore.getGlobalUserByEmail(email)
-    if (dbUser != null && (dbUser._id !== _id || Array.isArray(dbUser))) {
-      throw `Email address ${email} already in use.`
-    }
-
-    // check budibase users in other tenants
-    if (env.MULTI_TENANCY) {
-      const tenantUser = await tenancy.getTenantUser(email)
-      if (tenantUser != null && tenantUser.tenantId !== tenantId) {
-        throw `Email address ${email} already in use.`
-      }
-    }
-
-    // check root account users in account portal
-    if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
-      const account = await accounts.getAccount(email)
-      if (account && account.verified && account.tenantId !== tenantId) {
-        throw `Email address ${email} already in use.`
-      }
-    }
-  } else if (_id) {
-    dbUser = await db.get(_id)
-  }
-
-  // get the password, make sure one is defined
-  let hashedPassword
-  if (password) {
-    hashedPassword = opts.hashPassword ? await utils.hash(password) : password
-  } else if (dbUser) {
-    hashedPassword = dbUser.password
-  } else if (opts.requirePassword) {
-    throw "Password must be specified."
-  }
-
-  _id = _id || dbUtils.generateGlobalUserID()
-  user = {
-    createdAt: Date.now(),
-    ...dbUser,
-    ...user,
-    _id,
-    password: hashedPassword,
-    tenantId,
-  }
-  // make sure the roles object is always present
-  if (!user.roles) {
-    user.roles = {}
-  }
-  // add the active status to a user if its not provided
-  if (user.status == null) {
-    user.status = constants.UserStatus.ACTIVE
-  }
-  try {
-    const putOpts = {
-      password: hashedPassword,
-      ...user,
-    }
-    if (opts.bulkCreate) {
-      return putOpts
-    }
-    // save the user to db
-    let response
-    const putUserFn = () => {
-      return db.put(user)
-    }
-    if (eventHelpers.isAddingBuilder(user, dbUser)) {
-      response = await quotas.addDeveloper(putUserFn)
-    } else {
-      response = await putUserFn()
-    }
-    user._rev = response.rev
-
-    await eventHelpers.handleSaveEvents(user, dbUser)
-
-    if (env.MULTI_TENANCY) {
-      const afterCreateTenant = () =>
-        migrations.backPopulateMigrations({
-          type: MigrationType.GLOBAL,
-          tenantId,
-        })
-      await tenancy.tryAddTenant(tenantId, _id, email, afterCreateTenant)
-    }
-    await cache.user.invalidateUser(response.id)
-    // let server know to sync user
-    await apps.syncUserInApps(user._id)
-
-    return {
-      _id: response.id,
-      _rev: response.rev,
-      email,
-    }
-  } catch (err: any) {
-    if (err.status === 409) {
-      throw "User exists already"
-    } else {
-      throw err
-    }
-  }
-}
-
-export const destroy = async (id: string, currentUser: any) => {
-  const db = tenancy.getGlobalDB()
-  const dbUser = await db.get(id)
-
-  if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
-    // root account holder can't be deleted from inside budibase
-    const email = dbUser.email
-    const account = await accounts.getAccount(email)
-    if (account) {
-      if (email === currentUser.email) {
-        throw new HTTPError('Please visit "Account" to delete this user', 400)
-      } else {
-        throw new HTTPError("Account holder cannot be deleted", 400)
-      }
-    }
-  }
-
-  await deprovisioning.removeUserFromInfoDB(dbUser)
-  await db.remove(dbUser._id, dbUser._rev)
-  await eventHelpers.handleDeleteEvents(dbUser)
-  await quotas.removeUser(dbUser)
-  await cache.user.invalidateUser(dbUser._id)
-  await sessions.invalidateSessions(dbUser._id)
-  // let server know to sync user
-  await apps.syncUserInApps(dbUser._id)
-}

package/src/tests/controllers.js

@@ -1,7 +0,0 @@
-module.exports = {
-  email: require("../api/controllers/global/email"),
-  workspaces: require("../api/controllers/global/workspaces"),
-  config: require("../api/controllers/global/configs"),
-  templates: require("../api/controllers/global/templates"),
-  users: require("../api/controllers/global/users"),
-}

package/src/tests/index.js

@@ -1,12 +0,0 @@
-const TestConfiguration = require("./TestConfiguration")
-const structures = require("./structures")
-const mocks = require("./mocks")
-const config = new TestConfiguration()
-const request = config.getRequest()
-
-module.exports = {
-  structures,
-  mocks,
-  config,
-  request,
-}

package/src/tests/mocks/email.js

@@ -1,10 +0,0 @@
-exports.mock = () => {
-  // mock the email system
-  const sendMailMock = jest.fn()
-  const nodemailer = require("nodemailer")
-  nodemailer.createTransport.mockReturnValue({
-    sendMail: sendMailMock,
-    verify: jest.fn(),
-  })
-  return sendMailMock
-}

package/src/tests/mocks/index.js

@@ -1,5 +0,0 @@
-const email = require("./email")
-
-module.exports = {
-  email,
-}

package/src/tests/structures/configs.js

@@ -1,76 +0,0 @@
-const { Configs } = require("../../constants")
-const { utils } = require("@budibase/backend-core")
-
-exports.oidc = conf => {
-  return {
-    type: Configs.OIDC,
-    config: {
-      configs: [
-        {
-          configUrl: "http://someconfigurl",
-          clientID: "clientId",
-          clientSecret: "clientSecret",
-          logo: "Microsoft",
-          name: "Active Directory",
-          uuid: utils.newid(),
-          activated: true,
-          ...conf,
-        },
-      ],
-    },
-  }
-}
-
-exports.google = conf => {
-  return {
-    type: Configs.GOOGLE,
-    config: {
-      clientID: "clientId",
-      clientSecret: "clientSecret",
-      activated: true,
-      ...conf,
-    },
-  }
-}
-
-exports.smtp = conf => {
-  return {
-    type: Configs.SMTP,
-    config: {
-      port: 12345,
-      host: "smtptesthost.com",
-      from: "testfrom@test.com",
-      subject: "Hello!",
-      secure: false,
-      ...conf,
-    },
-  }
-}
-
-exports.smtpEthereal = () => {
-  return {
-    type: Configs.SMTP,
-    config: {
-      port: 587,
-      host: "smtp.ethereal.email",
-      secure: false,
-      auth: {
-        user: "don.bahringer@ethereal.email",
-        pass: "yCKSH8rWyUPbnhGYk9",
-      },
-      connectionTimeout: 1000, // must be less than the jest default of 5000
-    },
-  }
-}
-
-exports.settings = conf => {
-  return {
-    type: Configs.SETTINGS,
-    config: {
-      platformUrl: "http://localhost:10000",
-      logoUrl: "",
-      company: "Budibase",
-      ...conf,
-    },
-  }
-}

package/src/tests/structures/index.js

@@ -1,12 +0,0 @@
-const configs = require("./configs")
-const users = require("./users")
-
-const TENANT_ID = "default"
-const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306"
-
-module.exports = {
-  configs,
-  users,
-  TENANT_ID,
-  CSRF_TOKEN,
-}

package/src/tests/structures/users.ts

@@ -1,28 +0,0 @@
-export const email = "test@test.com"
-
-export const user = (userProps: any) => {
-  return {
-    email: "test@test.com",
-    password: "test",
-    roles: {},
-    ...userProps,
-  }
-}
-
-export const adminUser = (userProps: any) => {
-  return {
-    ...user(userProps),
-    admin: {
-      global: true,
-    },
-  }
-}
-
-export const builderUser = (userProps: any) => {
-  return {
-    ...user(userProps),
-    builder: {
-      global: true,
-    },
-  }
-}

package/tsconfig.build.json

@@ -1,25 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "lib": ["es2020"],
-    "allowJs": true,
-    "strict": true,
-    "noImplicitAny": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "incremental": true,
-    "types": [ "node", "jest" ],
-    "outDir": "dist",
-    "skipLibCheck": true
-  },
-  "include": [
-    "src/**/*"
-  ],
-  "exclude": [
-    "node_modules",
-    "dist",
-    "**/*.spec.ts",
-    "**/*.spec.js"
-  ]
-}