Merge pull request #53 from wwWallet/display-verification-timestamp

exported verification timestamp
wwWallet · Jul 3, 2024 · ae63dbe · ae63dbe
2 parents 315566e + 607baa1
commit ae63dbe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/src/entities/VerifiablePresentation.entity.ts b/src/entities/VerifiablePresentation.entity.ts
@@ -1,5 +1,4 @@
 import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
-import { VerifiableCredentialFormat } from "../types/oid4vci";
 
 export enum VerificationStatus {
 	REVOKED,
@@ -84,16 +83,12 @@ export class VerifiablePresentationEntity {
 		return null;
 	}
 
-	@Column({ name: "date", type: "date", nullable: true })
+	@Column({ name: "date", type: "datetime", nullable: true })
 	date?: Date;
-
-	@Column({ name: "format", type: "enum", enum: VerifiableCredentialFormat, nullable: true })
-	format?: VerifiableCredentialFormat;
 
 	@Column({ name: "status", type: "boolean", nullable: true })
 	status?: boolean;
 
-
 	@Column({ name: "state", type: "varchar", nullable: true })
 	state?: string;
 }
diff --git a/src/services/OpenidForPresentationReceivingService.ts b/src/services/OpenidForPresentationReceivingService.ts
@@ -469,7 +469,7 @@ export class OpenidForPresentationsReceivingService implements OpenidForPresenta
 	}
 
 
-	public async getPresentationByState(state: string): Promise<{ status: boolean, presentationClaims?: PresentationClaims, rawPresentation?: string }> {
+	public async getPresentationByState(state: string): Promise<{ status: true, vp: VerifiablePresentationEntity } | { status: false }> {
 		const vp = await this.verifiablePresentationRepository.createQueryBuilder('vp')
 			.where("state = :state", { state: state })
 			.getOne();
@@ -479,7 +479,7 @@ export class OpenidForPresentationsReceivingService implements OpenidForPresenta
 		}
 
 		if (vp) 
-			return { status: true, presentationClaims: vp.claims, rawPresentation: vp?.raw_presentation };
+			return { status: true, vp };
 		else
 			return { status: false };
 	}

diff --git a/src/services/interfaces.ts b/src/services/interfaces.ts
@@ -5,7 +5,7 @@ import { OpenidForPresentationsConfiguration } from "./types/OpenidForPresentati
 import 'reflect-metadata';
 import { AuthorizationDetailsSchemaType, CredentialSupported, GrantType } from "../types/oid4vci";
 import { CredentialIssuersRepository } from "../lib/CredentialIssuersRepository";
-import { PresentationClaims } from "../entities/VerifiablePresentation.entity";
+import { PresentationClaims, VerifiablePresentationEntity } from "../entities/VerifiablePresentation.entity";
 
 export interface CredentialSigner {
 	sign(payload: any, headers: JWTHeaderParameters | {}, disclosureFrame: any | undefined): Promise<{ jws: string }>;
@@ -37,7 +37,7 @@ export interface OpenidForPresentationsReceivingInterface {
 
 	generateAuthorizationRequestURL(ctx: { req: Request, res: Response }, presentationDefinition: object, directPostEndpoint?: string): Promise<{ url: URL; stateId: string }>;
 	getPresentationDefinitionHandler(ctx: { req: Request, res: Response }): Promise<void>;
-	getPresentationByState(state: string): Promise<{ status: boolean, presentationClaims?: PresentationClaims, rawPresentation?: string }>;
+	getPresentationByState(state: string): Promise<{ status: true, vp: VerifiablePresentationEntity } | { status: false }>;
 	getPresentationById(id: string): Promise<{ status: boolean, presentationClaims?: PresentationClaims, rawPresentation?: string }>;
 
 	/**

diff --git a/src/verifier/verifierRouter.ts b/src/verifier/verifierRouter.ts
@@ -54,17 +54,20 @@ verifierRouter.get('/public/definitions', async (req, res) => {
 
 verifierRouter.get('/success/status', async (req, res) => { // response with the status of the presentation (this endpoint should be protected)
 	const state = req.query.state;
-	const {status, presentationClaims, rawPresentation } = await openidForPresentationReceivingService.getPresentationByState(state as string);
-	if (!presentationClaims) {
+	const result = await openidForPresentationReceivingService.getPresentationByState(state as string);
+	if (!result.status) {
 		return res.send({ status: false, error: "Presentation not received" });
 	}
-	return res.send({ status, presentationClaims, presentation: rawPresentation });
+	return res.send({ status: result.status, presentationClaims: result.vp.claims, presentation: result.vp.raw_presentation });
 })
 
 verifierRouter.get('/success', async (req, res) => {
 	const state = req.query.state;
-	const {status, presentationClaims, rawPresentation } = await openidForPresentationReceivingService.getPresentationByState(state as string);
-	if (!presentationClaims || !rawPresentation) {
+	const result = await openidForPresentationReceivingService.getPresentationByState(state as string);
+	if (result.status == false || 
+			result.vp.raw_presentation == null ||
+			result.vp.claims == null ||
+			result.vp.date == null) {
 		return res.render('error.pug', {
 			msg: "Failed to get presentation",
 			code: 0,
@@ -73,8 +76,9 @@ verifierRouter.get('/success', async (req, res) => {
 		})
 	}
 
-
-	const presentationPayload = JSON.parse(base64url.decode(rawPresentation.split('.')[1])) as any;
+	const { status, raw_presentation, claims, date } = result.vp;
+
+	const presentationPayload = JSON.parse(base64url.decode(raw_presentation.split('.')[1])) as any;
 	const credentials = await Promise.all(presentationPayload.vp.verifiableCredential.map(async (vcString: any) => {
 		if (vcString.includes('~')) {
 			return SdJwt.fromCompact<Record<string, unknown>, any>(vcString)
@@ -93,7 +97,8 @@ verifierRouter.get('/success', async (req, res) => {
 		lang: req.lang,
 		locale: locale[req.lang],
 		status: status,
-		presentationClaims: presentationClaims,
+		verificationTimestamp: date.toISOString(),
+		presentationClaims: claims,
 		credentialPayloads: credentials,
 	})
 })