@budibase/worker 1.3.19 → 1.3.21-alpha.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.19",
+  "version": "1.3.21-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.3.19",
-    "@budibase/pro": "1.3.18",
-    "@budibase/string-templates": "^1.3.19",
-    "@budibase/types": "^1.3.19",
+    "@budibase/backend-core": "1.3.21-alpha.0",
+    "@budibase/pro": "1.3.20",
+    "@budibase/string-templates": "1.3.21-alpha.0",
+    "@budibase/types": "1.3.21-alpha.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -104,5 +104,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "1e621da16bad75ae6a2dfcd732e676cf0b56a2a4"
+  "gitHead": "95d427cdf7f197a1da5cb8029d3906e46b96f100"
 }

package/scripts/localdomain.js

@@ -17,7 +17,9 @@ const arg = process.argv.slice(2)[0]
  */
 updateDotEnv({
   ACCOUNT_PORTAL_URL:
-    arg === "enable" ? "http://local.com:10001" : "http://localhost:10001",
+    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",

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

@@ -16,6 +16,11 @@ const { newid } = require("@budibase/backend-core/utils")
 const { users } = require("../../../sdk")
 const { Cookies } = require("@budibase/backend-core/constants")
 const { events, featureFlags } = require("@budibase/backend-core")
+const env = require("../../../environment")
+
+function newTestApiKey() {
+  return env.ENCRYPTED_TEST_PUBLIC_API_KEY
+}
 
 function newApiKey() {
   return encrypt(`${getTenantId()}${SEPARATOR}${newid()}`)
@@ -29,15 +34,25 @@ function cleanupDevInfo(info) {
 }
 
 exports.generateAPIKey = async ctx => {
+  let userId
+  let apiKey
+  if (env.isTest() && ctx.request.body.userId) {
+    userId = ctx.request.body.userId
+    apiKey = newTestApiKey()
+  } else {
+    userId = ctx.user._id
+    apiKey = newApiKey()
+  }
+
   const db = getGlobalDB()
-  const id = generateDevInfoID(ctx.user._id)
+  const id = generateDevInfoID(userId)
   let devInfo
   try {
     devInfo = await db.get(id)
   } catch (err) {
-    devInfo = { _id: id, userId: ctx.user._id }
+    devInfo = { _id: id, userId }
   }
-  devInfo.apiKey = await newApiKey()
+  devInfo.apiKey = await apiKey
   await db.put(devInfo)
   ctx.body = cleanupDevInfo(devInfo)
 }
@@ -80,16 +95,15 @@ const addSessionAttributesToUser = ctx => {
   ctx.body.csrfToken = ctx.user.csrfToken
 }
 
-/**
- * Remove the attributes that are session based from the current user,
- * so that stale values are not written to the db
- */
-const removeSessionAttributesFromUser = ctx => {
-  delete ctx.request.body.csrfToken
-  delete ctx.request.body.account
-  delete ctx.request.body.accountPortalAccess
-  delete ctx.request.body.budibaseAccess
-  delete ctx.request.body.license
+const sanitiseUserUpdate = ctx => {
+  const allowed = ["firstName", "lastName", "password", "forceResetPassword"]
+  const resp = {}
+  for (let [key, value] of Object.entries(ctx.request.body)) {
+    if (allowed.includes(key)) {
+      resp[key] = value
+    }
+  }
+  return resp
 }
 
 exports.getSelf = async ctx => {
@@ -117,10 +131,12 @@ exports.updateSelf = async ctx => {
   const db = getGlobalDB()
   const user = await db.get(ctx.user._id)
   let passwordChange = false
-  if (ctx.request.body.password) {
+
+  const userUpdateObj = sanitiseUserUpdate(ctx)
+  if (userUpdateObj.password) {
     // changing password
     passwordChange = true
-    ctx.request.body.password = await hash(ctx.request.body.password)
+    userUpdateObj.password = await hash(userUpdateObj.password)
     // Log all other sessions out apart from the current one
     await platformLogout({
       ctx,
@@ -128,14 +144,10 @@ exports.updateSelf = async ctx => {
       keepActiveSession: true,
     })
   }
-  // don't allow sending up an ID/Rev, always use the existing one
-  delete ctx.request.body._id
-  delete ctx.request.body._rev
-  removeSessionAttributesFromUser(ctx)
 
   const response = await db.put({
     ...user,
-    ...ctx.request.body,
+    ...userUpdateObj,
   })
   await userCache.invalidateUser(user._id)
   ctx.body = {
@@ -144,6 +156,7 @@ exports.updateSelf = async ctx => {
   }
 
   // remove the old password from the user before sending events
+  user._rev = response.rev
   delete user.password
   await events.user.updated(user)
   if (passwordChange) {

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

@@ -14,7 +14,6 @@ import {
   errors,
   events,
   tenancy,
-  users as usersCore,
 } from "@budibase/backend-core"
 import { checkAnyUserExists } from "../../../utilities/users"
 import { groups as groupUtils } from "@budibase/pro"
@@ -148,9 +147,7 @@ export const bulkDelete = async (ctx: any) => {
   }
 
   try {
-    let response = await users.bulkDelete(userIds)
-
-    ctx.body = response
+    ctx.body = await users.bulkDelete(userIds)
   } catch (err) {
     ctx.throw(err)
   }

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

@@ -1,5 +1,5 @@
 jest.mock("nodemailer")
-import { TestConfiguration, API } from "../../../../tests"
+import { TestConfiguration, API, mocks } from "../../../../tests"
 import { events } from "@budibase/backend-core"
 
 describe("/api/global/self", () => {
@@ -26,6 +26,9 @@ describe("/api/global/self", () => {
       delete user.password
       const res = await api.self.updateSelf(user)
 
+      const dbUser = await config.getUser(user.email)
+      user._rev = dbUser._rev
+      user.dayPassRecordedAt = mocks.date.MOCK_DATE.toISOString()
       expect(res.body._id).toBe(user._id)
       expect(events.user.updated).toBeCalledTimes(1)
       expect(events.user.updated).toBeCalledWith(user)
@@ -39,6 +42,9 @@ describe("/api/global/self", () => {
       user.password = "newPassword"
       const res = await api.self.updateSelf(user)
 
+      const dbUser = await config.getUser(user.email)
+      user._rev = dbUser._rev
+      user.dayPassRecordedAt = mocks.date.MOCK_DATE.toISOString()
       delete user.password
       expect(res.body._id).toBe(user._id)
       expect(events.user.updated).toBeCalledTimes(1)

package/src/environment.ts

@@ -63,6 +63,7 @@ const env = {
   // other
   CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 3600,
   SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD,
+  ENCRYPTED_TEST_PUBLIC_API_KEY: process.env.ENCRYPTED_TEST_PUBLIC_API_KEY,
   _set(key: any, value: any) {
     process.env[key] = value
     module.exports[key] = value

package/src/sdk/users/events.ts

@@ -1,6 +1,7 @@
 import env from "../../environment"
 import { events, accounts, tenancy } from "@budibase/backend-core"
 import { User, UserRoles, CloudAccount } from "@budibase/types"
+import { users as pro } from "@budibase/pro"
 
 export const handleDeleteEvents = async (user: any) => {
   await events.user.deleted(user)
@@ -51,7 +52,10 @@ const handleAppRoleEvents = async (user: any, existingUser: any) => {
   await unassignAppRoleEvents(user, roles, existingRoles)
 }
 
-export const handleSaveEvents = async (user: any, existingUser: any) => {
+export const handleSaveEvents = async (
+  user: User,
+  existingUser: User | undefined
+) => {
   const tenantId = tenancy.getTenantId()
   let tenantAccount: CloudAccount | undefined
   if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {

package/src/sdk/users/users.ts

@@ -1,37 +1,35 @@
 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,
+  accounts,
   cache,
-  users as usersCore,
+  constants,
+  db as dbUtils,
   deprovisioning,
-  sessions,
+  events,
   HTTPError,
-  accounts,
   migrations,
-  StaticDatabases,
+  sessions,
+  tenancy,
+  users as usersCore,
+  utils,
   ViewName,
-  events,
 } from "@budibase/backend-core"
 import {
-  MigrationType,
-  PlatformUserByEmail,
-  User,
+  AccountMetadata,
+  AllDocsResponse,
   BulkCreateUsersResponse,
-  CreateUserResponse,
   BulkDeleteUsersResponse,
-  CloudAccount,
-  AllDocsResponse,
-  RowResponse,
   BulkDocsResponse,
-  AccountMetadata,
+  CloudAccount,
+  CreateUserResponse,
   InviteUsersRequest,
   InviteUsersResponse,
+  MigrationType,
+  PlatformUserByEmail,
+  RowResponse,
+  User,
 } from "@budibase/types"
 import { groups as groupUtils } from "@budibase/pro"
 import { sendEmail } from "../../utilities/email"
@@ -120,7 +118,7 @@ interface SaveUserOpts {
 }
 
 const buildUser = async (
-  user: any,
+  user: User,
   opts: SaveUserOpts = {
     hashPassword: true,
     requirePassword: true,
@@ -230,16 +228,7 @@ export const save = async (
 
   try {
     // save the user to db
-    let response
-    const putUserFn = () => {
-      return db.put(builtUser)
-    }
-
-    if (eventHelpers.isAddingBuilder(builtUser, dbUser)) {
-      response = await quotas.addDeveloper(putUserFn)
-    } else {
-      response = await putUserFn()
-    }
+    let response = await db.put(builtUser)
     builtUser._rev = response.rev
 
     await eventHelpers.handleSaveEvents(builtUser, dbUser)
@@ -388,13 +377,8 @@ export const bulkCreate = async (
     newUsers.push(newUser)
   }
 
-  // Figure out how many builders we are adding and create the promises
-  // array that will be called by bulkDocs
-  let builderCount = 0
+  // create the promises array that will be called by bulkDocs
   newUsers.forEach((user: any) => {
-    if (eventHelpers.isAddingBuilder(user, null)) {
-      builderCount++
-    }
     usersToSave.push(
       buildUser(
         user,
@@ -408,14 +392,14 @@ export const bulkCreate = async (
   })
 
   const usersToBulkSave = await Promise.all(usersToSave)
-  await quotas.addDevelopers(() => db.bulkDocs(usersToBulkSave), builderCount)
+  await db.bulkDocs(usersToBulkSave)
 
   // Post processing of bulk added users, i.e events and cache operations
   for (const user of usersToBulkSave) {
     // TODO: Refactor to bulk insert users into the info db
     // instead of relying on looping tenant creation
     await addTenant(tenantId, user._id, user.email)
-    await eventHelpers.handleSaveEvents(user, null)
+    await eventHelpers.handleSaveEvents(user, undefined)
     await apps.syncUserInApps(user._id)
   }
 
@@ -475,8 +459,6 @@ export const bulkDelete = async (
   }
 
   let groupsToModify: any = {}
-  let builderCount = 0
-
   // Get users and delete
   const allDocsResponse: AllDocsResponse<User> = await db.allDocs({
     include_docs: true,
@@ -497,11 +479,6 @@ export const bulkDelete = async (
         }
       }
 
-      // Also figure out how many builders are being deleted
-      if (eventHelpers.isAddingBuilder(user.doc, null)) {
-        builderCount++
-      }
-
       return user.doc
     }
   )
@@ -519,7 +496,6 @@ export const bulkDelete = async (
   for (let user of usersToDelete) {
     await bulkDeleteProcessing(user)
   }
-  await quotas.removeDevelopers(builderCount)
 
   // Build Response
   // index users by id
@@ -574,7 +550,6 @@ export const destroy = async (id: string, currentUser: any) => {
   }
 
   await eventHelpers.handleDeleteEvents(dbUser)
-  await quotas.removeUser(dbUser)
   await cache.user.invalidateUser(userId)
   await sessions.invalidateSessions(userId, { reason: "deletion" })
   // let server know to sync user

package/src/tests/api/users.ts

@@ -2,10 +2,9 @@ import {
   BulkCreateUsersRequest,
   BulkCreateUsersResponse,
   BulkDeleteUsersRequest,
-  CreateUserResponse,
+  BulkDeleteUsersResponse,
   InviteUsersRequest,
   User,
-  UserDetails,
 } from "@budibase/types"
 import TestConfiguration from "../TestConfiguration"