stereo.cat/backend
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

some cleaning up

Browse source
This commit is contained in:
hexlocation 2025-06-15 12:09:55 +02:00
parent e3049dddd9
commit a6a02d3521
4 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/api/routes/auth.go
View file

@ -5,7 +5,7 @@ import (
"time"
"github.com/gin-gonic/gin"
"stereo.cat/backend/internal/auth"
"stereo.cat/backend/internal/auth/token"
"stereo.cat/backend/internal/types"
)
@ -25,7 +25,7 @@ func RegisterAuthRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) {
panic(err)
}
jwt, err := auth.GenerateJWT(cfg.JWTSecret, user, uint64(time.Now().Add(time.Second*time.Duration(t.ExpiresIn)).Unix()))
jwt, err := token.GenerateJWT(cfg.JWTSecret, user, uint64(time.Now().Add(time.Second*time.Duration(t.ExpiresIn)).Unix()))
if err != nil {
panic(err)
@ -47,7 +47,7 @@ func RegisterAuthRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) {
c.Redirect(http.StatusTemporaryRedirect, cfg.FrontendUri+"?jwt_set=true")
})
api.GET("/auth/me", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) {
api.GET("/auth/me", token.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) {
claims, _ := c.Get("claims")
c.JSON(http.StatusOK, claims)
})

18
internal/api/routes/files.go
View file

@ -12,6 +12,7 @@ import (
"github.com/h2non/filetype"
"github.com/minio/minio-go/v7"
"stereo.cat/backend/internal/auth"
"stereo.cat/backend/internal/auth/token"
"stereo.cat/backend/internal/types"
)
@ -20,7 +21,7 @@ func intoReader(buf []byte) io.Reader {
}
func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) {
api.POST("/upload", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) {
api.POST("/upload", token.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) {
claims := c.MustGet("claims").(jwt.MapClaims)
user := claims["user"].(auth.User)
@ -88,7 +89,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) {
c.JSON(200, gin.H{"message": "file uploaded successfully", "id": fileMeta.ID.String()})
})
api.DELETE("/:id", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) {
api.DELETE("/:id", token.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) {
claims := c.MustGet("claims").(jwt.MapClaims)
user := claims["user"].(auth.User)
@ -100,15 +101,10 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) {
var file *types.File
cfg.Database.First(&file, fileID)
err = cfg.Database.First(&file, fileID).Error
if file == nil {
err := cfg.Database.Delete(&file).Error
if err != nil {
types.ErrorDatabase.Throw(c, err)
return
}
types.ErrorFileNotFound.Throw(c, nil)
if err != nil {
types.ErrorFileNotFound.Throw(c, err)
return
}
@ -162,7 +158,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) {
c.DataFromReader(200, file.Size, file.Mime, object, nil)
})
api.GET("/list", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) {
api.GET("/list", token.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) {
claims := c.MustGet("claims").(jwt.MapClaims)
user := claims["user"].(auth.User)