diff --git a/src/README.md b/src/README.md
index a0fe930..b2c101c 100644
--- a/src/README.md
+++ b/src/README.md
@@ -9,7 +9,7 @@ Inserting an expense where the owner has no payments results in a panic
# DOING
--
+- Auth
# TODO
diff --git a/src/assets/css/aesthetic.css b/src/assets/css/aesthetic.css
index bc5413b..e892130 100644
--- a/src/assets/css/aesthetic.css
+++ b/src/assets/css/aesthetic.css
@@ -27,19 +27,19 @@
@keyframes flicker {
0% {
- opacity: 0.9;
- }
- 20% {
opacity: 1.1;
}
- 40% {
+ 20% {
opacity: 0.9;
}
+ 40% {
+ opacity: 1.1;
+ }
60% {
opacity: 0.9;
}
80% {
- opacity: 1.1;
+ opacity: 1;
}
100% {
opacity: 1.1;
@@ -422,5 +422,14 @@ dt {
font-size: var(--html_mobile_font_size);
}
}
+#login-box-boundaries {
+ height: 100%;
+}
+
+.login-container {
+ display: block;
+ margin: auto;
+ text-align: center;
+}
/*# sourceMappingURL=aesthetic.css.map */
diff --git a/src/assets/css/aesthetic.css.map b/src/assets/css/aesthetic.css.map
index ec1a84f..ec0b832 100644
--- a/src/assets/css/aesthetic.css.map
+++ b/src/assets/css/aesthetic.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["crt.scss","expensesTable.scss","forms.scss","modals.scss","main.scss"],"names":[],"mappings":";AAMA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EAIA;EACA;EACA;EACA;EAEA;;;AAGF;EAII;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;;AAKN;EACE;IACE;;;AAIJ;EACE;IACE;;EAGF;IACE;;EAGF;IACE;;;AAIJ;EACE;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;;ACtJJ;EACE;EACA;EACA;;;AAGF;EACE;;;ACPF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;AAAA;EAEE;EACA;;;AC1DF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;ACnBF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EAEA;EAEA;EACA;AAEA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EAEA;EAEA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;AAEA;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAAA;EAEE;EACA,aACE;;;AAGJ;EACE;;;AAGF;EACE;EACA;EAEA;EACA;;;AAGF;AACE;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EAEA;EAEA;;;AAGF;EACE;EAEA;AAEA;EACA;AACA;EACA;EAEA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AACA;AACA;AACA;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;IACE","file":"aesthetic.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["crt.scss","expensesTable.scss","forms.scss","modals.scss","main.scss"],"names":[],"mappings":";AAMA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EAIA;EACA;EACA;EACA;EAEA;;;AAGF;EAII;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;EADF;IACE;;;AAKN;EACE;IACE;;;AAIJ;EACE;IACE;;EAGF;IACE;;EAGF;IACE;;;AAIJ;EACE;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;;;ACtJJ;EACE;EACA;EACA;;;AAGF;EACE;;;ACPF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;AAAA;EAEE;EACA;;;AC1DF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;ACnBF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EAEA;EAEA;EACA;AAEA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EAEA;EAEA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;AAEA;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAAA;EAEE;EACA,aACE;;;AAGJ;EACE;;;AAGF;EACE;EACA;EAEA;EACA;;;AAGF;AACE;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EAEA;EAEA;;;AAGF;EACE;EAEA;AAEA;EACA;AACA;EACA;EAEA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AACA;AACA;AACA;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;IACE;;;AAIJ;EACE;;;AAGF;EACE;EAGA;EACA","file":"aesthetic.css"}
\ No newline at end of file
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 0ef150d..6e58a37 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -218,3 +218,15 @@ dt {
font-size: var(--html_mobile_font_size);
}
}
+
+#login-box-boundaries {
+ height: 100%;
+}
+
+.login-container {
+ display: block;
+ // width: 100%; /* Adjust width as needed */
+ // max-width: 300px; /* Adjust max-width as needed */
+ margin: auto;
+ text-align: center;
+}
diff --git a/src/assets/htmx/login.html b/src/assets/htmx/login.html
new file mode 100644
index 0000000..6af1171
--- /dev/null
+++ b/src/assets/htmx/login.html
@@ -0,0 +1,44 @@
+{{ define "login" }}
+
+
+
+{{ end }}
diff --git a/src/assets/htmx/terminal.html b/src/assets/htmx/terminal.html
index 8b4ce52..f745769 100644
--- a/src/assets/htmx/terminal.html
+++ b/src/assets/htmx/terminal.html
@@ -49,6 +49,8 @@
{{ template "expense" . }}
{{ else if eq .content "expenses" }}
{{ template "expenses" . }}
+ {{ else if eq .content "login" }}
+ {{ template "login" . }}
{{ else if eq .content "newExpense" }}
{{ template "expense" . }}
{{ else if eq .content "panic" }}
diff --git a/src/cmd/server.go b/src/cmd/server.go
index 970010d..a322c7b 100644
--- a/src/cmd/server.go
+++ b/src/cmd/server.go
@@ -2,8 +2,11 @@ package cmd
import (
"expenses/config"
+ "expenses/expenses/auth"
"expenses/pages"
+ "github.com/gin-contrib/sessions"
+ "github.com/gin-contrib/sessions/cookie"
"github.com/shopspring/decimal"
"github.com/spf13/cobra"
@@ -48,7 +51,7 @@ func configGin(cfg *config.Configuration) *gin.Engine {
return router
}
-func setRoutes(router *gin.Engine) {
+func setRoutes(router *gin.RouterGroup, eng *gin.Engine) {
pages.RouteHome(router)
pages.RouteExpenses(router)
pages.RouteCategories(router)
@@ -57,15 +60,28 @@ func setRoutes(router *gin.Engine) {
pages.RoutePayments(router)
pages.RouteShares(router)
pages.RouteOverview(router)
- pages.RouteNotFound(router)
- pages.RouteServerError(router)
+
+ // This are for the engine, I really need to rethink this
+ pages.RouteLogin(eng)
+ pages.RouteNotFound(eng)
+ pages.RouteServerError(eng)
}
func startWebserver() {
cfg := config.GetInstance()
router := configGin(cfg)
- setRoutes(router)
+ // setRoutes(router)
+
+ store := cookie.NewStore([]byte("secret"))
+ router.Use(sessions.Sessions("mysessions", store))
+
+ // Set auth groups
+ authGroup := router.Group("/")
+ authGroup.Use(auth.AuthMiddleware())
+ {
+ setRoutes(authGroup, router)
+ }
err := router.Run(":" + cfg.Port)
if err != nil {
diff --git a/src/expenses/auth/authMiddlware.go b/src/expenses/auth/authMiddlware.go
new file mode 100644
index 0000000..b2e1907
--- /dev/null
+++ b/src/expenses/auth/authMiddlware.go
@@ -0,0 +1,55 @@
+package auth
+
+import (
+ "log"
+ "net/http"
+
+ "github.com/gin-contrib/sessions"
+ "github.com/gin-gonic/gin"
+
+ exp "expenses/expenses"
+ mod "expenses/expenses/models"
+)
+
+func AuthMiddleware() gin.HandlerFunc {
+ log.Println("Are we authing?")
+ return func(c *gin.Context) {
+ log.Println("Returning the auth middleware function")
+ var user *mod.User
+ var err error
+
+ // Check if we have a cookie for the session
+ session := sessions.Default(c)
+ uid := session.Get("user_id")
+ log.Println("UID is: ", uid)
+ if uid != nil {
+ user, err = exp.App.GetUser(uid.(int32))
+ log.Println("Got User: ", user)
+ if err != nil {
+ // TODO - what do we return here?
+ return
+ }
+ }
+
+ // Check if we have an authorization header
+ // if user == nil {
+ // authHeader := c.GetHeader("Authorization")
+ // if strings.HasPrefix(authHeader, "Bearer ") {
+ // tokenStr := strings.TrimPrefix(authHeader, "Bearer ")
+ // claims, err := validateJWT(tokenStr)
+ // }
+ // }
+
+ if user == nil {
+ log.Println("No User: ", user)
+ c.Redirect(http.StatusTemporaryRedirect, "/login")
+ // Just to be sure I recon
+ c.Abort()
+ return
+ }
+
+ log.Println("Setting User: ", user)
+ c.Set("user", user)
+ c.Next()
+ }
+}
diff --git a/src/expenses/models/user.go b/src/expenses/models/user.go
index a97dae7..86b7b42 100644
--- a/src/expenses/models/user.go
+++ b/src/expenses/models/user.go
@@ -3,6 +3,7 @@ package models
type User struct {
UserID int32 `json:"UserID"`
UserName string `json:"UserName"`
+ Password string `json:"Password"`
}
type Users []User
diff --git a/src/expenses/repo/pg_userRepo.go b/src/expenses/repo/pg_userRepo.go
index 317bb21..4c49c56 100644
--- a/src/expenses/repo/pg_userRepo.go
+++ b/src/expenses/repo/pg_userRepo.go
@@ -21,6 +21,30 @@ func (p PgUserRepo) Close() {
p.DB.Close()
}
+func (p PgUserRepo) Get(ctx context.Context, id int32) (*mod.User, error) {
+ queries := pgsqlc.New(p.DB)
+ user, err := queries.GetUser(ctx, id)
+ if err != nil {
+ return &mod.User{}, err
+ }
+
+ u := mapRepoUser(user)
+
+ return &u, nil
+}
+
+func (p PgUserRepo) GetByName(ctx context.Context, name string) (*mod.User, error) {
+ queries := pgsqlc.New(p.DB)
+ user, err := queries.GetUserByName(ctx, name)
+ if err != nil {
+ return &mod.User{}, err
+ }
+
+ u := mapRepoUser(user)
+
+ return &u, nil
+}
+
func (p PgUserRepo) GetAll(ctx context.Context) (mod.Users, error) {
queries := pgsqlc.New(p.DB)
userList, err := queries.GetUsers(ctx)
diff --git a/src/expenses/repo/pg_userRepoMapper.go b/src/expenses/repo/pg_userRepoMapper.go
index 1df1966..f4edfbf 100644
--- a/src/expenses/repo/pg_userRepoMapper.go
+++ b/src/expenses/repo/pg_userRepoMapper.go
@@ -9,6 +9,7 @@ func mapRepoUser(ru pgsqlc.User) mod.User {
return mod.User{
UserID: ru.UserID,
UserName: ru.UserName,
+ Password: ru.UserPass,
}
}
diff --git a/src/expenses/repo/pgdb/pgsqlc/categories.sql.go b/src/expenses/repo/pgdb/pgsqlc/categories.sql.go
index 7a5dfcf..0c07049 100644
--- a/src/expenses/repo/pgdb/pgsqlc/categories.sql.go
+++ b/src/expenses/repo/pgdb/pgsqlc/categories.sql.go
@@ -1,6 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
-// sqlc v1.29.0
+// sqlc v1.30.0
// source: categories.sql
package pgsqlc
diff --git a/src/expenses/repo/pgdb/pgsqlc/db.go b/src/expenses/repo/pgdb/pgsqlc/db.go
index 96ba66b..03ff426 100644
--- a/src/expenses/repo/pgdb/pgsqlc/db.go
+++ b/src/expenses/repo/pgdb/pgsqlc/db.go
@@ -1,6 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
-// sqlc v1.29.0
+// sqlc v1.30.0
package pgsqlc
diff --git a/src/expenses/repo/pgdb/pgsqlc/expenses.sql.go b/src/expenses/repo/pgdb/pgsqlc/expenses.sql.go
index c3bc465..feb5218 100644
--- a/src/expenses/repo/pgdb/pgsqlc/expenses.sql.go
+++ b/src/expenses/repo/pgdb/pgsqlc/expenses.sql.go
@@ -1,6 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
-// sqlc v1.29.0
+// sqlc v1.30.0
// source: expenses.sql
package pgsqlc
diff --git a/src/expenses/repo/pgdb/pgsqlc/models.go b/src/expenses/repo/pgdb/pgsqlc/models.go
index fe1e8ba..50503b9 100644
--- a/src/expenses/repo/pgdb/pgsqlc/models.go
+++ b/src/expenses/repo/pgdb/pgsqlc/models.go
@@ -1,6 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
-// sqlc v1.29.0
+// sqlc v1.30.0
package pgsqlc
diff --git a/src/expenses/repo/pgdb/pgsqlc/payments.sql.go b/src/expenses/repo/pgdb/pgsqlc/payments.sql.go
index f5b7737..6da6980 100644
--- a/src/expenses/repo/pgdb/pgsqlc/payments.sql.go
+++ b/src/expenses/repo/pgdb/pgsqlc/payments.sql.go
@@ -1,6 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
-// sqlc v1.29.0
+// sqlc v1.30.0
// source: payments.sql
package pgsqlc
diff --git a/src/expenses/repo/pgdb/pgsqlc/shares.sql.go b/src/expenses/repo/pgdb/pgsqlc/shares.sql.go
index fcaf0ec..953db11 100644
--- a/src/expenses/repo/pgdb/pgsqlc/shares.sql.go
+++ b/src/expenses/repo/pgdb/pgsqlc/shares.sql.go
@@ -1,6 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
-// sqlc v1.29.0
+// sqlc v1.30.0
// source: shares.sql
package pgsqlc
diff --git a/src/expenses/repo/pgdb/pgsqlc/stores.sql.go b/src/expenses/repo/pgdb/pgsqlc/stores.sql.go
index 9936024..00adb80 100644
--- a/src/expenses/repo/pgdb/pgsqlc/stores.sql.go
+++ b/src/expenses/repo/pgdb/pgsqlc/stores.sql.go
@@ -1,6 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
-// sqlc v1.29.0
+// sqlc v1.30.0
// source: stores.sql
package pgsqlc
diff --git a/src/expenses/repo/pgdb/pgsqlc/types.sql.go b/src/expenses/repo/pgdb/pgsqlc/types.sql.go
index 44d8474..b385bd6 100644
--- a/src/expenses/repo/pgdb/pgsqlc/types.sql.go
+++ b/src/expenses/repo/pgdb/pgsqlc/types.sql.go
@@ -1,6 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
-// sqlc v1.29.0
+// sqlc v1.30.0
// source: types.sql
package pgsqlc
diff --git a/src/expenses/repo/pgdb/pgsqlc/users.sql.go b/src/expenses/repo/pgdb/pgsqlc/users.sql.go
index 2d2f23c..42e1e67 100644
--- a/src/expenses/repo/pgdb/pgsqlc/users.sql.go
+++ b/src/expenses/repo/pgdb/pgsqlc/users.sql.go
@@ -1,6 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
-// sqlc v1.29.0
+// sqlc v1.30.0
// source: users.sql
package pgsqlc
@@ -9,6 +9,28 @@ import (
"context"
)
+const getUser = `-- name: GetUser :one
+SELECT "UserID", "UserName", "UserPass" FROM users WHERE "UserID" = $1
+`
+
+func (q *Queries) GetUser(ctx context.Context, userid int32) (User, error) {
+ row := q.db.QueryRow(ctx, getUser, userid)
+ var i User
+ err := row.Scan(&i.UserID, &i.UserName, &i.UserPass)
+ return i, err
+}
+
+const getUserByName = `-- name: GetUserByName :one
+SELECT "UserID", "UserName", "UserPass" FROM users WHERE "UserName" = $1
+`
+
+func (q *Queries) GetUserByName(ctx context.Context, username string) (User, error) {
+ row := q.db.QueryRow(ctx, getUserByName, username)
+ var i User
+ err := row.Scan(&i.UserID, &i.UserName, &i.UserPass)
+ return i, err
+}
+
const getUsers = `-- name: GetUsers :many
SELECT "UserID", "UserName", "UserPass" FROM users
`
diff --git a/src/expenses/repo/pgdb/queries/users.sql b/src/expenses/repo/pgdb/queries/users.sql
index 7c00128..be6e875 100644
--- a/src/expenses/repo/pgdb/queries/users.sql
+++ b/src/expenses/repo/pgdb/queries/users.sql
@@ -1,2 +1,8 @@
-- name: GetUsers :many
SELECT * FROM users;
+
+-- name: GetUser :one
+SELECT * FROM users WHERE "UserID" = $1;
+
+-- name: GetUserByName :one
+SELECT * FROM users WHERE "UserName" = $1;
diff --git a/src/expenses/repo/userRepo.go b/src/expenses/repo/userRepo.go
index a38385d..0024921 100644
--- a/src/expenses/repo/userRepo.go
+++ b/src/expenses/repo/userRepo.go
@@ -6,6 +6,8 @@ import (
)
type UserRepository interface {
+ Get(ctx context.Context, id int32) (*mod.User, error)
+ GetByName(ctx context.Context, name string) (*mod.User, error)
GetAll(ctx context.Context) (mod.Users, error)
Close()
diff --git a/src/expenses/users.go b/src/expenses/users.go
index e544822..78fa0ae 100644
--- a/src/expenses/users.go
+++ b/src/expenses/users.go
@@ -5,6 +5,16 @@ import (
mod "expenses/expenses/models"
)
+func (a *ExpensesApp) GetUser(id int32) (*mod.User, error) {
+ ctx := context.Background()
+ return a.UserRepo.Get(ctx, id)
+}
+
+func (a *ExpensesApp) GetUserByName(name string) (*mod.User, error) {
+ ctx := context.Background()
+ return a.UserRepo.GetByName(ctx, name)
+}
+
func (a *ExpensesApp) GetAllUsers() ([]mod.User, error) {
ctx := context.Background()
return a.UserRepo.GetAll(ctx)
diff --git a/src/go.mod b/src/go.mod
index dec915b..fc15b83 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -4,6 +4,7 @@ go 1.24.6
require (
github.com/ESilva15/gofatqr v1.0.0
+ github.com/gin-contrib/sessions v1.0.4
github.com/gin-gonic/gin v1.10.1
github.com/golang-migrate/migrate/v4 v4.18.3
github.com/jackc/pgx/v5 v5.5.4
@@ -15,16 +16,18 @@ require (
)
require (
- github.com/bytedance/sonic v1.11.6 // indirect
- github.com/bytedance/sonic/loader v0.1.1 // indirect
- github.com/cloudwego/base64x v0.1.4 // indirect
- github.com/cloudwego/iasm v0.2.0 // indirect
- github.com/gabriel-vasile/mimetype v1.4.3 // indirect
- github.com/gin-contrib/sse v0.1.0 // indirect
+ github.com/bytedance/sonic v1.13.2 // indirect
+ github.com/bytedance/sonic/loader v0.2.4 // indirect
+ github.com/cloudwego/base64x v0.1.5 // indirect
+ github.com/gabriel-vasile/mimetype v1.4.8 // indirect
+ github.com/gin-contrib/sse v1.0.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
- github.com/go-playground/validator/v10 v10.20.0 // indirect
- github.com/goccy/go-json v0.10.2 // indirect
+ github.com/go-playground/validator/v10 v10.26.0 // indirect
+ github.com/goccy/go-json v0.10.5 // indirect
+ github.com/gorilla/context v1.1.2 // indirect
+ github.com/gorilla/securecookie v1.1.2 // indirect
+ github.com/gorilla/sessions v1.4.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -32,23 +35,23 @@ require (
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
- github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+ github.com/klauspost/cpuid/v2 v2.2.10 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
- github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+ github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
go.uber.org/atomic v1.7.0 // indirect
- golang.org/x/arch v0.8.0 // indirect
- golang.org/x/crypto v0.36.0 // indirect
+ golang.org/x/arch v0.16.0 // indirect
+ golang.org/x/crypto v0.37.0 // indirect
golang.org/x/net v0.38.0 // indirect
- golang.org/x/sync v0.12.0 // indirect
- golang.org/x/sys v0.31.0 // indirect
- golang.org/x/text v0.23.0 // indirect
- google.golang.org/protobuf v1.34.2 // indirect
+ golang.org/x/sync v0.13.0 // indirect
+ golang.org/x/sys v0.32.0 // indirect
+ golang.org/x/text v0.24.0 // indirect
+ google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/src/go.sum b/src/go.sum
index 0119a5a..4c20f35 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -4,13 +4,13 @@ github.com/ESilva15/gofatqr v1.0.0 h1:uQXfqdDW9dZwLlAZvUOwHmmXF5jvLgsGEXDgNAMAce
github.com/ESilva15/gofatqr v1.0.0/go.mod h1:9sstTFOww1SkBUGbdtW+iWmIi7tikaZkvX+qA4ahgbo=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
-github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
-github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
+github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
+github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
-github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
-github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
+github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
+github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
+github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
+github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -28,10 +28,12 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
-github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
+github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
+github.com/gin-contrib/sessions v1.0.4 h1:ha6CNdpYiTOK/hTp05miJLbpTSNfOnFg5Jm2kbcqy8U=
+github.com/gin-contrib/sessions v1.0.4/go.mod h1:ccmkrb2z6iU2osiAHZG3x3J4suJK+OU27oqzlWOqQgs=
+github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
+github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
@@ -44,10 +46,10 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
-github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
+github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
+github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang-migrate/migrate/v4 v4.18.3 h1:EYGkoOsvgHHfm5U/naS1RP/6PL/Xv3S4B/swMiAmDLs=
@@ -55,6 +57,14 @@ github.com/golang-migrate/migrate/v4 v4.18.3/go.mod h1:99BKpIi6ruaaXRM1A77eqZ+FW
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o=
+github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM=
+github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
+github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
+github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ=
+github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -73,8 +83,8 @@ github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFr
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
+github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
@@ -103,8 +113,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
-github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
-github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -128,8 +138,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
@@ -146,23 +156,21 @@ go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt3
go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
-golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/arch v0.16.0 h1:foMtLTdyOmIniqWCHjY6+JxuC54XP1fDwx4N0ASyW+U=
+golang.org/x/arch v0.16.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
+golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
+golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -172,4 +180,3 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
diff --git a/src/pages/categories.go b/src/pages/categories.go
index 4842539..b21045e 100644
--- a/src/pages/categories.go
+++ b/src/pages/categories.go
@@ -117,7 +117,7 @@ func deleteCategory(c *gin.Context) {
c.Status(http.StatusNoContent)
}
-func RouteCategories(router *gin.Engine) {
+func RouteCategories(router *gin.RouterGroup) {
router.GET(CategoriesPath, categoriesGlobalPage)
router.GET(CategoriesPath+"/:id", categoryPage)
router.POST(CategoriesPath, categoriesGlobalPage)
diff --git a/src/pages/expenses.go b/src/pages/expenses.go
index 7dab142..34db93a 100644
--- a/src/pages/expenses.go
+++ b/src/pages/expenses.go
@@ -255,7 +255,7 @@ func qrRequest(c *gin.Context) {
c.JSON(200, response)
}
-func RouteExpenses(router *gin.Engine) {
+func RouteExpenses(router *gin.RouterGroup) {
router.GET(ExpensesPath, ExpensesGlobalPage)
router.GET(ExpensesPath+"/:id", expensePage)
router.POST(ExpensesPath, expensesPartial)
diff --git a/src/pages/home.go b/src/pages/home.go
index b47d5a7..6ed299a 100644
--- a/src/pages/home.go
+++ b/src/pages/home.go
@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
-func RouteHome(router *gin.Engine) {
+func RouteHome(router *gin.RouterGroup) {
router.GET("/", func(c *gin.Context) {
c.Redirect(http.StatusFound, ExpensesPath)
})
diff --git a/src/pages/login.go b/src/pages/login.go
new file mode 100644
index 0000000..ede78bb
--- /dev/null
+++ b/src/pages/login.go
@@ -0,0 +1,56 @@
+package pages
+
+import (
+ exp "expenses/expenses"
+ "net/http"
+
+ "github.com/gin-contrib/sessions"
+ "github.com/gin-gonic/gin"
+ "golang.org/x/crypto/bcrypt"
+)
+
+const (
+ LoginPath = "/login"
+)
+
+func loginPage(c *gin.Context) {
+ c.HTML(http.StatusOK, "terminal", gin.H{
+ "page": "expenses",
+ "renderNavBar": false,
+ "content": "login",
+ })
+}
+
+func loginUser(c *gin.Context) {
+ username := c.PostForm("login-user")
+ password := c.PostForm("login-pass")
+
+ user, err := exp.App.GetUserByName(username)
+ if err != nil {
+ // TODO - go to an error page here
+ return
+ }
+
+ // Check password
+ err = bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password))
+ if err != nil {
+ // TODO - wrong password
+ return
+ }
+
+ // Store new session
+ session := sessions.Default(c)
+ session.Set("user_id", user.UserID)
+ if err := session.Save(); err != nil {
+ // TODO - error storing session
+ return
+ }
+
+ c.Header("Hx-Redirect", "/")
+ c.Status(http.StatusOK)
+}
+
+func RouteLogin(router *gin.Engine) {
+ router.GET(LoginPath, loginPage)
+ router.POST(LoginPath, loginUser)
+}
diff --git a/src/pages/overview.go b/src/pages/overview.go
index 9956220..2141d56 100644
--- a/src/pages/overview.go
+++ b/src/pages/overview.go
@@ -83,7 +83,7 @@ func getResults(c *gin.Context) {
})
}
-func RouteOverview(router *gin.Engine) {
+func RouteOverview(router *gin.RouterGroup) {
router.GET("/overview", overviewPage)
router.POST("/overview", overviewPartialPage)
diff --git a/src/pages/payments.go b/src/pages/payments.go
index da17c8e..6b0c1d0 100644
--- a/src/pages/payments.go
+++ b/src/pages/payments.go
@@ -65,7 +65,7 @@ func addPayment(c *gin.Context) {
}
}
-func RoutePayments(router *gin.Engine) {
+func RoutePayments(router *gin.RouterGroup) {
router.DELETE("/payments/:id", deletePayment)
router.POST("/payments/add", addPayment)
diff --git a/src/pages/shares.go b/src/pages/shares.go
index d17b5dc..ddcc385 100644
--- a/src/pages/shares.go
+++ b/src/pages/shares.go
@@ -32,6 +32,6 @@ func deleteShare(c *gin.Context) {
c.Status(http.StatusNoContent)
}
-func RouteShares(router *gin.Engine) {
+func RouteShares(router *gin.RouterGroup) {
router.DELETE("/shares/:id", deleteShare)
}
diff --git a/src/pages/stores.go b/src/pages/stores.go
index 741098d..6fee0ef 100644
--- a/src/pages/stores.go
+++ b/src/pages/stores.go
@@ -137,7 +137,7 @@ func getNIF(c *gin.Context) {
c.JSON(200, response)
}
-func RouteStores(router *gin.Engine) {
+func RouteStores(router *gin.RouterGroup) {
router.GET(StoresPath, storesGlobalPage)
router.GET(StoresPath+"/:id", storePage)
router.POST(StoresPath, storesGlobalPage)
diff --git a/src/pages/types.go b/src/pages/types.go
index 465098f..3ccaf5c 100644
--- a/src/pages/types.go
+++ b/src/pages/types.go
@@ -112,7 +112,7 @@ func updateType(c *gin.Context) {
c.Header("HX-Trigger", "{\"formState\":\"Success\"}")
}
-func RouteTypes(router *gin.Engine) {
+func RouteTypes(router *gin.RouterGroup) {
router.GET(TypesPath, typesGlobalPage)
router.GET(TypesPath+"/:id", typePage)
router.POST(TypesPath, typesGlobalPage)