feat: delete organization invitations

apps/api-gateway/src/organization/organization.controller.ts

@@ -3,7 +3,7 @@ import { CommonService } from '@credebl/common';
 import { Controller, Get, Put, Param, UseGuards, UseFilters, Post, Body, Res, HttpStatus, Query, Delete } from '@nestjs/common';
 import { OrganizationService } from './organization.service';
 import { CreateOrganizationDto } from './dtos/create-organization-dto';
-import IResponseType from '@credebl/common/interfaces/response.interface';
+import IResponseType, { IResponse } from '@credebl/common/interfaces/response.interface';
 import { Response } from 'express';
 import { ApiResponseDto } from '../dtos/apiResponse.dto';
 import { UnauthorizedErrorDto } from '../dtos/unauthorized-error.dto';
@@ -372,4 +372,23 @@ export class OrganizationController {
     };
     return res.status(HttpStatus.ACCEPTED).json(finalResponse);
   }
+
+  @Delete('/:orgId/invitations/:invitationId')
+  @ApiOperation({ summary: 'Delete organization invitation', description: 'Delete organization invitation' })
+  @ApiResponse({ status: HttpStatus.OK, description: 'Success', type: ApiResponseDto })
+  @ApiBearerAuth()
+  @Roles(OrgRoles.OWNER, OrgRoles.ADMIN)
+  @UseGuards(AuthGuard('jwt'), OrgRolesGuard)
+  async deleteOrganizationInvitation(
+    @Param('orgId') orgId: string, 
+    @Param('invitationId') invitationId: string, 
+    @Res() res: Response
+    ): Promise<Response> {
+    await this.organizationService.deleteOrganizationInvitation(orgId, invitationId);
+    const finalResponse: IResponse = {
+      statusCode: HttpStatus.OK,
+      message: ResponseMessages.organisation.success.orgInvitationDeleted
+    };
+    return res.status(HttpStatus.OK).json(finalResponse);
+  }
 }

apps/api-gateway/src/organization/organization.service.ts

@@ -158,4 +158,12 @@ export class OrganizationService extends BaseService {
 
     return this.sendNatsMessage(this.serviceProxy, 'delete-organization', payload);
   }
+
+  async deleteOrganizationInvitation(
+    orgId: string,
+    invitationId: string
+  ): Promise<boolean> {
+    const payload = {orgId, invitationId};
+    return this.sendNatsMessage(this.serviceProxy, 'delete-organization-invitation', payload);
+  }
 }

apps/organization/repositories/organization.repository.ts

@@ -585,4 +585,23 @@ export class OrganizationRepository {
     }
   }
 
+
+  /**
+   *
+   * @param id
+   * @returns Delete Invitation
+   */
+  async deleteOrganizationInvitation(id: string): Promise<org_invitations> {
+    try {
+      return await this.prisma.org_invitations.delete({
+        where: {
+          id
+        }
+      });
+    } catch (error) {
+      this.logger.error(`Delete Org Invitation Error: ${JSON.stringify(error)}`);
+      throw error;
+    }
+  }
+
 }

apps/organization/src/organization.controller.ts

@@ -165,4 +165,9 @@ export class OrganizationController {
   async deleteOrganization(payload: { orgId: string }): Promise<boolean> {
     return this.organizationService.deleteOrganization(payload.orgId);
   }
+
+  @MessagePattern({ cmd: 'delete-organization-invitation' })
+  async deleteOrganizationInvitation(payload: { orgId: string; invitationId: string; }): Promise<boolean> {
+    return this.organizationService.deleteOrganizationInvitation(payload.orgId, payload.invitationId);
+  }
 }

apps/organization/src/organization.service.ts

@@ -1,6 +1,5 @@
-// eslint-disable-next-line camelcase
 import { organisation, user } from '@prisma/client';
-import { Injectable, Logger, ConflictException, InternalServerErrorException, HttpException } from '@nestjs/common';
+import { Injectable, Logger, ConflictException, InternalServerErrorException, HttpException, BadRequestException, ForbiddenException } from '@nestjs/common';
 import { PrismaService } from '@credebl/prisma-service';
 import { CommonService } from '@credebl/common';
 import { OrganizationRepository } from '../repositories/organization.repository';
@@ -565,4 +564,32 @@ export class OrganizationService {
       throw error;
     }
   }
+
+  async deleteOrganizationInvitation(orgId: string, invitationId: string): Promise<boolean> {
+    try {      
+      const invitationDetails = await this.organizationRepository.getInvitationById(invitationId);
+
+      // Check invitation is present
+      if (!invitationDetails) {
+        throw new NotFoundException(ResponseMessages.user.error.invitationNotFound);
+      }
+
+      // Check if delete process initiated by the org who has created invitation      
+      if (orgId !== invitationDetails.orgId) {
+        throw new ForbiddenException(ResponseMessages.organisation.error.deleteOrgInvitation);
+      }
+
+      // Check if invitation is already accepted/rejected
+      if (Invitation.PENDING !== invitationDetails.status) {
+        throw new BadRequestException(ResponseMessages.organisation.error.invitationStatusInvalid);
+      }
+
+      await this.organizationRepository.deleteOrganizationInvitation(invitationId);
+
+      return true;
+    } catch (error) {
+      this.logger.error(`delete organization invitation: ${JSON.stringify(error)}`);
+      throw new RpcException(error.response ? error.response : error);
+    }
+  }
 }

libs/common/src/response-messages/index.ts

@@ -58,7 +58,8 @@ export const ResponseMessages = {
             getOrgDashboard: 'Organization dashboard details fetched',
             getOrganizations: 'Organizations details fetched successfully',
             updateUserRoles: 'User roles updated successfully',
-            delete: 'Organization deleted successfully'
+            delete: 'Organization deleted successfully',
+            orgInvitationDeleted: 'Organization invitation deleted successfully'
         },
         error: {
             exists: 'An organization name is already exist',
@@ -68,10 +69,11 @@ export const ResponseMessages = {
             userNotFound: 'User not found for the given organization',
             updateUserRoles: 'Unable to update user roles',
             deleteOrg: 'Organization not found',
+            deleteOrgInvitation: 'Organization does not have access to delete this invitation',
             notFound: 'Organization agent not found',
+            invitationStatusInvalid: 'Unable to delete invitation with accepted/rejected status',
             orgNotFound: 'Organization not found'
         }
-
     },
 
     fido: {