Skip to content

fix: get the teamId from the query in the auth middleware #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
j-zimnowoda merged 1 commit into from
Apr 17, 2025
Merged

fix: get the teamId from the query in the auth middleware #698

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/middleware/authz.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* eslint-disable no-param-reassign */
import { debug } from 'console'
import { RequestHandler } from 'express'
import { find } from 'lodash'
import get from 'lodash/get'
import Authz, { getTeamSelfServiceAuthz } from 'src/authz'
import { OpenApiRequestExt, PermissionSchema, TeamSelfService } from 'src/otomi-models'
import OtomiStack from 'src/otomi-stack'
import { cleanEnv } from 'src/validators'
import { getSessionStack } from './session'
import { RepoService } from '../services/RepoService'
import { debug } from 'console'
import { find } from 'lodash'
import { getSessionStack } from './session'

const HttpMethodMapping: Record<string, string> = {
DELETE: 'delete',
Expand Down Expand Up @@ -41,11 +41,8 @@ function renameKeys(obj: Record<string, any>) {
// }

export function authorize(req: OpenApiRequestExt, res, next, authz: Authz, repoService: RepoService): RequestHandler {
const {
params: { teamId },
body,
user,
} = req
const { params, query, body, user } = req
const teamId = params?.teamId ?? query?.teamId
const action = HttpMethodMapping[req.method]
const schema: string = get(req, 'operationDoc.x-aclSchema', '')
const schemaName = schema.split('/').pop() || null
Expand Down
Loading