From fdf9bd48845d033667c2d6dd1bb70c95682d2e0e Mon Sep 17 00:00:00 2001
From: chabanyknikita <nikchabanyk@gmail.com>
Date: Tue, 3 Sep 2024 15:54:01 +0300
Subject: [PATCH] fix validation

---
 internal/config/verifier.go                    |  4 +++-
 internal/service/handlers/verification-link.go | 11 ++++++-----
 .../service/handlers/verification_callback.go  | 18 +++++++++++-------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/internal/config/verifier.go b/internal/config/verifier.go
index 2f9f0f3..1356492 100644
--- a/internal/config/verifier.go
+++ b/internal/config/verifier.go
@@ -10,6 +10,7 @@ import (
 
 type Verifiers struct {
 	Passport *zk.Verifier
+	Age      int64
 }
 
 func (c *config) Verifiers() Verifiers {
@@ -31,7 +32,7 @@ func (c *config) Verifiers() Verifiers {
 			zk.WithProofType(zk.GlobalPassport),
 			zk.WithVerificationKeyFile(cfg.VerificationKeyPath),
 			zk.WithPassportRootVerifier(c.passport.ProvideVerifier()),
-			zk.WithIdentitiesCreationTimestampLimit(cfg.AllowedIdentityTimestamp),
+			//zk.WithIdentitiesCreationTimestampLimit(cfg.AllowedIdentityTimestamp),
 		)
 		if err != nil {
 			panic(fmt.Errorf("failed to initialize passport verifier: %w", err))
@@ -39,6 +40,7 @@ func (c *config) Verifiers() Verifiers {
 
 		return Verifiers{
 			Passport: pass,
+			Age:      cfg.AllowedIdentityTimestamp,
 		}
 	}).(Verifiers)
 }
diff --git a/internal/service/handlers/verification-link.go b/internal/service/handlers/verification-link.go
index a50034c..1b22e6d 100644
--- a/internal/service/handlers/verification-link.go
+++ b/internal/service/handlers/verification-link.go
@@ -26,11 +26,12 @@ func VerificationLink(w http.ResponseWriter, r *http.Request) {
 	}
 
 	user := &data.VerifyUsers{
-		UserID:     req.Data.ID,
-		UserIDHash: userIdHash,
-		CreatedAt:  time.Now().UTC(),
-		Status:     "not_verified",
-		Proof:      []byte{},
+		UserID:        req.Data.ID,
+		UserIDHash:    userIdHash,
+		CreatedAt:     time.Now().UTC(),
+		Status:        "not_verified",
+		Proof:         []byte{},
+		AgeLowerBound: -1,
 	}
 
 	if req.Data.Attributes.Nationality != nil && *req.Data.Attributes.Nationality != "" {
diff --git a/internal/service/handlers/verification_callback.go b/internal/service/handlers/verification_callback.go
index c335235..c44f702 100644
--- a/internal/service/handlers/verification_callback.go
+++ b/internal/service/handlers/verification_callback.go
@@ -77,6 +77,15 @@ func VerificationCallback(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	var verifyOpts = []zk.VerifyOption{
+		zk.WithProofSelectorValue(getter.Get(zk.Selector)),
+		zk.WithAgeAbove(verifiedUser.AgeLowerBound), // if not required -1
+		zk.WithEventID(eventID),
+	}
+	if verifiedUser.Nationality != "" {
+		verifyOpts = append(verifyOpts, zk.WithCitizenships(verifiedUser.Nationality))
+	}
+
 	// uniqueness check
 	timestampUpperBoundMatches := getter.Get(zk.TimestampUpperBound) == ProofParameters(r).TimestampUpperBound
 	timestampUpperBoundCheckRequired := selectorInt&(1<<timestampUpperBoundBit) == 0
@@ -86,6 +95,7 @@ func VerificationCallback(w http.ResponseWriter, r *http.Request) {
 			ape.RenderErr(w, problems.InternalError())
 			return
 		}
+		verifyOpts = append(verifyOpts, zk.WithIdentitiesCreationTimestampLimit(Verifiers(r).Age))
 	}
 	identityCounterUpperBoundMatches := getter.Get(zk.IdentityCounterUpperBound) == "1"
 	identityCounterUpperBoundCheckRequired := selectorInt&(1<<identityCounterUpperBoundBit) == 0
@@ -95,15 +105,9 @@ func VerificationCallback(w http.ResponseWriter, r *http.Request) {
 			ape.RenderErr(w, problems.InternalError())
 			return
 		}
+		verifyOpts = append(verifyOpts, zk.WithIdentitiesCounter(identityCounterUpperBound))
 	}
 
-	var verifyOpts = []zk.VerifyOption{
-		zk.WithCitizenships(verifiedUser.Nationality),
-		zk.WithProofSelectorValue(getter.Get(zk.Selector)),
-		zk.WithIdentitiesCounter(identityCounterUpperBound),
-		zk.WithAgeAbove(verifiedUser.AgeLowerBound),
-		zk.WithEventID(eventID),
-	}
 	err = Verifiers(r).Passport.VerifyProof(proof, verifyOpts...)
 	if err != nil {
 		var vErr validation.Errors