diff --git a/packages/types/src/sdk/user.ts b/packages/types/src/sdk/user.ts index a126d49e34..2b970da1a9 100644 --- a/packages/types/src/sdk/user.ts +++ b/packages/types/src/sdk/user.ts @@ -1,11 +1,3 @@ -export interface UpdateSelf { - firstName?: string - lastName?: string - password?: string - forceResetPassword?: boolean - onboardedAt?: string -} - export interface SaveUserOpts { hashPassword?: boolean requirePassword?: boolean diff --git a/packages/worker/src/api/controllers/global/self.ts b/packages/worker/src/api/controllers/global/self.ts index 2e7044da37..78e5bf7164 100644 --- a/packages/worker/src/api/controllers/global/self.ts +++ b/packages/worker/src/api/controllers/global/self.ts @@ -10,12 +10,7 @@ import { } from "@budibase/backend-core" import env from "../../../environment" import { groups } from "@budibase/pro" -import { - UpdateSelfRequest, - UpdateSelfResponse, - UpdateSelf, - UserCtx, -} from "@budibase/types" +import { UpdateSelfRequest, UpdateSelfResponse, UserCtx } from "@budibase/types" const { getCookie, clearCookie, newid } = utils function newTestApiKey() { @@ -122,13 +117,14 @@ export async function getSelf(ctx: any) { export async function updateSelf( ctx: UserCtx ) { - const body = ctx.request.body + const update = ctx.request.body - const update: UpdateSelf = { - ...body, + let user = await userSdk.getUser(ctx.user._id!) + user = { + ...user, + ...update, } - - const user = await userSdk.updateSelf(ctx.user._id!, update) + user = await userSdk.save(user, { requirePassword: false }) if (update.password) { // Log all other sessions out apart from the current one diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts index c8295ff400..c686690367 100644 --- a/packages/worker/src/sdk/users/users.ts +++ b/packages/worker/src/sdk/users/users.ts @@ -29,7 +29,6 @@ import { PlatformUserByEmail, RowResponse, SearchUsersRequest, - UpdateSelf, User, SaveUserOpts, } from "@budibase/types" @@ -227,15 +226,6 @@ export async function isPreventPasswordActions(user: User) { return !!(account && isSSOAccount(account)) } -export async function updateSelf(id: string, data: UpdateSelf) { - let user = await getUser(id) - user = { - ...user, - ...data, - } - return save(user, { requirePassword: false }) -} - export const save = async ( user: User, opts: SaveUserOpts = {}