Skip to content

Commit

Permalink
fix accrediation
Browse files Browse the repository at this point in the history
  • Loading branch information
DaevMithran committed Mar 3, 2025
1 parent c02f23b commit 19aa902
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
1 change: 1 addition & 0 deletions src/controllers/api/accreditation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ export class AccreditationController {
accreditation,
});
} catch (error) {
console.log(error)
return response.status(StatusCodes.INTERNAL_SERVER_ERROR).json({
error: `Internal error: ${(error as Error)?.message || error}`,
});
Expand Down
3 changes: 2 additions & 1 deletion src/controllers/api/credential.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,15 @@ export class CredentialController {
} satisfies UnsuccesfulVerifyCredentialResponseBody);
}

const did = typeof cheqdCredential.issuer === 'string' ? cheqdCredential.issuer : cheqdCredential.issuer.id;
// Track operation
const trackInfo = {
category: OperationCategoryNameEnum.CREDENTIAL,
name: OperationNameEnum.CREDENTIAL_VERIFY,
customer: response.locals.customer,
user: response.locals.user,
data: {
did: cheqdCredential.issuer,
did,
resource: verifyResult.resourceMetadata,
} satisfies ICredentialTrack,
} as ITrackOperation;
Expand Down
4 changes: 2 additions & 2 deletions src/services/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import type { CheqdW3CVerifiablePresentation } from './w3c-presentation.js';

export async function isCredentialIssuerDidDeactivated(credential: CheqdW3CVerifiableCredential): Promise<boolean> {
const identityServiceStrategySetup = new IdentityServiceStrategySetup();

const resolutionResult = await identityServiceStrategySetup.agent.resolve(credential.issuer);
const did = typeof credential.issuer === 'string' ? credential.issuer : credential.issuer.id;
const resolutionResult = await identityServiceStrategySetup.agent.resolve(did);
const body = await resolutionResult.json();

return body.didDocumentMetadata.deactivated;
Expand Down
7 changes: 4 additions & 3 deletions src/services/w3c-credential.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type {
ContextType,
CredentialStatusReference,
CredentialSubject,
IssuerType,
ProofType,
UnsignedCredential,
VerifiableCredential,
Expand All @@ -31,7 +32,7 @@ export interface IJWTPayloadVC extends JwtPayload {

// ToDo: make unit tests
export class CheqdW3CVerifiableCredential extends CommonReturn implements ICheqdCredential {
issuer: string;
issuer: IssuerType;
credentialSubject: CredentialSubject;
type?: string[] | string;
'@context': ContextType;
Expand Down Expand Up @@ -97,7 +98,7 @@ export class CheqdW3CVerifiableCredential extends CommonReturn implements ICheqd
const url = new URL(this.credentialStatus.id);
const statusListName = url.searchParams.get('resourceName');
const statusPurpose = this.credentialStatus.statusPurpose;
const did = this.issuer;
const did = typeof this.issuer === 'string' ? this.issuer : this.issuer.id;

if (!statusListName) {
return this.returnError(
Expand Down Expand Up @@ -141,7 +142,7 @@ export class CheqdW3CVerifiableCredential extends CommonReturn implements ICheqd
}

public async makeFeePayment(agent: IIdentityService, customer: CustomerEntity): Promise<ICommonErrorResponse> {
const did = this.issuer;
const did = typeof this.issuer === 'string' ? this.issuer : this.issuer.id;
const statusList = this.statusList;
const feePaymentOptions: IFeePaymentOptions[] = [];

Expand Down
1 change: 0 additions & 1 deletion tests/e2e/parallel/accreditation/negative-flow.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,5 @@ test(' Issue accreditation [Negative]: Invalid schema', async ({ request }) => {
},
});

console.log("Accredidtation response", await issueResponse.json())
expect(issueResponse.status()).toBe(StatusCodes.UNAUTHORIZED);
});

0 comments on commit 19aa902

Please sign in to comment.