artlef/bibliomane
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects 1 Releases 3 Wiki Activity

add i18n

Browse Source
This commit is contained in:
Arthur Lefebvre
2025-10-09 00:11:34 +02:00
parent 1ead02ab69
commit 774756a747
20 changed files with 288 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
internal/api/routes.go
View File

@@ -5,6 +5,8 @@ import (
"fmt"
"net/http"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"git.artlef.fr/PersonalLibraryManager/internal/i18nresource"
"git.artlef.fr/PersonalLibraryManager/internal/jwtauth"
"git.artlef.fr/PersonalLibraryManager/internal/model"
"github.com/gin-gonic/gin"
@@ -13,84 +15,84 @@ import (
"gorm.io/gorm"
)
func GetMyBooksHanderl(c *gin.Context, db *gorm.DB) {
func GetMyBooksHanderl(ac appcontext.AppContext) {
var userbooks []model.UserBook
user, err := getAuthenticatedUser(c, db)
user, err := getAuthenticatedUser(ac)
if err != nil {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
return
}
db.Preload("Book").Where("user_id = ?", user.ID).Find(&userbooks)
ac.Db.Preload("Book").Where("user_id = ?", user.ID).Find(&userbooks)
var booksDto []bookUserGet
for _, userbook := range userbooks {
booksDto = append(booksDto, fromUserBookDb(&userbook))
}
c.JSON(http.StatusOK, booksDto)
ac.C.JSON(http.StatusOK, booksDto)
}
func PostBookHandler(c *gin.Context, db *gorm.DB) {
func PostBookHandler(ac appcontext.AppContext) {
var book bookPostCreate
err := c.ShouldBindJSON(&book)
err := ac.C.ShouldBindJSON(&book)
if err != nil {
manageBindingError(c, err)
manageBindingError(ac, err)
return
}
user, fetchUserErr := getAuthenticatedUser(c, db)
user, fetchUserErr := getAuthenticatedUser(ac)
if fetchUserErr != nil {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
return
}
bookDb := book.toBook(&user)
err = db.Model(&model.Book{}).Save(&bookDb).Error
err = ac.Db.Model(&model.Book{}).Save(&bookDb).Error
if err != nil {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
return
}
c.String(200, "Success")
ac.C.String(200, "Success")
}
func PostSignupHandler(c *gin.Context, db *gorm.DB) {
func PostSignupHandler(ac appcontext.AppContext) {
var user userSignup
err := c.ShouldBindJSON(&user)
err := ac.C.ShouldBindJSON(&user)
if err != nil {
manageBindingError(c, err)
manageBindingError(ac, err)
return
}
userDb, err := user.toUser()
if err != nil {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
return
}
err = db.Model(&model.User{}).Save(&userDb).Error
err = ac.Db.Model(&model.User{}).Save(&userDb).Error
if err != nil {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
return
}
c.String(200, "Success")
ac.C.String(200, "Success")
}
func PostLoginHandler(c *gin.Context, db *gorm.DB) {
func PostLoginHandler(ac appcontext.AppContext) {
var user userLogin
err := c.ShouldBindJSON(&user)
err := ac.C.ShouldBindJSON(&user)
if err != nil {
manageBindingError(c, err)
manageBindingError(ac, err)
return
}
if !isUserAndPasswordOk(db, user.Username, user.Password) {
c.JSON(http.StatusInternalServerError,
gin.H{"error": "Invalid credentials."})
if !isUserAndPasswordOk(ac.Db, user.Username, user.Password) {
ac.C.JSON(http.StatusInternalServerError,
gin.H{"error": i18nresource.GetTranslatedMessage(ac, "InvalidCredentials")})
return
}
var jwtToken string
jwtToken, err = jwtauth.GenerateJwtToken(user.Username)
if err != nil {
c.JSON(http.StatusUnauthorized,
ac.C.JSON(http.StatusUnauthorized,
gin.H{"error": fmt.Errorf("Error when generating JWT token: %w", err)})
return
}
c.JSON(200, gin.H{"message": "Authentication was a success.", "token": jwtToken})
ac.C.JSON(200, gin.H{"message": i18nresource.GetTranslatedMessage(ac, "AuthenticationSuccess"), "token": jwtToken})
}
func isUserAndPasswordOk(db *gorm.DB, username string, password string) bool {
@@ -100,22 +102,22 @@ func isUserAndPasswordOk(db *gorm.DB, username string, password string) bool {
return err == nil
}
func getAuthenticatedUser(c *gin.Context, db *gorm.DB) (model.User, error) {
func getAuthenticatedUser(ac appcontext.AppContext) (model.User, error) {
var user model.User
username, userIsInContext := c.Get("user")
username, userIsInContext := ac.C.Get("user")
if !userIsInContext {
return user, errors.New("User not found in context")
}
res := db.Where("name = ?", username).First(&user)
res := ac.Db.Where("name = ?", username).First(&user)
return user, res.Error
}
func manageBindingError(c *gin.Context, err error) {
func manageBindingError(ac appcontext.AppContext, err error) {
var ve validator.ValidationErrors
if errors.As(err, &ve) {
c.JSON(http.StatusBadRequest, getValidationErrors(&ve))
ac.C.JSON(http.StatusBadRequest, getValidationErrors(ac, &ve))
} else {
manageDefaultError(c, err)
manageDefaultError(ac.C, err)
}
}

16
internal/api/validator.go
View File

@@ -3,6 +3,8 @@ package api
import (
"fmt"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"git.artlef.fr/PersonalLibraryManager/internal/i18nresource"
"github.com/go-playground/validator/v10"
)
@@ -11,27 +13,27 @@ type apiValidationError struct {
Err string `json:"error"`
}
func getValidationErrors(ve *validator.ValidationErrors) []apiValidationError {
func getValidationErrors(ac appcontext.AppContext, ve *validator.ValidationErrors) []apiValidationError {
errors := make([]apiValidationError, len(*ve))
for i, fe := range *ve {
errors[i] = apiValidationError{
Field: fe.Field(),
Err: computeValidationMessage(&fe),
Err: computeValidationMessage(ac, &fe),
}
}
return errors
}
func computeValidationMessage(fe *validator.FieldError) string {
func computeValidationMessage(ac appcontext.AppContext, fe *validator.FieldError) string {
tag := (*fe).Tag()
switch tag {
case "required":
return fmt.Sprintf("%s is required.", (*fe).Field())
return i18nresource.GetTranslatedMessage(ac, "ValidationRequired")
case "min":
return fmt.Sprintf("%s is not long enough. It should be at least %s characters.", (*fe).Field(), (*fe).Param())
return fmt.Sprintf(i18nresource.GetTranslatedMessage(ac, "ValidationTooShort"), (*fe).Param())
case "max":
return fmt.Sprintf("%s is too long. It should be under %s characters.", (*fe).Field(), (*fe).Param())
return fmt.Sprintf(i18nresource.GetTranslatedMessage(ac, "ValidationTooLong"), (*fe).Param())
default:
return fmt.Sprintf("Validation failed for '%s' property.", tag)
return fmt.Sprintf(i18nresource.GetTranslatedMessage(ac, "ValidationPropertyFail"), tag)
}
}

13
internal/appcontext/main.go Normal file
View File

@@ -0,0 +1,13 @@
package appcontext
import (
"github.com/gin-gonic/gin"
"github.com/nicksnyder/go-i18n/v2/i18n"
"gorm.io/gorm"
)
type AppContext struct {
C *gin.Context
Db *gorm.DB
I18n *i18n.Bundle
}

6
internal/i18nresource/locale.en.toml Normal file
View File

@@ -0,0 +1,6 @@
InvalidCredentials = "Invalid credentials."
AuthenticationSuccess = "Authentication was a success."
ValidationRequired = "This field is required."
ValidationTooShort = "This field is too short. It should be at least %s characters."
ValidationTooLong = "This field is too long. It should be under %s characters."
ValidationPropertyFail = "Validation failed for '%s' property."

6
internal/i18nresource/locale.fr.toml Normal file
View File

@@ -0,0 +1,6 @@
InvalidCredentials = "Identifiants invalides."
AuthenticationSuccess = "Connexion réussie."
ValidationRequired = "Ce champ est requis."
ValidationTooShort = "Ce champ est trop court. Il devrait contenir au moins %s caractères."
ValidationTooLong = "Ce champ est trop long. Il ne devrait pas dépasser %s caractères."
ValidationPropertyFail = "La validation a échoué pour la propriété '%s'."

32
internal/i18nresource/main.go Normal file
View File

@@ -0,0 +1,32 @@
package i18nresource
import (
"embed"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"github.com/nicksnyder/go-i18n/v2/i18n"
"github.com/pelletier/go-toml"
"golang.org/x/text/language"
)
//go:embed locale.*.toml
var localeFS embed.FS
func InitializeI18n() *i18n.Bundle {
bundle := i18n.NewBundle(language.English)
bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
bundle.LoadMessageFileFS(localeFS, "locale.en.toml")
bundle.LoadMessageFileFS(localeFS, "locale.fr.toml")
return bundle
}
func GetTranslatedMessage(ac appcontext.AppContext, messageID string) string {
localizer := i18n.NewLocalizer(ac.I18n, ac.C.GetHeader("Accept-Language"))
message, err := localizer.LocalizeMessage(&i18n.Message{
ID: messageID,
})
if err != nil {
message = err.Error()
}
return message
}

11
internal/setup/setup.go
View File

@@ -5,8 +5,10 @@ import (
"github.com/gin-gonic/gin"
"git.artlef.fr/PersonalLibraryManager/internal/api"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"git.artlef.fr/PersonalLibraryManager/internal/config"
"git.artlef.fr/PersonalLibraryManager/internal/db"
i18nresource "git.artlef.fr/PersonalLibraryManager/internal/i18nresource"
"git.artlef.fr/PersonalLibraryManager/internal/jwtauth"
"git.artlef.fr/PersonalLibraryManager/internal/middleware"
)
@@ -20,17 +22,18 @@ func Setup(config *config.Config) *gin.Engine {
r := gin.Default()
r.Use(cors.New(configureCors())) // All origins allowed by default
r.Use(middleware.Auth())
bundle := i18nresource.InitializeI18n()
r.GET("/mybooks", func(c *gin.Context) {
api.GetMyBooksHanderl(c, db)
api.GetMyBooksHanderl(appcontext.AppContext{C: c, Db: db, I18n: bundle})
})
r.POST("/book", func(c *gin.Context) {
api.PostBookHandler(c, db)
api.PostBookHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle})
})
r.POST("/auth/signup", func(c *gin.Context) {
api.PostSignupHandler(c, db)
api.PostSignupHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle})
})
r.POST("/auth/login", func(c *gin.Context) {
api.PostLoginHandler(c, db)
api.PostLoginHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle})
})
return r
}