Skip to content

Commit

Permalink
Merge pull request #737 from gchq/feature/get-current-user
Browse files Browse the repository at this point in the history
  • Loading branch information
a3957273 authored Sep 25, 2023
2 parents b032bbc + 197f863 commit 8b43de3
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
3 changes: 2 additions & 1 deletion backend/src/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ import { patchTeam } from './routes/v2/team/getMyTeams.js'
import { getTeam } from './routes/v2/team/getTeam.js'
import { getTeams } from './routes/v2/team/getTeams.js'
import { postTeam } from './routes/v2/team/postTeam.js'
import { getCurrentUser } from './routes/v2/user/getCurrentUser.js'
import config from './utils/config.js'
import logger, { expressErrorHandler, expressLogger } from './utils/logger.js'
import { getUser } from './utils/user.js'
Expand Down Expand Up @@ -244,7 +245,7 @@ if (config.experimental.v2) {
// server.get('/api/v2/teams/:teamId/roles/:memberId', ...getTeamMemberRoles)

// server.get('/api/v2/users', ...getUsers)
// server.get('/api/v2/users/me', ...getCurrentUser)
server.get('/api/v2/users/me', ...getCurrentUser)

// server.post('/api/v2/user/:userId/tokens', ...postUserToken)
// server.get('/api/v2/user/:userId/tokens', ...getUserTokens)
Expand Down
21 changes: 21 additions & 0 deletions backend/src/routes/v2/user/getCurrentUser.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import bodyParser from 'body-parser'
import { Request, Response } from 'express'
import { z } from 'zod'

import { UserDoc } from '../../../models/v2/User.js'
import { parse } from '../../../utils/validate.js'

export const getCurrentUserSchema = z.object({})

interface GetCurrentUser {
user: UserDoc
}

export const getCurrentUser = [
bodyParser.json(),
async (req: Request, res: Response<GetCurrentUser>) => {
const _ = parse(req, getCurrentUserSchema)

return res.json({ user: req.user })
},
]

0 comments on commit 8b43de3

Please sign in to comment.