diff --git a/routes/accounts.go b/routes/accounts.go index 7a59802..1c281ec 100644 --- a/routes/accounts.go +++ b/routes/accounts.go @@ -48,7 +48,7 @@ func AccountsCreate(w http.ResponseWriter, r *http.Request) { err := utils.ParseRequest(r, &input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to decode a request") utils.JSONResponse(w, 400, &AccountsCreateResponse{ @@ -196,7 +196,7 @@ func AccountsCreate(w http.ResponseWriter, r *http.Request) { token, err := env.Tokens.GetToken(input.Token) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to fetch a registration token from the database") utils.JSONResponse(w, 400, &AccountsCreateResponse{ @@ -238,7 +238,7 @@ func AccountsCreate(w http.ResponseWriter, r *http.Request) { }) env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Unable to hash the password") return } @@ -261,7 +261,7 @@ func AccountsCreate(w http.ResponseWriter, r *http.Request) { }) env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Could not insert an user into the database") return } @@ -318,7 +318,7 @@ func AccountsCreate(w http.ResponseWriter, r *http.Request) { err := env.Tokens.DeleteID(input.Token) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "id": input.Token, }).Error("Could not remove token from database") } @@ -400,7 +400,7 @@ func AccountsUpdate(c web.C, w http.ResponseWriter, r *http.Request) { err := utils.ParseRequest(r, &input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to decode a request") utils.JSONResponse(w, 400, &AccountsUpdateResponse{ @@ -499,7 +499,7 @@ func AccountsUpdate(c web.C, w http.ResponseWriter, r *http.Request) { err = user.SetPassword(input.NewPassword) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Unable to hash a password") utils.JSONResponse(w, 500, &AccountsUpdateResponse{ @@ -540,7 +540,7 @@ func AccountsUpdate(c web.C, w http.ResponseWriter, r *http.Request) { err = env.Accounts.UpdateID(session.Owner, user) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Unable to update an account") utils.JSONResponse(w, 500, &AccountsUpdateResponse{ @@ -603,7 +603,7 @@ func AccountsDelete(c web.C, w http.ResponseWriter, r *http.Request) { if err != nil { env.Log.WithFields(logrus.Fields{ "id": user.ID, - "error": err, + "error": err.Error(), }).Error("Unable to remove account's tokens") utils.JSONResponse(w, 500, &AccountsDeleteResponse{ @@ -617,7 +617,7 @@ func AccountsDelete(c web.C, w http.ResponseWriter, r *http.Request) { err = env.Accounts.DeleteID(user.ID) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Unable to delete an account") utils.JSONResponse(w, 500, &AccountsDeleteResponse{ @@ -662,7 +662,7 @@ func AccountsWipeData(c web.C, w http.ResponseWriter, r *http.Request) { // The session refers to a non-existing user env.Log.WithFields(logrus.Fields{ "id": session.ID, - "error": err, + "error": err.Error(), }).Warn("Valid session referred to a removed account") utils.JSONResponse(w, 410, &AccountsWipeDataResponse{ @@ -685,7 +685,7 @@ func AccountsWipeData(c web.C, w http.ResponseWriter, r *http.Request) { if err != nil { env.Log.WithFields(logrus.Fields{ "id": user.ID, - "error": err, + "error": err.Error(), }).Error("Unable to remove account's tokens") utils.JSONResponse(w, 500, &AccountsWipeDataResponse{ diff --git a/routes/attachments.go b/routes/attachments.go index df06e94..cd22480 100644 --- a/routes/attachments.go +++ b/routes/attachments.go @@ -23,7 +23,7 @@ func AttachmentsList(c web.C, w http.ResponseWriter, r *http.Request) { attachments, err := env.Attachments.GetOwnedBy(session.Owner) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Unable to fetch attachments") utils.JSONResponse(w, 500, &AttachmentsListResponse{ @@ -61,7 +61,7 @@ func AttachmentsCreate(c web.C, w http.ResponseWriter, r *http.Request) { err := utils.ParseRequest(r, &input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to decode a request") utils.JSONResponse(w, 400, &AttachmentsCreateResponse{ @@ -105,7 +105,7 @@ func AttachmentsCreate(c web.C, w http.ResponseWriter, r *http.Request) { }) env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Could not insert a attachment into the database") return } @@ -179,7 +179,7 @@ func AttachmentsUpdate(c web.C, w http.ResponseWriter, r *http.Request) { err := utils.ParseRequest(r, &input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to decode a request") utils.JSONResponse(w, 400, &AttachmentsUpdateResponse{ @@ -239,7 +239,7 @@ func AttachmentsUpdate(c web.C, w http.ResponseWriter, r *http.Request) { err = env.Attachments.UpdateID(c.URLParams["id"], input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "id": c.URLParams["id"], }).Error("Unable to update a attachment") @@ -291,7 +291,7 @@ func AttachmentsDelete(c web.C, w http.ResponseWriter, r *http.Request) { err = env.Attachments.DeleteID(c.URLParams["id"]) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "id": c.URLParams["id"], }).Error("Unable to delete a attachment") diff --git a/routes/contacts.go b/routes/contacts.go index 93e9364..89f4031 100644 --- a/routes/contacts.go +++ b/routes/contacts.go @@ -27,7 +27,7 @@ func ContactsList(c web.C, w http.ResponseWriter, r *http.Request) { contacts, err := env.Contacts.GetOwnedBy(session.Owner) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Unable to fetch contacts") utils.JSONResponse(w, 500, &ContactsListResponse{ @@ -67,7 +67,7 @@ func ContactsCreate(c web.C, w http.ResponseWriter, r *http.Request) { err := utils.ParseRequest(r, &input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to decode a request") utils.JSONResponse(w, 400, &ContactsCreateResponse{ @@ -111,7 +111,7 @@ func ContactsCreate(c web.C, w http.ResponseWriter, r *http.Request) { }) env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Could not insert a contact into the database") return } @@ -185,7 +185,7 @@ func ContactsUpdate(c web.C, w http.ResponseWriter, r *http.Request) { err := utils.ParseRequest(r, &input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to decode a request") utils.JSONResponse(w, 400, &ContactsUpdateResponse{ @@ -245,7 +245,7 @@ func ContactsUpdate(c web.C, w http.ResponseWriter, r *http.Request) { err = env.Contacts.UpdateID(c.URLParams["id"], input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "id": c.URLParams["id"], }).Error("Unable to update a contact") @@ -297,7 +297,7 @@ func ContactsDelete(c web.C, w http.ResponseWriter, r *http.Request) { err = env.Contacts.DeleteID(c.URLParams["id"]) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "id": c.URLParams["id"], }).Error("Unable to delete a contact") diff --git a/routes/emails.go b/routes/emails.go index 9d46926..cc70f62 100644 --- a/routes/emails.go +++ b/routes/emails.go @@ -63,7 +63,7 @@ func EmailsList(c web.C, w http.ResponseWriter, r *http.Request) { l, err := strconv.Atoi(limitRaw) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "limit": limit, }).Error("Invalid limit") @@ -84,7 +84,7 @@ func EmailsList(c web.C, w http.ResponseWriter, r *http.Request) { emails, err := env.Emails.List(session.Owner, sort, offset, limit, label) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Unable to fetch emails") utils.JSONResponse(w, 500, &EmailsListResponse{ @@ -98,7 +98,7 @@ func EmailsList(c web.C, w http.ResponseWriter, r *http.Request) { count, err := env.Emails.CountOwnedBy(session.Owner) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Unable to count emails") utils.JSONResponse(w, 500, &EmailsListResponse{ @@ -152,7 +152,7 @@ func EmailsCreate(c web.C, w http.ResponseWriter, r *http.Request) { err := utils.ParseRequest(r, &input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to decode a request") utils.JSONResponse(w, 400, &EmailsCreateResponse{ @@ -208,7 +208,7 @@ func EmailsCreate(c web.C, w http.ResponseWriter, r *http.Request) { }) env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Could not insert an email into the database") return } @@ -222,7 +222,7 @@ func EmailsCreate(c web.C, w http.ResponseWriter, r *http.Request) { }) env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Could not publish an email send request") return } @@ -305,7 +305,7 @@ func EmailsDelete(c web.C, w http.ResponseWriter, r *http.Request) { err = env.Emails.DeleteID(c.URLParams["id"]) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "id": c.URLParams["id"], }).Error("Unable to delete a email") diff --git a/routes/keys.go b/routes/keys.go index b86ff27..873cab3 100644 --- a/routes/keys.go +++ b/routes/keys.go @@ -80,7 +80,7 @@ func KeysCreate(c web.C, w http.ResponseWriter, r *http.Request) { err := utils.ParseRequest(r, &input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to decode a request") utils.JSONResponse(w, 409, &KeysCreateResponse{ @@ -102,7 +102,7 @@ func KeysCreate(c web.C, w http.ResponseWriter, r *http.Request) { }) env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "list": entityList, }).Warn("Cannot parse an armored key") return @@ -117,7 +117,7 @@ func KeysCreate(c web.C, w http.ResponseWriter, r *http.Request) { }) env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "list": entityList, }).Warn("Cannot parse an armored key #2") return @@ -132,7 +132,7 @@ func KeysCreate(c web.C, w http.ResponseWriter, r *http.Request) { }) env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "id": session.Owner, }).Error("Cannot fetch user from database") return @@ -178,7 +178,7 @@ func KeysCreate(c web.C, w http.ResponseWriter, r *http.Request) { }) env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Could not insert a key to the database") return } @@ -218,7 +218,7 @@ func KeysGet(c web.C, w http.ResponseWriter, r *http.Request) { account, err := env.Accounts.FindAccountByName(username) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "name": username, }).Warn("Unable to fetch the requested account from the database") @@ -235,7 +235,7 @@ func KeysGet(c web.C, w http.ResponseWriter, r *http.Request) { key2, err := env.Keys.FindByFingerprint(account.PGPKey) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to fetch the requested key from the database") utils.JSONResponse(w, 500, &KeysGetResponse{ @@ -250,7 +250,7 @@ func KeysGet(c web.C, w http.ResponseWriter, r *http.Request) { keys, err := env.Keys.FindByOwner(account.ID) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "owner": account.ID, }).Warn("Unable to fetch user's keys from the database") @@ -277,7 +277,7 @@ func KeysGet(c web.C, w http.ResponseWriter, r *http.Request) { key2, err := env.Keys.FindByFingerprint(id) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to fetch the requested key from the database") utils.JSONResponse(w, 404, &KeysGetResponse{ diff --git a/routes/labels.go b/routes/labels.go index 01518ae..ff9de66 100644 --- a/routes/labels.go +++ b/routes/labels.go @@ -24,7 +24,7 @@ func LabelsList(c web.C, w http.ResponseWriter, r *http.Request) { labels, err := env.Labels.GetOwnedBy(session.Owner) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Unable to fetch labels") utils.JSONResponse(w, 500, &LabelsListResponse{ @@ -58,7 +58,7 @@ func LabelsCreate(c web.C, w http.ResponseWriter, r *http.Request) { err := utils.ParseRequest(r, &input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to decode a request") utils.JSONResponse(w, 400, &LabelsCreateResponse{ @@ -94,7 +94,7 @@ func LabelsCreate(c web.C, w http.ResponseWriter, r *http.Request) { }) env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Could not insert a label into the database") return } @@ -161,7 +161,7 @@ func LabelsUpdate(c web.C, w http.ResponseWriter, r *http.Request) { err := utils.ParseRequest(r, &input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to decode a request") utils.JSONResponse(w, 400, &LabelsUpdateResponse{ @@ -201,7 +201,7 @@ func LabelsUpdate(c web.C, w http.ResponseWriter, r *http.Request) { err = env.Labels.UpdateID(c.URLParams["id"], input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "id": c.URLParams["id"], }).Error("Unable to update a contact") @@ -253,7 +253,7 @@ func LabelsDelete(c web.C, w http.ResponseWriter, r *http.Request) { err = env.Labels.DeleteID(c.URLParams["id"]) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "id": c.URLParams["id"], }).Error("Unable to delete a label") diff --git a/routes/middleware.go b/routes/middleware.go index 837ac04..c923c6e 100644 --- a/routes/middleware.go +++ b/routes/middleware.go @@ -44,7 +44,7 @@ func AuthMiddleware(c *web.C, h http.Handler) http.Handler { token, err := env.Tokens.GetToken(headerParts[1]) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Cannot retrieve session from the database") utils.JSONResponse(w, 401, &AuthMiddlewareResponse{ diff --git a/routes/tokens.go b/routes/tokens.go index 0bcc760..3b6e19c 100644 --- a/routes/tokens.go +++ b/routes/tokens.go @@ -35,7 +35,7 @@ func TokensGet(c web.C, w http.ResponseWriter, r *http.Request) { token, err = env.Tokens.GetToken(id) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "id": id, }).Warn("Unable to find the token") @@ -78,7 +78,7 @@ func TokensCreate(w http.ResponseWriter, r *http.Request) { err := utils.ParseRequest(r, &input) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Warn("Unable to decode a request") utils.JSONResponse(w, 409, &TokensCreateResponse{ @@ -124,7 +124,7 @@ func TokensCreate(w http.ResponseWriter, r *http.Request) { if err != nil { env.Log.WithFields(logrus.Fields{ "user": user.Name, - "error": err, + "error": err.Error(), }).Error("Could not update user") // DO NOT RETURN! @@ -216,7 +216,7 @@ func TokensDelete(c web.C, w http.ResponseWriter, r *http.Request) { token, err = env.Tokens.GetToken(id) if err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), "id": id, }).Warn("Unable to find the token") @@ -231,7 +231,7 @@ func TokensDelete(c web.C, w http.ResponseWriter, r *http.Request) { // Delete it from the database if err := env.Tokens.DeleteID(token.ID); err != nil { env.Log.WithFields(logrus.Fields{ - "error": err, + "error": err.Error(), }).Error("Unable to delete a token") utils.JSONResponse(w, 500, &TokensDeleteResponse{