add i18n
This commit is contained in:
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user