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

Move init of StaticFS and rename some vars

Browse Source
This commit is contained in:
Jan Bader 2022-02-15 12:37:23 +00:00
parent 74a53954de
commit 2f45c415e0
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/budgeteer/main.go
View File

@ -1,13 +1,17 @@
package main
import (
"io/fs"
"log"
netHttp "net/http"
"git.javil.eu/jacob1123/budgeteer/bcrypt"
"git.javil.eu/jacob1123/budgeteer/config"
"git.javil.eu/jacob1123/budgeteer/http"
"git.javil.eu/jacob1123/budgeteer/jwt"
"git.javil.eu/jacob1123/budgeteer/postgres"
"git.javil.eu/jacob1123/budgeteer/web"
)
func main() {
@ -21,10 +25,16 @@ func main() {
log.Fatalf("Failed connecting to DB: %v", err)
}
static, err := fs.Sub(web.Static, "dist")
if err != nil {
panic("couldn't open static files")
}
h := &http.Handler{
Service: q,
TokenVerifier: &jwt.TokenVerifier{},
CredentialsVerifier: &bcrypt.Verifier{},
StaticFS: netHttp.FS(static),
}
h.Serve()

16
http/account_test.go
View File

@ -32,8 +32,8 @@ func TestListTimezonesHandler(t *testing.T) {
CredentialsVerifier: &bcrypt.Verifier{},
}
rr := httptest.NewRecorder()
c, engine := gin.CreateTestContext(rr)
recorder := httptest.NewRecorder()
c, engine := gin.CreateTestContext(recorder)
h.LoadRoutes(engine)
t.Run("RegisterUser", func(t *testing.T) {
@ -45,12 +45,12 @@ func TestListTimezonesHandler(t *testing.T) {
h.registerPost(c)
if rr.Code != http.StatusOK {
t.Errorf("handler returned wrong status code: got %v want %v", rr.Code, http.StatusOK)
if recorder.Code != http.StatusOK {
t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
}
var response LoginResponse
err = json.NewDecoder(rr.Body).Decode(&response)
err = json.NewDecoder(recorder.Body).Decode(&response)
if err != nil {
t.Error(err.Error())
t.Error("Error registering")
@ -62,12 +62,12 @@ func TestListTimezonesHandler(t *testing.T) {
t.Run("GetTransactions", func(t *testing.T) {
c.Request, err = http.NewRequest(http.MethodGet, "/account/accountid/transactions", nil)
if rr.Code != http.StatusOK {
t.Errorf("handler returned wrong status code: got %v want %v", rr.Code, http.StatusOK)
if recorder.Code != http.StatusOK {
t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
}
var response TransactionsResponse
err = json.NewDecoder(rr.Body).Decode(&response)
err = json.NewDecoder(recorder.Body).Decode(&response)
if err != nil {
t.Error(err.Error())
t.Error("Error retreiving list of transactions.")

7
http/http.go
View File

@ -11,7 +11,6 @@ import (
"git.javil.eu/jacob1123/budgeteer"
"git.javil.eu/jacob1123/budgeteer/bcrypt"
"git.javil.eu/jacob1123/budgeteer/postgres"
"git.javil.eu/jacob1123/budgeteer/web"
"github.com/gin-gonic/gin"
)
@ -36,12 +35,6 @@ func (h *Handler) Serve() {
// LoadRoutes initializes all the routes
func (h *Handler) LoadRoutes(router *gin.Engine) {
static, err := fs.Sub(web.Static, "dist")
if err != nil {
panic("couldn't open static files")
}
h.StaticFS = http.FS(static)
router.Use(enableCachingForStaticFiles())
router.NoRoute(h.ServeStatic)

4
http/session.go
View File

@ -135,7 +135,7 @@ func (h *Handler) registerPost(c *gin.Context) {
c.AbortWithError(http.StatusInternalServerError, err)
}
t, err := h.TokenVerifier.CreateToken(&user)
token, err := h.TokenVerifier.CreateToken(&user)
if err != nil {
c.AbortWithError(http.StatusUnauthorized, err)
}
@ -147,7 +147,7 @@ func (h *Handler) registerPost(c *gin.Context) {
return
}
c.JSON(http.StatusOK, LoginResponse{t, user, budgets})
c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
}
func (h *Handler) UpdateLastLogin(userID uuid.UUID) {