Skip to content
Snippets Groups Projects
Commit 9f505dc5 authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Fix error handling on auth request

parent e9225a2d
No related branches found
No related tags found
No related merge requests found
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment