diff --git a/packages/backend/src/controllers/api/v1/users/get-current-user.js b/packages/backend/src/controllers/api/v1/users/get-current-user.js new file mode 100644 index 00000000..70081688 --- /dev/null +++ b/packages/backend/src/controllers/api/v1/users/get-current-user.js @@ -0,0 +1,5 @@ +import { renderObject } from '../../../../helpers/renderer.js'; + +export default async (request, response) => { + renderObject(response, request.currentUser); +}; diff --git a/packages/backend/src/controllers/api/v1/users/get-current-user.test.js b/packages/backend/src/controllers/api/v1/users/get-current-user.test.js new file mode 100644 index 00000000..7d33b244 --- /dev/null +++ b/packages/backend/src/controllers/api/v1/users/get-current-user.test.js @@ -0,0 +1,26 @@ +import { describe, it, expect, beforeEach } from 'vitest'; +import request from 'supertest'; +import app from '../../../../app.js'; +import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id'; +import { createUser } from '../../../../../test/factories/user'; +import userPayload from '../../../../../test/payloads/user'; + +describe('GET /api/v1/users/me', () => { + let role, currentUser, token; + + beforeEach(async () => { + currentUser = await createUser(); + role = await currentUser.$relatedQuery('role'); + token = createAuthTokenByUserId(currentUser.id); + }); + + it('should return current user info', async () => { + const response = await request(app) + .get('/api/v1/users/me') + .set('Authorization', token) + .expect(200); + + const expectedPayload = userPayload(currentUser, role); + expect(response.body).toEqual(expectedPayload); + }); +}); diff --git a/packages/backend/src/helpers/authentication.js b/packages/backend/src/helpers/authentication.js index b3ca3b9e..010856ee 100644 --- a/packages/backend/src/helpers/authentication.js +++ b/packages/backend/src/helpers/authentication.js @@ -28,6 +28,14 @@ export const isAuthenticated = async (_parent, _args, req) => { } }; +export const authenticateUser = async (request, response, next) => { + if (await isAuthenticated(null, null, request)) { + next(); + } else { + return response.status(401).end(); + } +}; + const isAuthenticatedRule = rule()(isAuthenticated); export const authenticationRules = { diff --git a/packages/backend/src/models/user.js b/packages/backend/src/models/user.js index b1a82a71..16eda3c2 100644 --- a/packages/backend/src/models/user.js +++ b/packages/backend/src/models/user.js @@ -143,6 +143,17 @@ class User extends Base { }, }); + $formatJson(json) { + json = super.$formatJson(json); + + delete json.password; + delete json.deletedAt; + delete json.resetPasswordToken; + delete json.resetPasswordTokenSentAt; + + return json; + } + login(password) { return bcrypt.compare(password, this.password); } diff --git a/packages/backend/src/routes/api/v1/users.js b/packages/backend/src/routes/api/v1/users.js new file mode 100644 index 00000000..2bd2ab94 --- /dev/null +++ b/packages/backend/src/routes/api/v1/users.js @@ -0,0 +1,9 @@ +import { Router } from 'express'; +import { authenticateUser } from '../../../helpers/authentication.js'; +import getCurrentUserAction from '../../../controllers/api/v1/users/get-current-user.js'; + +const router = Router(); + +router.get('/me', authenticateUser, getCurrentUserAction); + +export default router; diff --git a/packages/backend/src/routes/index.js b/packages/backend/src/routes/index.js index 7d1d2bdf..215a7326 100644 --- a/packages/backend/src/routes/index.js +++ b/packages/backend/src/routes/index.js @@ -4,6 +4,7 @@ import webhooksRouter from './webhooks.js'; import paddleRouter from './paddle.ee.js'; import healthcheckRouter from './healthcheck.js'; import automatischRouter from './api/v1/automatisch.js'; +import usersRouter from './api/v1/users.js'; const router = Router(); @@ -12,5 +13,6 @@ router.use('/webhooks', webhooksRouter); router.use('/paddle', paddleRouter); router.use('/healthcheck', healthcheckRouter); router.use('/api/v1/automatisch', automatischRouter); +router.use('/api/v1/users', usersRouter); export default router; diff --git a/packages/backend/test/payloads/user.js b/packages/backend/test/payloads/user.js new file mode 100644 index 00000000..073dde49 --- /dev/null +++ b/packages/backend/test/payloads/user.js @@ -0,0 +1,32 @@ +const userPayload = (currentUser, role) => { + return { + data: { + createdAt: currentUser.createdAt.toISOString(), + email: currentUser.email, + fullName: currentUser.fullName, + id: currentUser.id, + permissions: [], + role: { + createdAt: role.createdAt.toISOString(), + description: null, + id: role.id, + isAdmin: role.isAdmin, + key: role.key, + name: role.name, + updatedAt: role.updatedAt.toISOString(), + }, + roleId: role.id, + trialExpiryDate: currentUser.trialExpiryDate.toISOString(), + updatedAt: currentUser.updatedAt.toISOString(), + }, + meta: { + count: 1, + currentPage: null, + isArray: false, + totalPages: null, + type: 'User', + }, + }; +}; + +export default userPayload;