crimson-quirks/crimson-vault
1
0
Fork 0
mirror of https://github.com/hazemKrimi/crimson-vault.git synced 2026-05-01 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: route trailing slash

Browse Source
This commit is contained in:
Hazem Krimi
2025-06-09 13:19:49 +01:00
parent 14ce860c37
commit 9bc18666ad
5 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/api.go
+4 -2
View File
@@ -15,8 +15,8 @@ import (
type API struct {
ConfigDirectory string
instance *echo.Echo
db *models.DB
instance *echo.Echo
db *models.DB
}
func (api *API) Initialize() {
@@ -34,11 +34,13 @@ func (api *API) Initialize() {
api.instance = ech
api.db = db
// TODO: Update with appropriate origins when finishing v1
api.instance.Use(middleware.CORSWithConfig(middleware.CORSConfig{
AllowOrigins: []string{"*"},
}))
// TODO: Change and store the secret separately when finilizing v1.
api.instance.Use(session.Middleware(sessions.NewCookieStore([]byte("SECRET"))))
api.instance.Pre(middleware.AddTrailingSlash())
api.ClientRoutes()
api.UserRoutes()
internal/api/auth.go
+3 -1
View File
@@ -79,6 +79,8 @@ func (api *API) LogoutHandler(context echo.Context) error {
return context.String(http.StatusInternalServerError, "Unexpected error deleting User session!")
}
log.Println(fmt.Sprintf("User with SessionID %s logged out.", sessionId))
id := context.Get("id")
log.Println(fmt.Sprintf("User with ID %s logged out.", id))
return context.String(http.StatusOK, "Logged out successfully!")
}
internal/api/middleware.go
+1
View File
@@ -36,6 +36,7 @@ func (api *API) AuthSessionMiddleware(next echo.HandlerFunc) echo.HandlerFunc {
return context.String(http.StatusUnauthorized, "User not authenticated!")
}
context.Set("id", sess.Values["id"])
context.Set("sessionId", sess.Values["sessionId"])
context.Set("username", sess.Values["username"])
internal/api/routes.go
+12 -12
View File
@@ -3,13 +3,13 @@ package api
import "github.com/labstack/echo/v4/middleware"
func (api *API) ClientRoutes() {
clients := api.instance.Group("/api/clients")
clients := api.instance.Group("/api/clients", api.AuthSessionMiddleware)
clients.GET("/", api.GetAllClientsHandler)
clients.POST("/", api.CreateClientHandler)
clients.GET("/:id", api.GetClientHandler)
clients.PUT("/:id", api.UpdateClientHandler)
clients.DELETE("/:id", api.DeleteClientHandler)
clients.GET("/:id/", api.GetClientHandler)
clients.PUT("/:id/", api.UpdateClientHandler)
clients.DELETE("/:id/", api.DeleteClientHandler)
}
func (api *API) UserRoutes() {
@@ -17,17 +17,17 @@ func (api *API) UserRoutes() {
users.GET("/", api.GetAllUsersHandler)
users.POST("/", api.CreateUserHandler)
users.GET("/:id", api.GetUserHandler)
users.PUT("/:id", api.UpdateUserHandler, api.AuthSessionMiddleware)
users.PUT("/:id/security", api.UpdateUserSecurityDetailsHandler)
users.PUT("/:id/logo", api.UpdateUserLogoHandler, middleware.BodyLimit("2M"))
users.DELETE("/:id", api.DeleteUserHandler)
users.DELETE("/:id/logo", api.DeleteUserLogoHandler)
users.GET("/:id/", api.GetUserHandler)
users.PUT("/:id/", api.UpdateUserHandler, api.AuthSessionMiddleware)
users.PUT("/:id/security/", api.UpdateUserSecurityDetailsHandler)
users.PUT("/:id/logo/", api.UpdateUserLogoHandler, middleware.BodyLimit("2M"))
users.DELETE("/:id/", api.DeleteUserHandler, api.AuthSessionMiddleware)
users.DELETE("/:id/logo/", api.DeleteUserLogoHandler, api.AuthSessionMiddleware)
}
func (api *API) AuthRoutes() {
auth := api.instance.Group("/api/auth")
auth.POST("/login", api.LoginHandler)
auth.DELETE("/logout", api.LogoutHandler, api.AuthSessionMiddleware)
auth.POST("/login/", api.LoginHandler)
auth.DELETE("/logout/", api.LogoutHandler, api.AuthSessionMiddleware)
}
internal/lib/utils.go
+1
View File
@@ -43,6 +43,7 @@ func CreateSession(session *sessions.Session, context echo.Context, user *types.
MaxAge: 3600,
HttpOnly: true,
}
session.Values["id"] = user.ID
session.Values["sessionId"] = user.SessionID
session.Values["username"] = user.Username