Merge pull request #204 from Sphereon-Opensource/fix/ajax-seasonticket2

fix/ajax-seasonticket2

Author: sanderPostma

packages/siop-oid4vp/lib/schemas/universal-oid4vp/index.ts

@@ -1,14 +1,14 @@
 import {
   AuthorizationRequestStateStatus,
-  AuthorizationResponseStateStatus,
+  AuthorizationResponseStateStatus, AuthStatusResponse, AuthStatusResponsePayload,
   CallbackOpts,
   CallbackOptsPayload,
   CreateAuthorizationRequest,
   CreateAuthorizationRequestPayload,
   CreateAuthorizationResponse,
   CreateAuthorizationResponsePayload,
   QRCodeOpts,
-  QRCodeOptsPayload,
+  QRCodeOptsPayload, RequestError, RequestErrorPayload,
   RequestUriMethod,
   ResponseMode,
   ResponseType,
@@ -196,3 +196,78 @@ export const createAuthorizationResponseToPayload = (internal: CreateAuthorizati
     qr_uri: parsed.qrUri
   }
 }
+
+
+export const RequestErrorSchema = z.object({
+  status: z.number(),
+  message: z.string(),
+  errorDetails: z.string().optional()
+})
+
+export const AuthStatusResponseSchema = z.object({
+  status: AuthorizationStatusSchema,
+  correlationId: z.string(),
+  queryId: z.string(),
+  lastUpdated: z.number(),
+  verifiedData: z.any().optional(), // Replace with actual VerifiedDataSchema when available
+  error: RequestErrorSchema.optional()
+})
+
+
+export const RequestErrorPayloadSchema = z.object({
+  status: z.number(),
+  message: z.string(),
+  error_details: z.string().optional()
+})
+
+export const AuthStatusResponsePayloadSchema = z.object({
+  status: AuthorizationStatusSchema,
+  correlation_id: z.string(),
+  query_id: z.string(),
+  last_updated: z.number(),
+  verified_data: z.any().optional(), // Replace with actual VerifiedDataSchema when available
+  error: RequestErrorPayloadSchema.optional()
+})
+
+
+export const requestErrorFromPayload = (payload: RequestError): RequestError => {
+  const parsed = RequestErrorPayloadSchema.parse(payload)
+  return {
+    status: parsed.status,
+    message: parsed.message,
+    errorDetails: parsed.error_details
+  }
+}
+
+export const requestErrorToPayload = (internal: RequestError): RequestErrorPayload => {
+  const parsed = RequestErrorSchema.parse(internal)
+  return {
+    status: parsed.status,
+    message: parsed.message,
+    error_details: parsed.errorDetails
+  }
+}
+
+export const authStatusResponseFromPayload = (payload: AuthStatusResponse): AuthStatusResponse => {
+  const parsed = AuthStatusResponsePayloadSchema.parse(payload)
+  return {
+    status: parsed.status,
+    correlationId: parsed.correlation_id,
+    queryId: parsed.query_id,
+    lastUpdated: parsed.last_updated,
+    verifiedData: parsed.verified_data,
+    error: parsed.error ? requestErrorFromPayload(parsed.error) : undefined
+  }
+}
+
+export const authStatusResponseToPayload = (internal: AuthStatusResponse): AuthStatusResponsePayload => {
+  const parsed = AuthStatusResponseSchema.parse(internal)
+  return {
+    status: parsed.status,
+    correlation_id: parsed.correlationId,
+    query_id: parsed.queryId,
+    last_updated: parsed.lastUpdated,
+    verified_data: parsed.verifiedData,
+    error: parsed.error ? requestErrorToPayload(parsed.error) : undefined
+  }
+}

packages/siop-oid4vp/lib/types/SIOP.types.ts

@@ -28,14 +28,16 @@ import { RequestObject, RequestObjectOpts } from '../request-object'
 import { IRPSessionManager } from '../rp'
 import { JWTPayload, VerifiedJWT } from './JWT.types'
 import {
+  AuthStatusResponsePayloadSchema,
+  AuthStatusResponseSchema,
   CallbackOptsPayloadSchema,
   CallbackOptsSchema,
   CreateAuthorizationRequestPayloadSchema,
   CreateAuthorizationRequestSchema,
   CreateAuthorizationResponsePayloadSchema,
   CreateAuthorizationResponseSchema,
   QRCodeOptsPayloadSchema,
-  QRCodeOptsSchema,
+  QRCodeOptsSchema, RequestErrorPayloadSchema, RequestErrorSchema,
   VerifiedDataOptsSchema
 } from '../schemas'
 
@@ -699,6 +701,11 @@ export type CreateAuthorizationRequestPayload = z.infer<typeof CreateAuthorizati
 export type CreateAuthorizationResponse = z.infer<typeof CreateAuthorizationResponseSchema>
 export type CreateAuthorizationResponsePayload = z.infer<typeof CreateAuthorizationResponsePayloadSchema>
 export type VerifiedDataOpts = z.infer<typeof VerifiedDataOptsSchema>
+export type RequestError = z.infer<typeof RequestErrorSchema>
+export type RequestErrorPayload = z.infer<typeof RequestErrorPayloadSchema>
+export type AuthStatusResponse = z.infer<typeof AuthStatusResponseSchema>
+export type AuthStatusResponsePayload = z.infer<typeof AuthStatusResponsePayloadSchema>
+
 
 export type VerifiedData = {
   authorization_response?: VerifiedDataAuthorizationResponse