jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Some linting fixes

Browse Source
This commit is contained in:
Jan Bader 2022-02-19 21:53:30 +00:00
parent 1a19d3a197
commit 02ba80a555
6 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bcrypt/verifier.go
View File

@ -6,17 +6,17 @@ import (
"golang.org/x/crypto/bcrypt"
)
// Verifier verifys passwords using Bcrypt
// Verifier verifys passwords using Bcrypt.
type Verifier struct {
cost int
}
// Verify verifys a Password
func (bv *Verifier) Verify(password string, hashOnDb string) error {
return bcrypt.CompareHashAndPassword([]byte(hashOnDb), []byte(password))
// Verify verifys a Password.
func (bv *Verifier) Verify(password string, hashOnDB string) error {
return bcrypt.CompareHashAndPassword([]byte(hashOnDB), []byte(password))
}
// Hash calculates a hash to be stored on the database
// Hash calculates a hash to be stored on the database.
func (bv *Verifier) Hash(password string) (string, error) {
hash, err := bcrypt.GenerateFromPassword([]byte(password), bv.cost)
if err != nil {

5
cmd/budgeteer/main.go
View File

@ -3,8 +3,7 @@ package main
import (
"io/fs"
"log"
netHttp "net/http"
"net/http"
"git.javil.eu/jacob1123/budgeteer/bcrypt"
"git.javil.eu/jacob1123/budgeteer/config"
@ -34,7 +33,7 @@ func main() {
Service: q,
TokenVerifier: &jwt.TokenVerifier{},
CredentialsVerifier: &bcrypt.Verifier{},
StaticFS: netHttp.FS(static),
StaticFS: http.FS(static),
}
handler.Serve()

3
jwt/login.go
View File

@ -11,8 +11,7 @@ import (
)
// TokenVerifier verifies Tokens
type TokenVerifier struct {
}
type TokenVerifier struct{}
// Token contains everything to authenticate a user
type Token struct {

3
postgres/conn.go
View File

@ -5,8 +5,9 @@ import (
"embed"
"fmt"
_ "github.com/jackc/pgx/v4/stdlib" // needed for pg connection
"github.com/pressly/goose/v3"
_ "github.com/jackc/pgx/v4/stdlib" // needed for pg connection
)
//go:embed schema/*.sql

3
postgres/ynab-import.go
View File

@ -50,7 +50,6 @@ func NewYNABImport(context context.Context, q *Queries, budgetID uuid.UUID) (*YN
queries: q,
budgetID: budgetID,
}, nil
}
// ImportAssignments expects a TSV-file as exported by YNAB in the following format:
@ -147,7 +146,7 @@ func (ynab *YNABImport) ImportTransactions(context context.Context, r io.Reader)
return fmt.Errorf("parse date %s: %w", dateString, err)
}
categoryGroup, categoryName := record[5], record[6] //also in 4 joined by :
categoryGroup, categoryName := record[5], record[6] // also in 4 joined by :
category, err := ynab.GetCategory(context, categoryGroup, categoryName)
if err != nil {
return fmt.Errorf("get category %s/%s: %w", categoryGroup, categoryName, err)

12
server/account_test.go
View File

@ -1,4 +1,4 @@
package server_test
package server
import (
"encoding/json"
@ -7,11 +7,11 @@ import (
"strings"
"testing"
"github.com/gin-gonic/gin"
"git.javil.eu/jacob1123/budgeteer/bcrypt"
"git.javil.eu/jacob1123/budgeteer/jwt"
"git.javil.eu/jacob1123/budgeteer/postgres"
"git.javil.eu/jacob1123/budgeteer/server"
"github.com/gin-gonic/gin"
txdb "github.com/DATA-DOG/go-txdb"
)
@ -27,7 +27,7 @@ func TestListTimezonesHandler(t *testing.T) {
return
}
h := server.Handler{
h := Handler{
Service: database,
TokenVerifier: &jwt.TokenVerifier{},
CredentialsVerifier: &bcrypt.Verifier{},
@ -50,7 +50,7 @@ func TestListTimezonesHandler(t *testing.T) {
t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
}
var response server.LoginResponse
var response LoginResponse
err = json.NewDecoder(recorder.Body).Decode(&response)
if err != nil {
t.Error(err.Error())
@ -67,7 +67,7 @@ func TestListTimezonesHandler(t *testing.T) {
t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
}
var response server.TransactionsResponse
var response TransactionsResponse
err = json.NewDecoder(recorder.Body).Decode(&response)
if err != nil {
t.Error(err.Error())