Some linting fixes
This commit is contained in:
parent
1a19d3a197
commit
02ba80a555
@ -6,17 +6,17 @@ import (
|
|||||||
"golang.org/x/crypto/bcrypt"
|
"golang.org/x/crypto/bcrypt"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Verifier verifys passwords using Bcrypt
|
// Verifier verifys passwords using Bcrypt.
|
||||||
type Verifier struct {
|
type Verifier struct {
|
||||||
cost int
|
cost int
|
||||||
}
|
}
|
||||||
|
|
||||||
// Verify verifys a Password
|
// Verify verifys a Password.
|
||||||
func (bv *Verifier) Verify(password string, hashOnDb string) error {
|
func (bv *Verifier) Verify(password string, hashOnDB string) error {
|
||||||
return bcrypt.CompareHashAndPassword([]byte(hashOnDb), []byte(password))
|
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) {
|
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 {
|
||||||
|
@ -3,8 +3,7 @@ package main
|
|||||||
import (
|
import (
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"log"
|
"log"
|
||||||
|
"net/http"
|
||||||
netHttp "net/http"
|
|
||||||
|
|
||||||
"git.javil.eu/jacob1123/budgeteer/bcrypt"
|
"git.javil.eu/jacob1123/budgeteer/bcrypt"
|
||||||
"git.javil.eu/jacob1123/budgeteer/config"
|
"git.javil.eu/jacob1123/budgeteer/config"
|
||||||
@ -34,7 +33,7 @@ func main() {
|
|||||||
Service: q,
|
Service: q,
|
||||||
TokenVerifier: &jwt.TokenVerifier{},
|
TokenVerifier: &jwt.TokenVerifier{},
|
||||||
CredentialsVerifier: &bcrypt.Verifier{},
|
CredentialsVerifier: &bcrypt.Verifier{},
|
||||||
StaticFS: netHttp.FS(static),
|
StaticFS: http.FS(static),
|
||||||
}
|
}
|
||||||
|
|
||||||
handler.Serve()
|
handler.Serve()
|
||||||
|
@ -11,8 +11,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// TokenVerifier verifies Tokens
|
// TokenVerifier verifies Tokens
|
||||||
type TokenVerifier struct {
|
type TokenVerifier struct{}
|
||||||
}
|
|
||||||
|
|
||||||
// Token contains everything to authenticate a user
|
// Token contains everything to authenticate a user
|
||||||
type Token struct {
|
type Token struct {
|
||||||
|
@ -5,8 +5,9 @@ import (
|
|||||||
"embed"
|
"embed"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
_ "github.com/jackc/pgx/v4/stdlib" // needed for pg connection
|
|
||||||
"github.com/pressly/goose/v3"
|
"github.com/pressly/goose/v3"
|
||||||
|
|
||||||
|
_ "github.com/jackc/pgx/v4/stdlib" // needed for pg connection
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed schema/*.sql
|
//go:embed schema/*.sql
|
||||||
|
@ -50,7 +50,6 @@ func NewYNABImport(context context.Context, q *Queries, budgetID uuid.UUID) (*YN
|
|||||||
queries: q,
|
queries: q,
|
||||||
budgetID: budgetID,
|
budgetID: budgetID,
|
||||||
}, nil
|
}, nil
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ImportAssignments expects a TSV-file as exported by YNAB in the following format:
|
// ImportAssignments expects a TSV-file as exported by YNAB in the following format:
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package server_test
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
@ -7,11 +7,11 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
|
||||||
"git.javil.eu/jacob1123/budgeteer/bcrypt"
|
"git.javil.eu/jacob1123/budgeteer/bcrypt"
|
||||||
"git.javil.eu/jacob1123/budgeteer/jwt"
|
"git.javil.eu/jacob1123/budgeteer/jwt"
|
||||||
"git.javil.eu/jacob1123/budgeteer/postgres"
|
"git.javil.eu/jacob1123/budgeteer/postgres"
|
||||||
"git.javil.eu/jacob1123/budgeteer/server"
|
|
||||||
"github.com/gin-gonic/gin"
|
|
||||||
|
|
||||||
txdb "github.com/DATA-DOG/go-txdb"
|
txdb "github.com/DATA-DOG/go-txdb"
|
||||||
)
|
)
|
||||||
@ -27,7 +27,7 @@ func TestListTimezonesHandler(t *testing.T) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
h := server.Handler{
|
h := Handler{
|
||||||
Service: database,
|
Service: database,
|
||||||
TokenVerifier: &jwt.TokenVerifier{},
|
TokenVerifier: &jwt.TokenVerifier{},
|
||||||
CredentialsVerifier: &bcrypt.Verifier{},
|
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)
|
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)
|
err = json.NewDecoder(recorder.Body).Decode(&response)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Error(err.Error())
|
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)
|
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)
|
err = json.NewDecoder(recorder.Body).Decode(&response)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Error(err.Error())
|
t.Error(err.Error())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user