diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts index f6db44b90..8b0e82c86 100644 --- a/backend/src/auth/RIGHTS.ts +++ b/backend/src/auth/RIGHTS.ts @@ -37,21 +37,21 @@ export enum RIGHTS { LIST_ALL_CONTRIBUTION_MESSAGES = 'LIST_ALL_CONTRIBUTION_MESSAGES', OPEN_CREATIONS = 'OPEN_CREATIONS', // Admin - ADMIN_SEARCH_USERS = 'SEARCH_USERS', - ADMIN_SET_USER_ROLE = 'SET_USER_ROLE', - ADMIN_DELETE_USER = 'DELETE_USER', - ADMIN_UNDELETE_USER = 'UNDELETE_USER', + SEARCH_USERS = 'SEARCH_USERS', + SET_USER_ROLE = 'SET_USER_ROLE', + DELETE_USER = 'DELETE_USER', + UNDELETE_USER = 'UNDELETE_USER', ADMIN_CREATE_CONTRIBUTION = 'ADMIN_CREATE_CONTRIBUTION', ADMIN_UPDATE_CONTRIBUTION = 'ADMIN_UPDATE_CONTRIBUTION', ADMIN_DELETE_CONTRIBUTION = 'ADMIN_DELETE_CONTRIBUTION', - ADMIN_LIST_UNCONFIRMED_CONTRIBUTIONS = 'LIST_UNCONFIRMED_CONTRIBUTIONS', - ADMIN_CONFIRM_CONTRIBUTION = 'CONFIRM_CONTRIBUTION', - ADMIN_SEND_ACTIVATION_EMAIL = 'SEND_ACTIVATION_EMAIL', - ADMIN_CREATION_TRANSACTION_LIST = 'CREATION_TRANSACTION_LIST', - ADMIN_LIST_TRANSACTION_LINKS_ADMIN = 'LIST_TRANSACTION_LINKS_ADMIN', - ADMIN_CREATE_CONTRIBUTION_LINK = 'CREATE_CONTRIBUTION_LINK', - ADMIN_DELETE_CONTRIBUTION_LINK = 'DELETE_CONTRIBUTION_LINK', - ADMIN_UPDATE_CONTRIBUTION_LINK = 'UPDATE_CONTRIBUTION_LINK', + LIST_UNCONFIRMED_CONTRIBUTIONS = 'LIST_UNCONFIRMED_CONTRIBUTIONS', + CONFIRM_CONTRIBUTION = 'CONFIRM_CONTRIBUTION', + SEND_ACTIVATION_EMAIL = 'SEND_ACTIVATION_EMAIL', + CREATION_TRANSACTION_LIST = 'CREATION_TRANSACTION_LIST', + LIST_TRANSACTION_LINKS_ADMIN = 'LIST_TRANSACTION_LINKS_ADMIN', + CREATE_CONTRIBUTION_LINK = 'CREATE_CONTRIBUTION_LINK', + DELETE_CONTRIBUTION_LINK = 'DELETE_CONTRIBUTION_LINK', + UPDATE_CONTRIBUTION_LINK = 'UPDATE_CONTRIBUTION_LINK', ADMIN_CREATE_CONTRIBUTION_MESSAGE = 'ADMIN_CREATE_CONTRIBUTION_MESSAGE', - ADMIN_DENY_CONTRIBUTION = 'DENY_CONTRIBUTION', + DENY_CONTRIBUTION = 'DENY_CONTRIBUTION', } diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts index d3c77cb82..39f202848 100644 --- a/backend/src/graphql/resolver/ContributionLinkResolver.ts +++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts @@ -24,7 +24,7 @@ import LogError from '@/server/LogError' @Resolver() export class ContributionLinkResolver { - @Authorized([RIGHTS.ADMIN_CREATE_CONTRIBUTION_LINK]) + @Authorized([RIGHTS.CREATE_CONTRIBUTION_LINK]) @Mutation(() => ContributionLink) async createContributionLink( @Args() @@ -90,7 +90,7 @@ export class ContributionLinkResolver { } } - @Authorized([RIGHTS.ADMIN_DELETE_CONTRIBUTION_LINK]) + @Authorized([RIGHTS.DELETE_CONTRIBUTION_LINK]) @Mutation(() => Date, { nullable: true }) async deleteContributionLink(@Arg('id', () => Int) id: number): Promise { const contributionLink = await DbContributionLink.findOne(id) @@ -103,7 +103,7 @@ export class ContributionLinkResolver { return newContributionLink ? newContributionLink.deletedAt : null } - @Authorized([RIGHTS.ADMIN_UPDATE_CONTRIBUTION_LINK]) + @Authorized([RIGHTS.UPDATE_CONTRIBUTION_LINK]) @Mutation(() => ContributionLink) async updateContributionLink( @Args() diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 0d27739f9..1b8d24d2b 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -390,7 +390,7 @@ export class ContributionResolver { return result } - @Authorized([RIGHTS.ADMIN_LIST_UNCONFIRMED_CONTRIBUTIONS]) + @Authorized([RIGHTS.LIST_UNCONFIRMED_CONTRIBUTIONS]) @Query(() => ContributionListResult) // [UnconfirmedContribution] async adminListAllContributions( @Args() @@ -461,7 +461,7 @@ export class ContributionResolver { return !!res } - @Authorized([RIGHTS.ADMIN_CONFIRM_CONTRIBUTION]) + @Authorized([RIGHTS.CONFIRM_CONTRIBUTION]) @Mutation(() => Boolean) async confirmContribution( @Arg('id', () => Int) id: number, @@ -566,7 +566,7 @@ export class ContributionResolver { return true } - @Authorized([RIGHTS.ADMIN_CREATION_TRANSACTION_LIST]) + @Authorized([RIGHTS.CREATION_TRANSACTION_LIST]) @Query(() => ContributionListResult) async creationTransactionList( @Args() @@ -612,7 +612,7 @@ export class ContributionResolver { }) } - @Authorized([RIGHTS.ADMIN_DENY_CONTRIBUTION]) + @Authorized([RIGHTS.DENY_CONTRIBUTION]) @Mutation(() => Boolean) async denyContribution( @Arg('id', () => Int) id: number, diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts index 66d0fbb4b..ab5b52bad 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -336,7 +336,7 @@ export class TransactionLinkResolver { ) } - @Authorized([RIGHTS.ADMIN_LIST_TRANSACTION_LINKS_ADMIN]) + @Authorized([RIGHTS.LIST_TRANSACTION_LINKS_ADMIN]) @Query(() => TransactionLinkResult) async listTransactionLinksAdmin( @Args() diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 67f263709..4ca2889e2 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -640,7 +640,7 @@ export class UserResolver { } } - @Authorized([RIGHTS.ADMIN_SEARCH_USERS]) + @Authorized([RIGHTS.SEARCH_USERS]) @Query(() => SearchUsersResult) async searchUsers( @Args() @@ -706,7 +706,7 @@ export class UserResolver { } } - @Authorized([RIGHTS.ADMIN_SET_USER_ROLE]) + @Authorized([RIGHTS.SET_USER_ROLE]) @Mutation(() => Date, { nullable: true }) async setUserRole( @Arg('userId', () => Int) @@ -748,7 +748,7 @@ export class UserResolver { return newUser ? newUser.isAdmin : null } - @Authorized([RIGHTS.ADMIN_DELETE_USER]) + @Authorized([RIGHTS.DELETE_USER]) @Mutation(() => Date, { nullable: true }) async deleteUser( @Arg('userId', () => Int) userId: number, @@ -770,7 +770,7 @@ export class UserResolver { return newUser ? newUser.deletedAt : null } - @Authorized([RIGHTS.ADMIN_UNDELETE_USER]) + @Authorized([RIGHTS.UNDELETE_USER]) @Mutation(() => Date, { nullable: true }) async unDeleteUser(@Arg('userId', () => Int) userId: number): Promise { const user = await DbUser.findOne({ id: userId }, { withDeleted: true }) @@ -785,7 +785,7 @@ export class UserResolver { } // TODO this is an admin function - needs refactor - @Authorized([RIGHTS.ADMIN_SEND_ACTIVATION_EMAIL]) + @Authorized([RIGHTS.SEND_ACTIVATION_EMAIL]) @Mutation(() => Boolean) async sendActivationEmail( @Arg('email') email: string,