Wrap more errors

This commit is contained in:
Jan Bader 2022-02-15 12:37:04 +00:00
parent 7a0c4a17a2
commit 74a53954de
3 changed files with 15 additions and 5 deletions

View File

@ -1,6 +1,10 @@
package bcrypt package bcrypt
import "golang.org/x/crypto/bcrypt" import (
"fmt"
"golang.org/x/crypto/bcrypt"
)
// Verifier verifys passwords using Bcrypt // Verifier verifys passwords using Bcrypt
type Verifier struct { type Verifier struct {
@ -16,7 +20,7 @@ func (bv *Verifier) Verify(password string, hashOnDb string) error {
func (bv *Verifier) Hash(password string) (string, error) { func (bv *Verifier) Hash(password string) (string, error) {
hash, err := bcrypt.GenerateFromPassword([]byte(password), bv.cost) hash, err := bcrypt.GenerateFromPassword([]byte(password), bv.cost)
if err != nil { if err != nil {
return "", err return "", fmt.Errorf("hash password: %w", err)
} }
return string(hash[:]), nil return string(hash[:]), nil

View File

@ -2,6 +2,7 @@ package http
import ( import (
"encoding/json" "encoding/json"
"fmt"
"strings" "strings"
"time" "time"
) )
@ -13,14 +14,19 @@ func (j *JSONDate) UnmarshalJSON(b []byte) error {
s := strings.Trim(string(b), "\"") s := strings.Trim(string(b), "\"")
t, err := time.Parse("2006-01-02", s) t, err := time.Parse("2006-01-02", s)
if err != nil { if err != nil {
return err return fmt.Errorf("parse date: %w", err)
} }
*j = JSONDate(t) *j = JSONDate(t)
return nil return nil
} }
func (j JSONDate) MarshalJSON() ([]byte, error) { func (j JSONDate) MarshalJSON() ([]byte, error) {
return json.Marshal(time.Time(j)) result, err := json.Marshal(time.Time(j))
if err != nil {
return nil, fmt.Errorf("marshal date: %w", err)
}
return result, nil
} }
// Maybe a Format function for printing your date // Maybe a Format function for printing your date

View File

@ -39,7 +39,7 @@ func (tv *TokenVerifier) CreateToken(user *postgres.User) (string, error) {
// Generate encoded token and send it as response. // Generate encoded token and send it as response.
t, err := token.SignedString([]byte(secret)) t, err := token.SignedString([]byte(secret))
if err != nil { if err != nil {
return "", err return "", fmt.Errorf("create token: %w", err)
} }
return t, nil return t, nil