Skip to content
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.

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

Added a condition to determine whether the user is a member of the team #97

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/domain/entities/team.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { NoteInternalId } from './note.js';
import type User from './user.js';


export enum MemberRole {
/**
* Team member can read and write notes
Expand Down
6 changes: 6 additions & 0 deletions src/presentation/http/fastify.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type Policies from './policies/index.js';
import type AuthPayload from '@domain/entities/authPayload.js';
import type { Note } from '@domain/entities/note.js';
import type NoteSettings from '@domain/entities/noteSettings.js';
import type { Team, TeamMember } from '@domain/entities/team';

declare module 'fastify' {
export interface FastifyInstance<
Expand Down Expand Up @@ -62,6 +63,11 @@ declare module 'fastify' {
* This property added by noteSettingsResolver middleware
*/
noteSettings: NoteSettings | null;

/**
* This property added by teamMemberIdResolver middleware
*/
teamMemberId: TeamMember['id'] | null;
}

/**
Expand Down
13 changes: 11 additions & 2 deletions src/presentation/http/policies/userInTeam.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ export default async function userInTeam(request: FastifyRequest, reply: Fastify

if (isEmpty(userId)) {
return await reply.unauthorized();
};
}

/**
* If note is not resolved, we can't check permissions
*/
if (isEmpty(request.note)) {
return await reply.notAcceptable('Note not found');
};
}

const { creatorId } = request.note;

Expand All @@ -30,4 +30,13 @@ export default async function userInTeam(request: FastifyRequest, reply: Fastify
if (creatorId !== userId) {
return await reply.forbidden();
}

const { teamMemberId } = request;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you need to add this property to request (if it is required for most requests), or access domain service from there


/**
* Checking if user is part of the team
*/
if (userId !== teamMemberId) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

non-creator user will never pass there, because previous if will reject him

return await reply.forbidden();
}
}