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

Refactor/error handling for multi tenancy controller #145

Merged
merged 8 commits into from
Jul 3, 2024
Merged

Refactor/error handling for multi tenancy controller #145

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
46eed8b
refactor: error handling of polygon controller
pranalidhanavade Jun 28, 2024
f216bf7
refactor: error handling of multi-tenancy-question-answer APIs
pranalidhanavade Jul 1, 2024
7a2f982
Merge branch 'develop' of https://github.com/credebl/credo-controller…
pranalidhanavade Jul 1, 2024
8948efc
refactor: error handling for did-key and did-web APIs of multi-tenanc…
pranalidhanavade Jul 2, 2024
0e27d44
resolved: comments on pull request
pranalidhanavade Jul 2, 2024
d1f0c4c
resolved: fixed comments on pull request
pranalidhanavade Jul 2, 2024
fddb796
refactor: error handling for proof APIs in multi-tenancy controller
pranalidhanavade Jul 2, 2024
23d4635
Merge branch 'develop' of https://github.com/credebl/credo-controller…
pranalidhanavade Jul 2, 2024
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
153 changes: 44 additions & 109 deletions src/controllers/multi-tenancy/MultiTenancyController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,11 +1354,7 @@ export class MultiTenancyController extends Controller {

@Security('apiKey')
@Post('/credentials/create-offer/:tenantId')
public async createOffer(
@Body() createOfferOptions: CreateOfferOptions,
@Path('tenantId') tenantId: string,
@Res() internalServerError: TsoaResponse<500, { message: string }>
) {
public async createOffer(@Body() createOfferOptions: CreateOfferOptions, @Path('tenantId') tenantId: string) {
let offer
try {
await this.agent.modules.tenants.withTenantAgent({ tenantId }, async (tenantAgent) => {
Expand All @@ -1372,17 +1368,13 @@ export class MultiTenancyController extends Controller {

return offer
} catch (error) {
return internalServerError(500, { message: `something went wrong: ${error}` })
throw ErrorHandlingService.handle(error)
}
}

@Security('apiKey')
@Post('/credentials/create-offer-oob/:tenantId')
public async createOfferOob(
@Path('tenantId') tenantId: string,
@Body() createOfferOptions: CreateOfferOobOptions,
@Res() internalServerError: TsoaResponse<500, { message: string }>
) {
public async createOfferOob(@Path('tenantId') tenantId: string, @Body() createOfferOptions: CreateOfferOobOptions) {
let createOfferOobRecord

try {
Expand Down Expand Up @@ -1447,15 +1439,13 @@ export class MultiTenancyController extends Controller {
})
return createOfferOobRecord
} catch (error) {
return internalServerError(500, { message: `something went wrong: ${error}` })
throw ErrorHandlingService.handle(error)
}
}

@Security('apiKey')
@Post('/credentials/accept-offer/:tenantId')
public async acceptOffer(
@Res() notFoundError: TsoaResponse<404, { reason: string }>,
@Res() internalServerError: TsoaResponse<500, { message: string }>,
@Path('tenantId') tenantId: string,
@Body() acceptCredentialOfferOptions: AcceptCredentialOfferOptions
) {
Expand All @@ -1476,23 +1466,15 @@ export class MultiTenancyController extends Controller {

return acceptOffer
} catch (error) {
if (error instanceof RecordNotFoundError) {
return notFoundError(404, {
reason: `credential with credential record id "${acceptCredentialOfferOptions.credentialRecordId}" not found.`,
})
}

return internalServerError(500, { message: `something went wrong: ${error}` })
throw ErrorHandlingService.handle(error)
}
}

@Security('apiKey')
@Get('/credentials/:credentialRecordId/:tenantId')
public async getCredentialById(
@Path('credentialRecordId') credentialRecordId: RecordId,
@Path('tenantId') tenantId: string,
@Res() notFoundError: TsoaResponse<404, { reason: string }>,
@Res() internalServerError: TsoaResponse<500, { message: string }>
@Path('tenantId') tenantId: string
) {
let credentialRecord
try {
Expand All @@ -1503,13 +1485,7 @@ export class MultiTenancyController extends Controller {

return credentialRecord
} catch (error) {
if (error instanceof RecordNotFoundError) {
return notFoundError(404, {
reason: `credential with credential record id "${credentialRecordId}" not found.`,
})
}

return internalServerError(500, { message: `something went wrong: ${error}` })
throw ErrorHandlingService.handle(error)
}
}

Expand All @@ -1522,65 +1498,57 @@ export class MultiTenancyController extends Controller {
@Query('state') state?: CredentialState
) {
let credentialRecord
await this.agent.modules.tenants.withTenantAgent({ tenantId }, async (tenantAgent) => {
const credentialRepository = tenantAgent.dependencyManager.resolve(CredentialRepository)
const credentials = await credentialRepository.findByQuery(tenantAgent.context, {
connectionId,
threadId,
state,
try {
await this.agent.modules.tenants.withTenantAgent({ tenantId }, async (tenantAgent) => {
const credentialRepository = tenantAgent.dependencyManager.resolve(CredentialRepository)
const credentials = await credentialRepository.findByQuery(tenantAgent.context, {
connectionId,
threadId,
state,
})
credentialRecord = credentials.map((c: any) => c.toJSON())
})
credentialRecord = credentials.map((c: any) => c.toJSON())
})
return credentialRecord
return credentialRecord
} catch (error) {
throw ErrorHandlingService.handle(error)
}
}

@Security('apiKey')
@Get('/proofs/:tenantId')
public async getAllProofs(@Path('tenantId') tenantId: string, @Query('threadId') threadId?: string) {
let proofRecord
await this.agent.modules.tenants.withTenantAgent({ tenantId }, async (tenantAgent) => {
let proofs = await tenantAgent.proofs.getAll()
if (threadId) proofs = proofs.filter((p: any) => p.threadId === threadId)
proofRecord = proofs.map((proof: any) => proof.toJSON())
})
return proofRecord
try {
await this.agent.modules.tenants.withTenantAgent({ tenantId }, async (tenantAgent) => {
let proofs = await tenantAgent.proofs.getAll()
if (threadId) proofs = proofs.filter((p: any) => p.threadId === threadId)
proofRecord = proofs.map((proof: any) => proof.toJSON())
})
return proofRecord
} catch (error) {
throw ErrorHandlingService.handle(error)
}
}

@Security('apiKey')
@Get('/form-data/:tenantId/:proofRecordId')
@Example<ProofExchangeRecordProps>(ProofRecordExample)
public async proofFormData(
@Path('proofRecordId') proofRecordId: string,
@Path('tenantId') tenantId: string,
@Res() notFoundError: TsoaResponse<404, { reason: string }>,
@Res() internalServerError: TsoaResponse<500, { message: string }>
) {
public async proofFormData(@Path('proofRecordId') proofRecordId: string, @Path('tenantId') tenantId: string) {
let proof
try {
await this.agent.modules.tenants.withTenantAgent({ tenantId }, async (tenantAgent) => {
proof = await tenantAgent.proofs.getFormatData(proofRecordId)
})
return proof
} catch (error) {
if (error instanceof RecordNotFoundError) {
return notFoundError(404, {
reason: `proof with proofRecordId "${proofRecordId}" not found.`,
})
}

return internalServerError(500, { message: `something went wrong: ${error}` })
throw ErrorHandlingService.handle(error)
}
}

@Security('apiKey')
@Post('/proofs/request-proof/:tenantId')
@Example<ProofExchangeRecordProps>(ProofRecordExample)
public async requestProof(
@Body() requestProofOptions: RequestProofOptions,
@Path('tenantId') tenantId: string,
@Res() notFoundError: TsoaResponse<404, { reason: string }>,
@Res() internalServerError: TsoaResponse<500, { message: string }>
) {
public async requestProof(@Body() requestProofOptions: RequestProofOptions, @Path('tenantId') tenantId: string) {
let proof
try {
await this.agent.modules.tenants.withTenantAgent({ tenantId }, async (tenantAgent) => {
Expand All @@ -1599,16 +1567,15 @@ export class MultiTenancyController extends Controller {

return proof
} catch (error) {
return internalServerError(500, { message: `something went wrong: ${error}` })
throw ErrorHandlingService.handle(error)
}
}

@Security('apiKey')
@Post('/proofs/create-request-oob/:tenantId')
public async createRequest(
@Path('tenantId') tenantId: string,
@Body() createRequestOptions: CreateProofRequestOobOptions,
@Res() internalServerError: TsoaResponse<500, { message: string }>
@Body() createRequestOptions: CreateProofRequestOobOptions
) {
let oobProofRecord
try {
Expand Down Expand Up @@ -1675,7 +1642,7 @@ export class MultiTenancyController extends Controller {

return oobProofRecord
} catch (error) {
return internalServerError(500, { message: `something went wrong: ${error}` })
throw ErrorHandlingService.handle(error)
}
}

Expand All @@ -1686,79 +1653,53 @@ export class MultiTenancyController extends Controller {
@Path('tenantId') tenantId: string,
@Path('proofRecordId') proofRecordId: string,
@Body()
request: {
request: //TODO type for request
{
filterByPresentationPreview?: boolean
filterByNonRevocationRequirements?: boolean
comment?: string
},
@Res() notFoundError: TsoaResponse<404, { reason: string }>,
@Res() internalServerError: TsoaResponse<500, { message: string }>
}
) {
let proofRecord
try {
await this.agent.modules.tenants.withTenantAgent({ tenantId }, async (tenantAgent) => {
const requestedCredentials = await tenantAgent.proofs.selectCredentialsForRequest({
proofRecordId,
})

const acceptProofRequest: AcceptProofRequestOptions = {
proofRecordId,
comment: request.comment,
proofFormats: requestedCredentials.proofFormats,
}

const proof = await tenantAgent.proofs.acceptRequest(acceptProofRequest)

proofRecord = proof.toJSON()
})
return proofRecord
} catch (error) {
if (error instanceof RecordNotFoundError) {
return notFoundError(404, {
reason: `proof with proofRecordId "${proofRecordId}" not found.`,
})
}

return internalServerError(500, { message: `something went wrong: ${error}` })
throw ErrorHandlingService.handle(error)
}
}

@Security('apiKey')
@Post('/proofs/:proofRecordId/accept-presentation/:tenantId')
@Example<ProofExchangeRecordProps>(ProofRecordExample)
public async acceptPresentation(
@Path('tenantId') tenantId: string,
@Path('proofRecordId') proofRecordId: string,
@Res() notFoundError: TsoaResponse<404, { reason: string }>,
@Res() internalServerError: TsoaResponse<500, { message: string }>
) {
public async acceptPresentation(@Path('tenantId') tenantId: string, @Path('proofRecordId') proofRecordId: string) {
let proof
try {
await this.agent.modules.tenants.withTenantAgent({ tenantId }, async (tenantAgent) => {
proof = await tenantAgent.proofs.acceptPresentation({ proofRecordId })
})

return proof
} catch (error) {
if (error instanceof RecordNotFoundError) {
return notFoundError(404, {
reason: `proof with proofRecordId "${proofRecordId}" not found.`,
})
}

return internalServerError(500, { message: `something went wrong: ${error}` })
throw ErrorHandlingService.handle(error)
}
}

@Security('apiKey')
@Get('/proofs/:proofRecordId/:tenantId')
@Example<ProofExchangeRecordProps>(ProofRecordExample)
public async getProofById(
@Path('tenantId') tenantId: string,
@Path('proofRecordId') proofRecordId: RecordId,
@Res() notFoundError: TsoaResponse<404, { reason: string }>,
@Res() internalServerError: TsoaResponse<500, { message: string }>
) {
public async getProofById(@Path('tenantId') tenantId: string, @Path('proofRecordId') proofRecordId: RecordId) {
let proofRecord
try {
await this.agent.modules.tenants.withTenantAgent({ tenantId }, async (tenantAgent) => {
Expand All @@ -1767,13 +1708,7 @@ export class MultiTenancyController extends Controller {
})
return proofRecord
} catch (error) {
if (error instanceof RecordNotFoundError) {
return notFoundError(404, {
reason: `proof with proofRecordId "${proofRecordId}" not found.`,
})
}

return internalServerError(500, { message: `something went wrong: ${error}` })
throw ErrorHandlingService.handle(error)
}
}

Expand Down