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.

Sign up for GitHub

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

Jump to bottom

fix: added ecosystem id in endorsement APIs #138

Merged
merged 3 commits into from
Oct 10, 2023
Merged

fix: added ecosystem id in endorsement APIs #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb824c0
fix: added ecosystem id in endorsement APIs
tipusinghaw Oct 10, 2023
0a97301
Merge branch 'develop' of https://github.com/credebl/credebl-platform…
tipusinghaw Oct 10, 2023
d6c06f1
fix: added auth guard
tipusinghaw Oct 10, 2023
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
113 changes: 57 additions & 56 deletions apps/api-gateway/src/ecosystem/ecosystem.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ export class EcosystemController {
@Param('orgId') orgId: string,
@Query() getAllEndorsementsDto: GetAllEndorsementsDto,
@Res() res: Response
): Promise<Response> {
): Promise<Response> {

const ecosystemList = await this.ecosystemService.getEndorsementTranasactions(ecosystemId, orgId, getAllEndorsementsDto);
const finalResponse: IResponseType = {
statusCode: HttpStatus.OK,
Expand All @@ -88,7 +88,7 @@ export class EcosystemController {
async getEcosystem(
@Param('orgId') orgId: string,
@Res() res: Response
): Promise<Response> {
): Promise<Response> {
const ecosystemList = await this.ecosystemService.getAllEcosystem(orgId);
const finalResponse: IResponseType = {
statusCode: HttpStatus.OK,
Expand Down Expand Up @@ -128,7 +128,7 @@ export class EcosystemController {
@Query() getAllInvitationsDto: GetAllSentEcosystemInvitationsDto,
@Param('orgId') orgId: string,
@User() user: user, @Res() res: Response): Promise<Response> {

if (!Object.values(Invitation).includes(getAllInvitationsDto.status)) {
throw new BadRequestException(ResponseMessages.ecosystem.error.invalidInvitationStatus);
}
Expand Down Expand Up @@ -249,15 +249,15 @@ export class EcosystemController {
return res.status(HttpStatus.CREATED).json(finalResponse);
}

@Post('/:orgId/transaction/schema')
@Post('/:ecosystemId/:orgId/transaction/schema')
@ApiOperation({ summary: 'Request new schema', description: 'Request new schema' })
@ApiResponse({ status: 201, description: 'Success', type: ApiResponseDto })
@UseGuards(AuthGuard('jwt'), EcosystemRolesGuard, OrgRolesGuard)
@ApiBearerAuth()
@EcosystemsRoles(EcosystemRoles.ECOSYSTEM_OWNER, EcosystemRoles.ECOSYSTEM_LEAD)
@Roles(OrgRoles.OWNER, OrgRoles.ADMIN)
async requestSchemaTransaction(@Body() requestSchemaPayload: RequestSchemaDto, @Param('orgId') orgId: number, @Res() res: Response): Promise<Response> {
await this.ecosystemService.schemaEndorsementRequest(requestSchemaPayload, orgId);
@EcosystemsRoles(EcosystemRoles.ECOSYSTEM_MEMBER)
@Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER)
async requestSchemaTransaction(@Body() requestSchemaPayload: RequestSchemaDto, @Param('orgId') orgId: number, @Param('ecosystemId') ecosystemId: string, @Res() res: Response): Promise<Response> {
await this.ecosystemService.schemaEndorsementRequest(requestSchemaPayload, orgId, ecosystemId);
const finalResponse: IResponseType = {
statusCode: HttpStatus.CREATED,
message: ResponseMessages.ecosystem.success.schemaRequest
Expand All @@ -266,46 +266,47 @@ export class EcosystemController {
}


@Post('/:orgId/transaction/cred-def')
@Post('/:ecosystemId/:orgId/transaction/cred-def')
@ApiOperation({ summary: 'Request new credential-definition', description: 'Request new credential-definition' })
@ApiResponse({ status: 201, description: 'Success', type: ApiResponseDto })
@UseGuards(AuthGuard('jwt'), EcosystemRolesGuard, OrgRolesGuard)
@ApiBearerAuth()
@EcosystemsRoles(EcosystemRoles.ECOSYSTEM_OWNER, EcosystemRoles.ECOSYSTEM_LEAD)
@Roles(OrgRoles.OWNER, OrgRoles.ADMIN)
async requestCredDefTransaction(@Body() requestCredDefPayload: RequestCredDefDto, @Param('orgId') orgId: number, @Res() res: Response): Promise<Response> {
await this.ecosystemService.credDefEndorsementRequest(requestCredDefPayload, orgId);
@EcosystemsRoles(EcosystemRoles.ECOSYSTEM_MEMBER)
@Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER)
async requestCredDefTransaction(@Body() requestCredDefPayload: RequestCredDefDto, @Param('orgId') orgId: number, @Param('ecosystemId') ecosystemId: string, @Res() res: Response): Promise<Response> {
await this.ecosystemService.credDefEndorsementRequest(requestCredDefPayload, orgId, ecosystemId);
const finalResponse: IResponseType = {
statusCode: HttpStatus.CREATED,
message: ResponseMessages.ecosystem.success.schemaRequest
};
return res.status(HttpStatus.CREATED).json(finalResponse);
}
@Post('transaction/sign/:endorsementId')

@Post('/:ecosystemId/transaction/sign/:endorsementId')
@ApiOperation({ summary: 'Sign transaction', description: 'Sign transaction' })
@ApiResponse({ status: 201, description: 'Success', type: ApiResponseDto })
@UseGuards(AuthGuard('jwt'), EcosystemRolesGuard, OrgRolesGuard)
@ApiBearerAuth()
@EcosystemsRoles(EcosystemRoles.ECOSYSTEM_OWNER, EcosystemRoles.ECOSYSTEM_LEAD)
@EcosystemsRoles(EcosystemRoles.ECOSYSTEM_LEAD)
@Roles(OrgRoles.OWNER, OrgRoles.ADMIN)
async SignEndorsementRequests(@Param('endorsementId') endorsementId: string, @Res() res: Response): Promise<Response> {
await this.ecosystemService.signTransaction(endorsementId);
async SignEndorsementRequests(@Param('endorsementId') endorsementId: string, @Param('ecosystemId') ecosystemId: string, @Res() res: Response): Promise<Response> {
await this.ecosystemService.signTransaction(endorsementId, ecosystemId);
const finalResponse: IResponseType = {
statusCode: HttpStatus.CREATED,
message: ResponseMessages.ecosystem.success.sign
};
return res.status(HttpStatus.CREATED).json(finalResponse);
}

@Post('transaction/sumbit/:endorsementId')
@Post('/:ecosystemId/transaction/sumbit/:endorsementId')
@ApiOperation({ summary: 'Sumbit transaction', description: 'Sumbit transaction' })
@ApiResponse({ status: 201, description: 'Success', type: ApiResponseDto })
@UseGuards(AuthGuard('jwt'), EcosystemRolesGuard, OrgRolesGuard)
@ApiBearerAuth()
@EcosystemsRoles(EcosystemRoles.ECOSYSTEM_OWNER, EcosystemRoles.ECOSYSTEM_LEAD)
@Roles(OrgRoles.OWNER, OrgRoles.ADMIN)
async SumbitEndorsementRequests(@Param('endorsementId') endorsementId: string, @Res() res: Response): Promise<Response> {
await this.ecosystemService.submitTransaction(endorsementId);
@EcosystemsRoles(EcosystemRoles.ECOSYSTEM_MEMBER)
@Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER)
async SumbitEndorsementRequests(@Param('endorsementId') endorsementId: string, @Param('ecosystemId') ecosystemId: string, @Res() res: Response): Promise<Response> {
await this.ecosystemService.submitTransaction(endorsementId, ecosystemId);
const finalResponse: IResponseType = {
statusCode: HttpStatus.CREATED,
message: ResponseMessages.ecosystem.success.sign
Expand All @@ -331,9 +332,9 @@ export class EcosystemController {
@EcosystemsRoles(EcosystemRoles.ECOSYSTEM_OWNER, EcosystemRoles.ECOSYSTEM_LEAD)
@Roles(OrgRoles.OWNER, OrgRoles.ADMIN)
async createInvitation(@Body() bulkInvitationDto: BulkEcosystemInvitationDto,
@Param('ecosystemId') ecosystemId: string,
@Param('orgId') orgId: string,
@User() user: user, @Res() res: Response): Promise<Response> {
@Param('ecosystemId') ecosystemId: string,
@Param('orgId') orgId: string,
@User() user: user, @Res() res: Response): Promise<Response> {

bulkInvitationDto.ecosystemId = ecosystemId;
await this.ecosystemService.createInvitation(bulkInvitationDto, String(user.id));
Expand All @@ -347,33 +348,33 @@ export class EcosystemController {

}

/**
*
* @param acceptRejectEcosystemInvitation
* @param reqUser
* @param res
* @returns Ecosystem invitation status
*/
@Post('/:orgId/invitations/:invitationId')
@ApiOperation({
summary: 'Accept or reject ecosystem invitation',
description: 'Accept or Reject ecosystem invitations'
})
@UseGuards(AuthGuard('jwt'), OrgRolesGuard)
@ApiBearerAuth()
@Roles(OrgRoles.OWNER)
async acceptRejectEcosystemInvitaion(@Body() acceptRejectEcosystemInvitation: AcceptRejectEcosystemInvitationDto, @Param('orgId') orgId: string, @Param('invitationId') invitationId: string, @User() user: user, @Res() res: Response): Promise<object> {
acceptRejectEcosystemInvitation.orgId = orgId;
acceptRejectEcosystemInvitation.invitationId = invitationId;
/**
*
* @param acceptRejectEcosystemInvitation
* @param reqUser
* @param res
* @returns Ecosystem invitation status
*/
@Post('/:orgId/invitations/:invitationId')
@ApiOperation({
summary: 'Accept or reject ecosystem invitation',
description: 'Accept or Reject ecosystem invitations'
})
@UseGuards(AuthGuard('jwt'), OrgRolesGuard)
@ApiBearerAuth()
@Roles(OrgRoles.OWNER)
async acceptRejectEcosystemInvitaion(@Body() acceptRejectEcosystemInvitation: AcceptRejectEcosystemInvitationDto, @Param('orgId') orgId: string, @Param('invitationId') invitationId: string, @User() user: user, @Res() res: Response): Promise<object> {
acceptRejectEcosystemInvitation.orgId = orgId;
acceptRejectEcosystemInvitation.invitationId = invitationId;

const invitationRes = await this.ecosystemService.acceptRejectEcosystemInvitaion(acceptRejectEcosystemInvitation, user.email);
const invitationRes = await this.ecosystemService.acceptRejectEcosystemInvitaion(acceptRejectEcosystemInvitation, user.email);

const finalResponse: IResponseType = {
statusCode: HttpStatus.CREATED,
message: invitationRes.response
};
return res.status(HttpStatus.CREATED).json(finalResponse);
}
const finalResponse: IResponseType = {
statusCode: HttpStatus.CREATED,
message: invitationRes.response
};
return res.status(HttpStatus.CREATED).json(finalResponse);
}

@Put('/:ecosystemId/:orgId')
@ApiOperation({ summary: 'Edit ecosystem', description: 'Edit existing ecosystem' })
Expand All @@ -395,7 +396,7 @@ export class EcosystemController {
return res.status(HttpStatus.OK).json(finalResponse);
}


@Delete('/:ecosystemId/:orgId/invitations/:invitationId')
@ApiOperation({ summary: 'Delete ecosystem pending invitations', description: 'Delete ecosystem pending invitations' })
@ApiResponse({ status: 200, description: 'Success', type: ApiResponseDto })
Expand All @@ -404,11 +405,11 @@ export class EcosystemController {
@Roles(OrgRoles.OWNER)
@ApiBearerAuth()
async deleteEcosystemInvitations(
@Param('ecosystemId') ecosystemId: string,
@Param('invitationId') invitationId: string,
@Param('orgId') orgId: string,
@Param('ecosystemId') ecosystemId: string,
@Param('invitationId') invitationId: string,
@Param('orgId') orgId: string,
@Res() res: Response): Promise<Response> {

await this.ecosystemService.deleteEcosystemInvitations(invitationId);
const finalResponse: IResponseType = {
statusCode: HttpStatus.OK,
Expand Down
16 changes: 8 additions & 8 deletions apps/api-gateway/src/ecosystem/ecosystem.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,23 +130,23 @@ export class EcosystemService extends BaseService {
}


async schemaEndorsementRequest(requestSchemaPayload: RequestSchemaDto, orgId: number): Promise<object> {
const payload = { requestSchemaPayload, orgId};
async schemaEndorsementRequest(requestSchemaPayload: RequestSchemaDto, orgId: number, ecosystemId:string): Promise<object> {
const payload = { requestSchemaPayload, orgId, ecosystemId};
return this.sendNats(this.serviceProxy, 'schema-endorsement-request', payload);
}

async credDefEndorsementRequest(requestCredDefPayload: RequestCredDefDto, orgId: number): Promise<object> {
const payload = { requestCredDefPayload, orgId};
async credDefEndorsementRequest(requestCredDefPayload: RequestCredDefDto, orgId: number, ecosystemId:string): Promise<object> {
const payload = { requestCredDefPayload, orgId, ecosystemId};
return this.sendNats(this.serviceProxy, 'credDef-endorsement-request', payload);
}

async signTransaction(endorsementId:string): Promise<object> {
const payload = { endorsementId };
async signTransaction(endorsementId:string, ecosystemId:string): Promise<object> {
const payload = { endorsementId, ecosystemId };
return this.sendNats(this.serviceProxy, 'sign-endorsement-transaction', payload);
}

async submitTransaction(endorsementId:string): Promise<object> {
const payload = { endorsementId };
async submitTransaction(endorsementId:string, ecosystemId:string): Promise<object> {
const payload = { endorsementId, ecosystemId };
return this.sendNats(this.serviceProxy, 'sumbit-endorsement-transaction', payload);
}
}
8 changes: 7 additions & 1 deletion apps/ecosystem/interfaces/ecosystem.interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
export interface AttributeValue {
attributeName: string;
schemaDataType: string;
displayName: string;
}

export interface RequestSchemaEndorsement {
orgId: number
name: string;
version: string;
attributes: IAttributeValue[];
attributes: AttributeValue[];
endorse?: boolean;
}

Expand Down
16 changes: 8 additions & 8 deletions apps/ecosystem/src/ecosystem.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ export class EcosystemController {
*/
@MessagePattern({ cmd: 'schema-endorsement-request' })
async schemaEndorsementRequest(
@Body() payload: { requestSchemaPayload: RequestSchemaEndorsement; orgId: number }
@Body() payload: { requestSchemaPayload: RequestSchemaEndorsement; orgId: number, ecosystemId: string }
): Promise<object> {
return this.ecosystemService.requestSchemaEndorsement(payload.requestSchemaPayload, payload.orgId);
return this.ecosystemService.requestSchemaEndorsement(payload.requestSchemaPayload, payload.orgId, payload.ecosystemId);
}

/**
Expand All @@ -158,9 +158,9 @@ export class EcosystemController {
*/
@MessagePattern({ cmd: 'credDef-endorsement-request' })
async credDefEndorsementRequest(
@Body() payload: { requestCredDefPayload: RequestCredDeffEndorsement; orgId: number }
@Body() payload: { requestCredDefPayload: RequestCredDeffEndorsement; orgId: number; ecosystemId:string}
): Promise<object> {
return this.ecosystemService.requestCredDeffEndorsement(payload.requestCredDefPayload, payload.orgId);
return this.ecosystemService.requestCredDeffEndorsement(payload.requestCredDefPayload, payload.orgId, payload.ecosystemId);
}

/**
Expand All @@ -170,9 +170,9 @@ export class EcosystemController {
*/
@MessagePattern({ cmd: 'sign-endorsement-transaction' })
async signTransaction(
@Body() payload: { endorsementId: string }
@Body() payload: { endorsementId: string, ecosystemId:string }
): Promise<object> {
return this.ecosystemService.signTransaction(payload.endorsementId);
return this.ecosystemService.signTransaction(payload.endorsementId, payload.ecosystemId);
}

/**
Expand All @@ -182,8 +182,8 @@ export class EcosystemController {
*/
@MessagePattern({ cmd: 'sumbit-endorsement-transaction' })
async submitTransaction(
@Body() payload: { endorsementId: string }
@Body() payload: { endorsementId: string, ecosystemId:string }
): Promise<object> {
return this.ecosystemService.submitTransaction(payload.endorsementId);
return this.ecosystemService.submitTransaction(payload.endorsementId, payload.ecosystemId);
}
}
18 changes: 12 additions & 6 deletions apps/ecosystem/src/ecosystem.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { PrismaService } from '@credebl/prisma-service';
import { ecosystem, ecosystem_invitations, ecosystem_orgs, ecosystem_roles, endorsement_transaction, org_agents, platform_config } from '@prisma/client';
import { EcosystemInvitationStatus, EcosystemOrgStatus, EcosystemRoles, endorsementTransactionStatus, endorsementTransactionType } from '../enums/ecosystem.enum';
import { updateEcosystemOrgsDto } from '../dtos/update-ecosystemOrgs.dto';
import { SchemaTransactionResponse } from '../interfaces/ecosystem.interfaces';
import { SchemaTransactionResponse } from '../interfaces/ecosystem.interfaces';
import { ResponseMessages } from '@credebl/common/response-messages';
// eslint-disable-next-line camelcase

Expand Down Expand Up @@ -464,21 +464,25 @@ export class EcosystemRepository {
}

/**
* Description: Get getAgentEndPoint by orgId
* @param orgId
* Description: Get getAgentEndPoint by invalidEcosystemId
* @param invalidEcosystemId
* @returns Get getAgentEndPoint details
*/
// eslint-disable-next-line camelcase
async getEcosystemLeadDetails(): Promise<ecosystem_orgs> {
async getEcosystemLeadDetails(ecosystemId:string): Promise<ecosystem_orgs> {
try {
if (!ecosystemId) {
throw new InternalServerErrorException(ResponseMessages.ecosystem.error.invalidEcosystemId);
}
const ecosystemRoleDetails = await this.prisma.ecosystem_roles.findFirst({
where: {
name: EcosystemRoles.ECOSYSTEM_LEAD
}
});
const ecosystemLeadDetails = await this.prisma.ecosystem_orgs.findFirst({
where: {
ecosystemRoleId: ecosystemRoleDetails.id
ecosystemRoleId: ecosystemRoleDetails.id,
ecosystemId
}
});
return ecosystemLeadDetails;
Expand Down Expand Up @@ -507,6 +511,7 @@ export class EcosystemRepository {

async storeTransactionRequest(
schemaTransactionResponse: SchemaTransactionResponse,
requestBody: object,
type: endorsementTransactionType
): Promise<object> {
try {
Expand All @@ -519,7 +524,8 @@ export class EcosystemRepository {
status,
ecosystemOrgId,
responsePayload: '',
type
type,
requestBody
}
});
} catch (error) {
Expand Down
Loading