Use ZKP in instead of generic names

Author: yimyitbarek

internal/verifier/apiv1/handlers_verification.go

@@ -12,13 +12,11 @@ import (
 	"vc/pkg/openid4vp"
 	"vc/pkg/sdjwtvc"
 
+	"encoding/hex"
 	"github.com/google/uuid"
 	"github.com/lestrrat-go/jwx/v3/jwa"
 	"github.com/lestrrat-go/jwx/v3/jwe"
-	
-	"encoding/hex"
-	"vc/internal/verifier/zk"
-
+	"proofs/server/v2/zk"
 )
 
 type VerificationRequestObjectRequest struct {
@@ -246,7 +244,7 @@ type VerificationCallbackResponse struct {
 	CredentialData []sdjwtvc.CredentialCache `json:"credential_data"`
 }
 
-type VerifyRequest struct {
+type VerifyZKPRequest struct {
 	Transcript           string `json:"Transcript"`
 	ZKDeviceResponseCBOR string `json:"ZKDeviceResponseCBOR"`
 }
@@ -256,7 +254,7 @@ type ClaimElement struct {
 	ElementValue      string `json:"ElementValue"`
 }
 
-type VerifyResponse struct {
+type VerifyZKPResponse struct {
 	Status bool                      `json:"Status"`
 	Claims map[string][]ClaimElement `json:"Claims"`
 }
@@ -276,7 +274,7 @@ func (c *Client) VerificationCallback(ctx context.Context, req *VerificationCall
 	return reply, nil
 }
 
-func (c *Client) Verify(ctx context.Context, req *VerifyRequest) (*VerifyResponse, error) {
+func (c *Client) VerifyZKP(ctx context.Context, req *VerifyZKPRequest) (*VerifyZKPResponse, error) {
 	c.log.Debug("Processing ZK Proof", "transcript_len", len(req.Transcript))
 	transcriptBytes, err := base64.StdEncoding.DecodeString(req.Transcript)
 	if err != nil {
@@ -311,7 +309,7 @@ func (c *Client) Verify(ctx context.Context, req *VerifyRequest) (*VerifyRespons
 	}
 
 	//TODO: support more vc types
-	reply := &VerifyResponse{
+	reply := &VerifyZKPResponse{
 		Status: ok,
 		Claims: map[string][]ClaimElement{
 			"org.iso.18013.5.1": apiClaims,
@@ -323,4 +321,4 @@ func (c *Client) Verify(ctx context.Context, req *VerifyRequest) (*VerifyRespons
 	}
 
 	return reply, nil
-}
+}

internal/verifier/httpserver/api.go

@@ -19,7 +19,7 @@ type Apiv1 interface {
 	VerificationRequestObject(ctx context.Context, req *apiv1.VerificationRequestObjectRequest) (string, error)
 	VerificationDirectPost(ctx context.Context, req *apiv1.VerificationDirectPostRequest) (*apiv1.VerificationDirectPostResponse, error)
 	VerificationCallback(ctx context.Context, req *apiv1.VerificationCallbackRequest) (*apiv1.VerificationCallbackResponse, error)
-	Verify(ctx context.Context, req *apiv1.VerifyRequest) (*apiv1.VerifyResponse, error)
+	VerifyZKP(ctx context.Context, req *apiv1.VerifyZKPRequest) (*apiv1.VerifyZKPResponse, error)
 
 	// UI
 	UIInteraction(ctx context.Context, req *apiv1.UIInteractionRequest) (*apiv1.UIInteractionReply, error)

internal/verifier/httpserver/endpoint_verification.go

@@ -67,18 +67,18 @@ func (s *Service) endpointVerificationCallback(ctx context.Context, c *gin.Conte
 	return nil, nil
 }
 
-func (s *Service) endpointVerify(ctx context.Context, c *gin.Context) (any, error) {
+func (s *Service) endpointVerifyZKP(ctx context.Context, c *gin.Context) (any, error) {
 	s.log.Debug("endpointVerificationDirectPost called")
 	c.Request.Body = http.MaxBytesReader(c.Writer, c.Request.Body, 2*1024*1024)
-	request := &apiv1.VerifyRequest{}
+	request := &apiv1.VerifyZKPRequest{}
 	if err := s.httpHelpers.Binding.Request(ctx, c, request); err != nil {
 		s.log.Error(err, "binding failed")
 		return nil, err
 	}
-	reply, err := s.apiv1.Verify(ctx, request)
+	reply, err := s.apiv1.VerifyZKP(ctx, request)
 	if err != nil {
 		return nil, err
 	}
 
 	return reply, nil
-}
+}

internal/verifier/httpserver/service.go

@@ -55,10 +55,10 @@ func New(ctx context.Context, cfg *model.Cfg, apiv1 *apiv1.Client, notify *notif
 		notify: notify,
 		tracer: tracer,
 		server: &http.Server{
-			ReadHeaderTimeout: 300 * time.Second, 
-			ReadTimeout:       300 * time.Second, 
+			ReadHeaderTimeout: 300 * time.Second,
+			ReadTimeout:       300 * time.Second,
 			WriteTimeout:      300 * time.Second,
-			IdleTimeout:       300 * time.Second,	
+			IdleTimeout:       300 * time.Second,
 		},
 		sessionsName:     "verifier_user_session",
 		tokenLimiter:     middleware.NewRateLimiter(rateLimitConfig.TokenRequestsPerMinute, rateLimitConfig.TokenBurst),
@@ -200,8 +200,8 @@ func New(ctx context.Context, cfg *model.Cfg, apiv1 *apiv1.Client, notify *notif
 	s.httpHelpers.Server.RegEndpoint(ctx, rgOIDCVerification, http.MethodPost, "confirm/:session_id", http.StatusOK, s.endpointConfirmCredentialDisplay)
 
 	// Longfellow-zk verifier
-	s.httpHelpers.Server.RegEndpoint(ctx, rgOIDCVerification, http.MethodPost, "verify", http.StatusOK, s.endpointVerify)
-	
+	s.httpHelpers.Server.RegEndpoint(ctx, rgOIDCVerification, http.MethodPost, "verifyzkp", http.StatusOK, s.endpointVerifyZKP)
+
 	// UI Endpoints
 	s.httpHelpers.Server.RegEndpoint(ctx, rgRoot, http.MethodGet, "qr/:session_id", http.StatusOK, s.endpointQRCode)
 	// TODO(masv): no polling, use WebSocket or Server-Sent Events instead