From 9f505dc505c75b882116dee3ea48e8b9147fb6a5 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Fri, 6 Nov 2020 23:27:27 +0000
Subject: [PATCH] Fix error handling on auth request
---
auth/request.go | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/auth/request.go b/auth/request.go
index 028a845ce..142c26115 100644
--- a/auth/request.go
+++ b/auth/request.go
@@ -53,15 +53,19 @@ func RequestAuth(partner, me contact.Contact, message string, rng io.Reader,
//lookup if an ongoing request is occurring
rqType, _, _, err := storage.Auth().GetRequest(partner.ID)
- if err != nil && !strings.Contains(err.Error(), auth.NoRequest) {
- return errors.WithMessage(err, "Error on lookup of potential "+
- "existing request")
- } else if rqType == auth.Receive {
- return errors.WithMessage(err, "Cannot send a request after"+
- "receiving a request")
- } else if rqType == auth.Sent {
- return errors.WithMessage(err, "Cannot send a request after"+
- "already sending one")
+ if err != nil && strings.Contains(err.Error(), auth.NoRequest) {
+ err = nil
+ }
+ if err != nil {
+ if rqType == auth.Receive {
+ return errors.WithMessage(err,
+ "Cannot send a request after "+
+ "receiving a request")
+ } else if rqType == auth.Sent {
+ return errors.WithMessage(err,
+ "Cannot send a request after "+
+ "already sending one")
+ }
}
grp := storage.E2e().GetGroup()
--
GitLab