CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-10-03 10:36:59 +13:00
Code Issues Projects Releases Wiki Activity

Type request and body

Browse source
This commit is contained in:
Adria Navarro 2023-01-16 10:15:00 +00:00
parent 23266bd456
commit 946cc35ff7
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/server/src/api/controllers/user.ts
View file

@ -7,10 +7,10 @@ import {
roles as rolesCore, roles as rolesCore,
db as dbCore, db as dbCore,
} from "@budibase/backend-core" } from "@budibase/backend-core"
import { BBContext, Ctx, isUser, User } from "@budibase/types" import { BBContext, Ctx, SyncUserRequest, User } from "@budibase/types"
import sdk from "../../sdk" import sdk from "../../sdk"
export async function syncUser(ctx: Ctx) { export async function syncUser(ctx: Ctx<SyncUserRequest>) {
let deleting = false, let deleting = false,
user: User | any user: User | any
const userId = ctx.params.id const userId = ctx.params.id
@ -28,10 +28,9 @@ export async function syncUser(ctx: Ctx) {
} }
} }
let previousApps = let previousApps = previousUser
previousUser && isUser(previousUser) ? Object.keys(previousUser.roles).map(appId => appId)
? Object.keys(previousUser.roles).map(appId => appId) : []
: []
const roles = deleting ? {} : user.roles const roles = deleting ? {} : user.roles
// remove props which aren't useful to metadata // remove props which aren't useful to metadata

4
packages/types/src/api/web/user.ts
View file

@ -57,3 +57,7 @@ export interface CreateAdminUserRequest {
password: string password: string
tenantId: string tenantId: string
} }
export interface SyncUserRequest {
previousUser?: User
}

8
packages/worker/src/utilities/appService.ts
View file

@ -2,7 +2,7 @@ import fetch from "node-fetch"
import { constants, tenancy } from "@budibase/backend-core" import { constants, tenancy } from "@budibase/backend-core"
import { checkSlashesInUrl } from "../utilities" import { checkSlashesInUrl } from "../utilities"
import env from "../environment" import env from "../environment"
import { User } from "@budibase/types" import { SyncUserRequest, User } from "@budibase/types"
async function makeAppRequest(url: string, method: string, body: any) { async function makeAppRequest(url: string, method: string, body: any) {
if (env.isTest()) { if (env.isTest()) {
@ -22,10 +22,14 @@ async function makeAppRequest(url: string, method: string, body: any) {
} }
export async function syncUserInApps(userId: string, previousUser?: User) { export async function syncUserInApps(userId: string, previousUser?: User) {
const body: SyncUserRequest = {
previousUser,
}
const response = await makeAppRequest( const response = await makeAppRequest(
`/api/users/metadata/sync/${userId}`, `/api/users/metadata/sync/${userId}`,
"POST", "POST",
{ previousUser } body
) )
if (response && response.status !== 200) { if (response && response.status !== 200) {
throw "Unable to sync user." throw "Unable to sync user."