diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts index 601f47b511..06013d230c 100644 --- a/packages/server/src/api/controllers/row/external.ts +++ b/packages/server/src/api/controllers/row/external.ts @@ -92,25 +92,6 @@ export async function patch(ctx: UserCtx) { } } -export async function find(ctx: UserCtx): Promise { - const id = ctx.params.rowId - const tableId = utils.getTableId(ctx) - const row = await sdk.rows.external.getRow(tableId, id, { - relationships: true, - }) - - if (!row) { - ctx.throw(404) - } - - const table = await sdk.tables.getTable(tableId) - // Preserving links, as the outputProcessing does not support external rows yet and we don't need it in this use case - return await outputProcessing(table, row, { - squash: true, - preserveLinks: true, - }) -} - export async function destroy(ctx: UserCtx) { const tableId = utils.getTableId(ctx) const _id = ctx.request.body._id diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts index 760b73f404..f3165f7f86 100644 --- a/packages/server/src/api/controllers/row/index.ts +++ b/packages/server/src/api/controllers/row/index.ts @@ -117,7 +117,9 @@ export async function fetch(ctx: any) { export async function find(ctx: UserCtx) { const tableId = utils.getTableId(ctx) - ctx.body = await pickApi(tableId).find(ctx) + const rowId = ctx.params.rowId + + ctx.body = await sdk.rows.find(tableId, rowId) } function isDeleteRows(input: any): input is DeleteRows { @@ -278,7 +280,8 @@ export async function downloadAttachment(ctx: UserCtx) { const { columnName } = ctx.params const tableId = utils.getTableId(ctx) - const row = await pickApi(tableId).find(ctx) + const rowId = ctx.params.rowId + const row = await sdk.rows.find(tableId, rowId) const table = await sdk.tables.getTable(tableId) const columnSchema = table.schema[columnName] diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts index 54d9b6a536..b2982a3542 100644 --- a/packages/server/src/api/controllers/row/internal.ts +++ b/packages/server/src/api/controllers/row/internal.ts @@ -32,7 +32,7 @@ export async function patch(ctx: UserCtx) { try { oldRow = await outputProcessing( dbTable, - await utils.findRow(ctx, tableId, inputs._id!) + await utils.findRow(tableId, inputs._id!) ) } catch (err) { if (isUserTable) { @@ -96,15 +96,6 @@ export async function patch(ctx: UserCtx) { return { ...result, oldRow } } -export async function find(ctx: UserCtx): Promise { - const tableId = utils.getTableId(ctx), - rowId = ctx.params.rowId - const table = await sdk.tables.getTable(tableId) - let row = await utils.findRow(ctx, tableId, rowId) - row = await outputProcessing(table, row) - return row -} - export async function destroy(ctx: UserCtx) { const db = context.getAppDB() const tableId = utils.getTableId(ctx) @@ -195,7 +186,7 @@ export async function fetchEnrichedRow(ctx: UserCtx) { sdk.tables.getTable(tableId), linkRows.getLinkDocuments({ tableId, rowId, fieldName }), ]) - let row = await utils.findRow(ctx, tableId, rowId) + let row = await utils.findRow(tableId, rowId) row = await outputProcessing(table, row) const linkVals = links as LinkDocumentValue[] diff --git a/packages/server/src/api/controllers/row/utils/utils.ts b/packages/server/src/api/controllers/row/utils/utils.ts index ae34034221..911cfe8d5b 100644 --- a/packages/server/src/api/controllers/row/utils/utils.ts +++ b/packages/server/src/api/controllers/row/utils/utils.ts @@ -1,5 +1,5 @@ import { InternalTables } from "../../../../db/utils" -import * as userController from "../../user" + import { context } from "@budibase/backend-core" import { Ctx, @@ -8,7 +8,6 @@ import { RelationshipsJson, Row, Table, - UserCtx, } from "@budibase/types" import { processDates, @@ -24,6 +23,7 @@ import { import sdk from "../../../../sdk" import { processStringSync } from "@budibase/string-templates" import validateJs from "validate.js" +import { getFullUser } from "../../../../utilities/users" validateJs.extend(validateJs.validators.datetime, { parse: function (value: string) { @@ -63,16 +63,12 @@ export async function processRelationshipFields( return row } -export async function findRow(ctx: UserCtx, tableId: string, rowId: string) { +export async function findRow(tableId: string, rowId: string) { const db = context.getAppDB() let row: Row // TODO remove special user case in future if (tableId === InternalTables.USER_METADATA) { - ctx.params = { - id: rowId, - } - await userController.findMetadata(ctx) - row = ctx.body + row = await getFullUser(rowId) } else { row = await db.get(rowId) } diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts index 8cabdf5e0f..7ed4c7d640 100644 --- a/packages/server/src/api/routes/tests/row.spec.ts +++ b/packages/server/src/api/routes/tests/row.spec.ts @@ -36,6 +36,7 @@ import { generator, mocks } from "@budibase/backend-core/tests" import _, { merge } from "lodash" import * as uuid from "uuid" import { Knex } from "knex" +import { InternalTables } from "../../../db/utils" const timestamp = new Date("2023-01-26T11:48:57.597Z").toISOString() tk.freeze(timestamp) @@ -804,6 +805,23 @@ describe.each([ status: 404, }) }) + + isInternal && + it("can search row from user table", async () => { + const res = await config.api.row.get( + InternalTables.USER_METADATA, + config.userMetadataId! + ) + + expect(res).toEqual({ + ...config.getUser(), + _id: config.userMetadataId!, + _rev: expect.any(String), + roles: undefined, + roleId: "ADMIN", + tableId: InternalTables.USER_METADATA, + }) + }) }) describe("fetch", () => { diff --git a/packages/server/src/sdk/app/rows/external.ts b/packages/server/src/sdk/app/rows/external.ts index 7ad5ea37ff..9ab1362606 100644 --- a/packages/server/src/sdk/app/rows/external.ts +++ b/packages/server/src/sdk/app/rows/external.ts @@ -1,4 +1,5 @@ import { IncludeRelationship, Operation, Row } from "@budibase/types" +import { HTTPError } from "@budibase/backend-core" import { handleRequest } from "../../../api/controllers/row/external" import { breakRowIdField } from "../../../integrations/utils" import sdk from "../../../sdk" @@ -53,7 +54,7 @@ export async function save( const rowId = response.row._id if (rowId) { - const row = await sdk.rows.external.getRow(tableId, rowId, { + const row = await getRow(tableId, rowId, { relationships: true, }) return { @@ -67,3 +68,20 @@ export async function save( return response } } + +export async function find(tableId: string, rowId: string): Promise { + const row = await getRow(tableId, rowId, { + relationships: true, + }) + + if (!row) { + throw new HTTPError("Row not found", 404) + } + + const table = await sdk.tables.getTable(tableId) + // Preserving links, as the outputProcessing does not support external rows yet and we don't need it in this use case + return await outputProcessing(table, row, { + squash: true, + preserveLinks: true, + }) +} diff --git a/packages/server/src/sdk/app/rows/internal.ts b/packages/server/src/sdk/app/rows/internal.ts index 14e771b36e..c21d3465a7 100644 --- a/packages/server/src/sdk/app/rows/internal.ts +++ b/packages/server/src/sdk/app/rows/internal.ts @@ -1,10 +1,15 @@ -import { db } from "@budibase/backend-core" +import { context, db } from "@budibase/backend-core" import { Row } from "@budibase/types" import sdk from "../../../sdk" import cloneDeep from "lodash/fp/cloneDeep" import { finaliseRow } from "../../../api/controllers/row/staticFormula" -import { inputProcessing } from "../../../utilities/rowProcessor" +import { + inputProcessing, + outputProcessing, +} from "../../../utilities/rowProcessor" import * as linkRows from "../../../db/linkedRows" +import { InternalTables } from "../../../db/utils" +import { getFullUser } from "../../../utilities/users" export async function save( tableId: string, @@ -47,3 +52,26 @@ export async function save( updateFormula: true, }) } + +export async function find(tableId: string, rowId: string): Promise { + const table = await sdk.tables.getTable(tableId) + let row = await findRow(tableId, rowId) + + row = await outputProcessing(table, row) + return row +} + +async function findRow(tableId: string, rowId: string) { + const db = context.getAppDB() + let row: Row + // TODO remove special user case in future + if (tableId === InternalTables.USER_METADATA) { + row = await getFullUser(rowId) + } else { + row = await db.get(rowId) + } + if (row.tableId !== tableId) { + throw "Supplied tableId does not match the rows tableId" + } + return row +} diff --git a/packages/server/src/sdk/app/rows/rows.ts b/packages/server/src/sdk/app/rows/rows.ts index bfd84a715c..ef03210800 100644 --- a/packages/server/src/sdk/app/rows/rows.ts +++ b/packages/server/src/sdk/app/rows/rows.ts @@ -34,3 +34,7 @@ export async function save( ) { return pickApi(tableId).save(tableId, row, userId) } + +export async function find(tableId: string, rowId: string) { + return pickApi(tableId).find(tableId, rowId) +}