π The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.
Vue dockergolangkanbanknowledge-baseknowledge-managementmarkdownnote-takingnotesnotes-appnotionnuxtnuxtjsoffline-firstoidcpwaselfhostedssovuevuejswiki
Fix typo & instances
Smaug67392bb7a7d7a667
diff --git a/backend/controllers/authentification.controller.go b/backend/controllers/authentification.controller.goindex 2fb0dd64..70c81948 100644--- a/backend/controllers/authentification.controller.go+++ b/backend/controllers/authentification.controller.go@@ -3,7 +3,7 @@ package controllersimport ("Smaug6739/Alexandrie/app""Smaug6739/Alexandrie/models"- service "Smaug6739/Alexandrie/services"+ "Smaug6739/Alexandrie/services""Smaug6739/Alexandrie/utils""crypto/rand""fmt"@@ -23,20 +23,23 @@ type AuthController interface {}type AuthControllerImpl struct {Controller- auth_service service.AuthService- user_service service.UserService+ auth_service services.AuthService+ user_service services.UserService}func NewAuthController(app *app.App) AuthController {return &AuthControllerImpl{- auth_service: service.NewAuthService(app.DB),- user_service: service.NewUserService(app.DB),+ auth_service: services.NewAuthService(app.DB),+ user_service: services.NewUserService(app.DB),+ Controller: Controller{+ app: app,+ },}}type AuthClaims struct {- Username string `form:"username"`- Password string `form:"password"`+ Username string `form:"username" binding:"required"`+ Password string `form:"password" binding:"required"`}func (dc *AuthControllerImpl) Login(c *gin.Context) {@@ -45,10 +48,6 @@ func (dc *AuthControllerImpl) Login(c *gin.Context) {c.JSON(http.StatusBadRequest, utils.Error(err.Error()))return}- if authClaims.Username == "" || authClaims.Password == "" {- c.JSON(400, utils.Error("Invalid credentials."))- return- }user, err := dc.user_service.GetUserByUsername(authClaims.Username)if user == nil || err != nil {c.JSON(401, utils.Error("Invalid credentials."))@@ -59,7 +58,7 @@ func (dc *AuthControllerImpl) Login(c *gin.Context) {c.JSON(401, utils.Error("Invalid credentials."))return}- tokenString, err := dc.signAccessToken(*user)+ tokenString, err := dc.signAccessToken(user)if err != nil {fmt.Println(err.Error())c.JSON(500, utils.Error("Failed to sign token."))@@ -112,7 +111,7 @@ func (dc *AuthControllerImpl) RefreshSession(c *gin.Context) {c.JSON(500, utils.Error("Failed to get user."))return}- tokenString, err := dc.signAccessToken(*user)+ tokenString, err := dc.signAccessToken(user)if err != nil {c.JSON(500, utils.Error("Failed to sign token."))return@@ -132,7 +131,7 @@ func (dc *AuthControllerImpl) RefreshSession(c *gin.Context) {}-func (dc *AuthControllerImpl) signAccessToken(user models.User) (string, error) {+func (dc *AuthControllerImpl) signAccessToken(user *models.User) (string, error) {claims := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{"sub": strconv.FormatInt(user.Id, 10), // Subject (user identifier)"iss": "alexandrie", // Issuerdiff --git a/backend/controllers/users.controller.go b/backend/controllers/users.controller.goindex 71556b3e..629ffd71 100644--- a/backend/controllers/users.controller.go+++ b/backend/controllers/users.controller.go@@ -29,6 +29,9 @@ type UserControllerImpl struct {func NewUserController(app *app.App) UserController {return &UserControllerImpl{user_service: service.NewUserService(app.DB),+ Controller: Controller{+ app: app,+ },}}diff --git a/backend/server/server.go b/backend/server/server.goindex 70dc7b6c..0ad1365d 100644--- a/backend/server/server.go+++ b/backend/server/server.go@@ -19,6 +19,7 @@ func SetupServer() (*gin.Engine, *app.App) {// Charger la configuration depuis config.tomlconfig := app.Config{}_, err := toml.DecodeFile("config.toml", &config)+ fmt.Println(config)if err != nil {fmt.Fprintln(os.Stderr, err)os.Exit(1)diff --git a/backend/services/services.go b/backend/services/services.goindex 21b39eac..0e39bfe1 100644--- a/backend/services/services.go+++ b/backend/services/services.go@@ -1,4 +1,4 @@-package service+package servicesimport "database/sql"diff --git a/backend/services/session.service.go b/backend/services/session.service.goindex bd1794b5..c02e54a6 100644--- a/backend/services/session.service.go+++ b/backend/services/session.service.go@@ -1,4 +1,4 @@-package service+package servicesimport ("Smaug6739/Alexandrie/models"diff --git a/backend/services/user.service.go b/backend/services/user.service.goindex 76f6e774..bff2b58f 100644--- a/backend/services/user.service.go+++ b/backend/services/user.service.go@@ -1,4 +1,4 @@-package service+package servicesimport ("Smaug6739/Alexandrie/models"@@ -60,9 +60,9 @@ func (s *Service) CreateUser(user *models.User) (*models.User, error) {func (s *Service) GetUserByUsername(username string) (*models.User, error) {var user models.User- err := s.db.QueryRow("SELECT id, username, firstname, lastname, role, avatar, email, created_timestamp, updated_timestamp FROM users WHERE username = ?", username).Scan(+ err := s.db.QueryRow("SELECT id, username, firstname, lastname, role, avatar, email, password, created_timestamp, updated_timestamp FROM users WHERE username = ?", username).Scan(&user.Id, &user.Username, &user.Firstname, &user.Lastname,- &user.Role, &user.Avatar, &user.Email, &user.CreatedTimestamp, &user.UpdatedTimestamp,+ &user.Role, &user.Avatar, &user.Email, &user.Password, &user.CreatedTimestamp, &user.UpdatedTimestamp,)if err != nil {