Skip to content

Commit

Permalink
Merge pull request #28 from rarimo/fix/error-handling
Browse files Browse the repository at this point in the history
Change api errors to semantic right
  • Loading branch information
Zaptoss authored Jul 30, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents f70703f + 99b4143 commit 098eb4d
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 3 additions & 4 deletions internal/service/handlers/verify_external_passport.go
Original file line number Diff line number Diff line change
@@ -77,14 +77,14 @@ func VerifyExternalPassport(w http.ResponseWriter, r *http.Request) {
}
if byExternalAID != nil {
log.Debug("External AID already used")
ape.RenderErr(w, problems.Conflict())
ape.RenderErr(w, problems.Forbidden())
return
}

if byNullifier.SharedHash == nil || *byNullifier.SharedHash != sharedHash {
if byNullifier.SharedHash != nil {
log.Debug("Shared hash already used")
ape.RenderErr(w, problems.Conflict())
ape.RenderErr(w, problems.Forbidden())
return
}

@@ -96,7 +96,7 @@ func VerifyExternalPassport(w http.ResponseWriter, r *http.Request) {
}
if bySharedHash != nil {
log.Debug("Shared hash already used")
ape.RenderErr(w, problems.Conflict())
ape.RenderErr(w, problems.Forbidden())
return
}
}
@@ -132,7 +132,6 @@ func VerifyExternalPassport(w http.ResponseWriter, r *http.Request) {
return fmt.Errorf("add event for referrer: %w", err)
}
return nil

})
if err != nil {
log.WithError(err).Error("Failed to do passport scan updates")
4 changes: 2 additions & 2 deletions internal/service/handlers/verify_internal_passport.go
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ func VerifyInternalPassport(w http.ResponseWriter, r *http.Request) {
}
if byAnonymousID != nil && byAnonymousID.Nullifier != balance.Nullifier {
log.Warn("Balance with the same internal AID already exists")
ape.RenderErr(w, problems.Conflict())
ape.RenderErr(w, problems.Forbidden())
return
}

@@ -105,7 +105,7 @@ func VerifyInternalPassport(w http.ResponseWriter, r *http.Request) {
}
if bySharedHash != nil && bySharedHash.Nullifier != balance.Nullifier {
log.Warn("Balance with the same shared hash already exists")
ape.RenderErr(w, problems.Conflict())
ape.RenderErr(w, problems.Forbidden())
return
}

0 comments on commit 098eb4d

Please sign in to comment.