♻️ Update scopes in controllers

staart · Nov 2, 2020 · b490af1 · b490af1
1 parent f39edda
commit b490af1
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/src/modules/access-tokens/access-tokens.controller.ts b/src/modules/access-tokens/access-tokens.controller.ts
@@ -29,7 +29,7 @@ export class AccessTokenController {
   constructor(private accessTokensService: AccessTokensService) {}
 
   @Post()
-  @Scopes('user-{userId}:write-access-token')
+  @Scopes('user-{userId}:write-access-token-*')
   async create(
     @Param('userId', ParseIntPipe) userId: number,
     @Body() data: CreateAccessTokenDto,
@@ -38,7 +38,7 @@ export class AccessTokenController {
   }
 
   @Get()
-  @Scopes('user-{userId}:read-access-token')
+  @Scopes('user-{userId}:read-access-token-*')
   async getAll(
     @Param('userId', ParseIntPipe) userId: number,
     @Query('skip', OptionalIntPipe) skip?: number,

diff --git a/src/modules/api-keys/api-keys.controller.ts b/src/modules/api-keys/api-keys.controller.ts
@@ -29,7 +29,7 @@ export class ApiKeyController {
   constructor(private apiKeysService: ApiKeysService) {}
 
   @Post()
-  @Scopes('group-{groupId}:write-api-key')
+  @Scopes('group-{groupId}:write-api-key-*')
   async create(
     @Param('groupId', ParseIntPipe) groupId: number,
     @Body() data: CreateApiKeyDto,
@@ -38,7 +38,7 @@ export class ApiKeyController {
   }
 
   @Get()
-  @Scopes('group-{groupId}:read-api-key')
+  @Scopes('group-{groupId}:read-api-key-*')
   async getAll(
     @Param('groupId', ParseIntPipe) groupId: number,
     @Query('skip', OptionalIntPipe) skip?: number,

diff --git a/src/modules/approved-subnets/approved-subnets.controller.ts b/src/modules/approved-subnets/approved-subnets.controller.ts
@@ -20,7 +20,7 @@ export class ApprovedSubnetController {
   constructor(private approvedSubnetsService: ApprovedSubnetsService) {}
 
   @Get()
-  @Scopes('user-{userId}:read-approved-location')
+  @Scopes('user-{userId}:read-approved-subnet-*')
   async getAll(
     @Param('userId', ParseIntPipe) userId: number,
     @Query('skip', OptionalIntPipe) skip?: number,
@@ -39,7 +39,7 @@ export class ApprovedSubnetController {
   }
 
   @Get(':id')
-  @Scopes('user-{userId}:read-approved-location-{id}')
+  @Scopes('user-{userId}:read-approved-subnet-{id}')
   async get(
     @Param('userId', ParseIntPipe) userId: number,
     @Param('id', ParseIntPipe) id: number,
@@ -48,7 +48,7 @@ export class ApprovedSubnetController {
   }
 
   @Delete(':id')
-  @Scopes('user-{userId}:delete-approved-location-{id}')
+  @Scopes('user-{userId}:delete-approved-subnet-{id}')
   async remove(
     @Param('userId', ParseIntPipe) userId: number,
     @Param('id', ParseIntPipe) id: number,

diff --git a/src/modules/emails/emails.controller.ts b/src/modules/emails/emails.controller.ts
@@ -23,7 +23,7 @@ export class EmailController {
   constructor(private emailsService: EmailsService) {}
 
   @Post()
-  @Scopes('user-{userId}:write-email')
+  @Scopes('user-{userId}:write-email-*')
   async create(
     @Param('userId', ParseIntPipe) userId: number,
     @Body() data: CreateEmailDto,
@@ -32,7 +32,7 @@ export class EmailController {
   }
 
   @Get()
-  @Scopes('user-{userId}:read-email')
+  @Scopes('user-{userId}:read-email-*')
   async getAll(
     @Param('userId', ParseIntPipe) userId: number,
     @Query('skip', OptionalIntPipe) skip?: number,

diff --git a/src/modules/groups/groups.controller.ts b/src/modules/groups/groups.controller.ts
@@ -24,7 +24,7 @@ export class GroupController {
   constructor(private groupsService: GroupsService) {}
 
   @Get()
-  @Scopes('group:read')
+  @Scopes('group-*:read-info')
   async getAll(
     @Query('skip', OptionalIntPipe) skip?: number,
     @Query('take', OptionalIntPipe) take?: number,

diff --git a/src/modules/memberships/memberships-group.controller.ts b/src/modules/memberships/memberships-group.controller.ts
@@ -28,7 +28,7 @@ export class GroupMembershipController {
   constructor(private membershipsService: MembershipsService) {}
 
   @Post()
-  @Scopes('group-{groupId}:write-membership')
+  @Scopes('group-{groupId}:write-membership-*')
   async create(
     @Ip() ip: string,
     @Param('groupId', ParseIntPipe) groupId: number,
@@ -38,7 +38,7 @@ export class GroupMembershipController {
   }
 
   @Get()
-  @Scopes('group-{groupId}:read-membership')
+  @Scopes('group-{groupId}:read-membership-*')
   async getAll(
     @Param('groupId', ParseIntPipe) groupId: number,
     @Query('skip', OptionalIntPipe) skip?: number,
@@ -66,7 +66,7 @@ export class GroupMembershipController {
   }
 
   @Patch(':id')
-  @Scopes('group-{groupId}:read-membership-{id}')
+  @Scopes('group-{groupId}:write-membership-{id}')
   async update(
     @Body() data: UpdateMembershipDto,
     @Param('groupId', ParseIntPipe) groupId: number,

diff --git a/src/modules/multi-factor-authentication/multi-factor-authentication.controller.ts b/src/modules/multi-factor-authentication/multi-factor-authentication.controller.ts
@@ -31,7 +31,7 @@ export class MultiFactorAuthenticationController {
   }
 
   @Delete()
-  @Scopes('user-{userId}:delete-mfa')
+  @Scopes('user-{userId}:delete-mfa-*')
   async disable2FA(
     @Param('userId', ParseIntPipe) userId: number,
   ): Promise<Expose<users>> {

diff --git a/src/modules/sessions/sessions.controller.ts b/src/modules/sessions/sessions.controller.ts
@@ -20,7 +20,7 @@ export class SessionController {
   constructor(private sessionsService: SessionsService) {}
 
   @Get()
-  @Scopes('user-{userId}:read-session')
+  @Scopes('user-{userId}:read-session-*')
   async getAll(
     @Param('userId', ParseIntPipe) userId: number,
     @Query('skip', OptionalIntPipe) skip?: number,

diff --git a/src/modules/stripe/stripe-invoices.controller.ts b/src/modules/stripe/stripe-invoices.controller.ts
@@ -10,7 +10,7 @@ export class StripeBillingController {
   constructor(private stripeService: StripeService) {}
 
   @Get()
-  @Scopes('group-{groupId}:read-invoice')
+  @Scopes('group-{groupId}:read-invoice-*')
   async getAll(
     @Param('groupId', ParseIntPipe) groupId: number,
     @Query('take', OptionalIntPipe) take?: number,

diff --git a/src/modules/stripe/stripe-sources.controller.ts b/src/modules/stripe/stripe-sources.controller.ts
@@ -18,15 +18,15 @@ export class StripeBillingController {
   constructor(private stripeService: StripeService) {}
 
   @Post()
-  @Scopes('group-{groupId}:write-source')
+  @Scopes('group-{groupId}:write-source-*')
   async create(
     @Param('groupId', ParseIntPipe) groupId: number,
   ): Promise<Stripe.Checkout.Session> {
     return this.stripeService.createSession(groupId, 'setup');
   }
 
   @Get()
-  @Scopes('group-{groupId}:read-source')
+  @Scopes('group-{groupId}:read-source-*')
   async getAll(
     @Param('groupId', ParseIntPipe) groupId: number,
     @Query('take', OptionalIntPipe) take?: number,

diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts
@@ -23,7 +23,7 @@ export class UserController {
   constructor(private usersService: UsersService) {}
 
   @Get()
-  @Scopes('user:read')
+  @Scopes('user-*:read-info')
   async getAll(
     @Query('skip', OptionalIntPipe) skip?: number,
     @Query('take', OptionalIntPipe) take?: number,