@budibase/server 3.23.32 → 3.23.33

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "3.23.32",
+  "version": "3.23.33",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -224,5 +224,5 @@
       }
     }
   },
-  "gitHead": "c4036828c6d04e94946d835c5fad5ec0620a93e1"
+  "gitHead": "55fe087a49347cd0633bffefafeb91fe421c6506"
 }

package/src/api/controllers/workspace.ts

@@ -55,6 +55,9 @@ import { createOnboardingWelcomeScreen } from "../../constants/screens"
 import { buildDefaultDocs } from "../../db/defaultData/datasource_bb_default"
 import {
   DocumentType,
+  InternalTables,
+  USER_METDATA_PREFIX,
+  generateUserMetadataID,
   generateWorkspaceID,
   getDevWorkspaceID,
   getLayoutParams,
@@ -81,6 +84,7 @@ import { removeWorkspaceFromUserRoles } from "../../utilities/workerRequests"
 import { builderSocket } from "../../websockets"
 import * as workspaceMigrations from "../../workspaceMigrations"
 import { processMigrations } from "../../workspaceMigrations/migrationsProcessor"
+import { getGlobalUser } from "../../utilities/global"
 
 const DEFAULT_WORKSPACE_NAME = "Default workspace"
 
@@ -175,6 +179,53 @@ async function createInstance(appId: string, template: AppTemplate) {
   return { _id: appId }
 }
 
+function getCreatorMetadataId(ctx: UserCtx) {
+  const userId = ctx.user?._id
+  if (!userId) {
+    return
+  }
+  if (userId.startsWith(USER_METDATA_PREFIX)) {
+    return userId
+  }
+  return generateUserMetadataID(userId)
+}
+
+async function addCreatorToUsersTable(ctx: UserCtx) {
+  const metadataId = getCreatorMetadataId(ctx)
+  if (!metadataId) {
+    return
+  }
+  const db = context.getWorkspaceDB()
+  try {
+    await db.get(metadataId)
+    return
+  } catch (err: any) {
+    if (err.status && err.status !== 404) {
+      throw err
+    }
+  }
+
+  let creator
+  try {
+    creator = await getGlobalUser(metadataId)
+  } catch (err) {
+    return
+  }
+
+  if (!creator.roleId || creator.roleId === roles.BUILTIN_ROLE_IDS.PUBLIC) {
+    creator.roleId = roles.BUILTIN_ROLE_IDS.ADMIN
+  }
+
+  const metadata = sdk.users.combineMetadataAndUser(creator, [])
+  if (!metadata) {
+    return
+  }
+
+  metadata.tableId = InternalTables.USER_METADATA
+  metadata._id = metadataId
+  await db.put(metadata)
+}
+
 async function addSampleDataDocs() {
   const db = context.getWorkspaceDB()
   try {
@@ -399,6 +450,8 @@ async function performWorkspaceCreate(
     const db = context.getWorkspaceDB()
     const isImport = !!instanceConfig.file
 
+    await addCreatorToUsersTable(ctx)
+
     if (instanceConfig.useTemplate && !instanceConfig.file) {
       await updateUserColumns(workspaceId, db, ctx.user._id!)
     }

package/src/api/routes/tests/workspace.spec.ts

@@ -1,4 +1,5 @@
 import { DEFAULT_TABLES } from "../../../db/defaultData/datasource_bb_default"
+import { USERS_TABLE_SCHEMA } from "../../../constants"
 import { setEnv, withEnv } from "../../../environment"
 
 import { Header, context, db, events, roles } from "@budibase/backend-core"
@@ -172,6 +173,20 @@ describe("/applications", () => {
       await checkTableCount(1) // users table
     })
 
+    it("adds the workspace creator to the dev users table", async () => {
+      const creator = config.getUser()
+      const newWorkspace = await config.api.workspace.create({
+        name: generateAppName(),
+      })
+
+      await config.withApp(newWorkspace, async () => {
+        const rows = await config.api.row.fetch(USERS_TABLE_SCHEMA._id!)
+        const userRow = rows.find(row => row.email === creator.email)
+        expect(userRow).toBeDefined()
+        expect(userRow?.roleId).toEqual(roles.BUILTIN_ROLE_IDS.ADMIN)
+      })
+    })
+
     it("creates app with sample data when onboarding", async () => {
       const name = "Welcome app"
       const newWorkspace = await config.api.workspace.create({