MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into trace-automations

This commit is contained in:
Sam Rose 2023-12-19 17:14:17 +00:00 committed by GitHub
parent 4105e085c6 3ed739f7de
commit e4512c8004
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/server/src/middleware/currentapp.ts
View File

@ -23,7 +23,7 @@ export default async (ctx: UserCtx, next: any) => {
if (requestAppId) { if (requestAppId) {
const span = tracer.scope().active() const span = tracer.scope().active()
span?.addTags({ app_id: requestAppId }) span?.setBaggageItem("appId", requestAppId)
} }
// deny access to application preview // deny access to application preview
@ -76,6 +76,14 @@ export default async (ctx: UserCtx, next: any) => {
return next() return next()
} }
if (ctx.user) {
const span = tracer.scope().active()
if (ctx.user._id) {
span?.setBaggageItem("userId", ctx.user._id)
}
span?.setBaggageItem("tenantId", ctx.user.tenantId)
}
const userId = ctx.user ? generateUserMetadataID(ctx.user._id!) : undefined const userId = ctx.user ? generateUserMetadataID(ctx.user._id!) : undefined
// if the user is not in the right tenant then make sure to wipe their cookie // if the user is not in the right tenant then make sure to wipe their cookie