📚 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
Improvments
Smaug67391aaa310ebb70
diff --git a/backend/app/app.go b/backend/app/app.goindex 37f1f20d..ad2ed5ed 100644--- a/backend/app/app.go+++ b/backend/app/app.go@@ -16,6 +16,5 @@ func InitApp() *App {var app Appapp.DB = DBConection()app.Snowflake = utils.NewSnowflake(1609459200000)-return &app}diff --git a/backend/controllers/authentification.controller.go b/backend/controllers/authentification.controller.goindex 2c4de971..0688c077 100644--- a/backend/controllers/authentification.controller.go+++ b/backend/controllers/authentification.controller.go@@ -1,8 +1,8 @@package controllersimport (- "Smaug6739/Alexandrie/app""Smaug6739/Alexandrie/models"+ "Smaug6739/Alexandrie/utils""crypto/rand""fmt""time"@@ -12,50 +12,30 @@ import ("golang.org/x/crypto/bcrypt")-type AuthController struct {- app *app.App- model *models.Model-}-var refresh_token_expiration = 7 * 24 * 60 * 60 * 1000 // 7 days-func NewAuthController(app *app.App) *AuthController {- return &AuthController{- app: app,- model: models.NewModel(app.DB),- }-}--// Connexion:-// L'utilisateur fournit son nom d'utilisateur et son mot de passe.-// Si les informations sont correctes, un token JWT est généré et renvoyé à l'utilisateur.-// On signe également un refresh token (chaine aléatoire) et on le stocke en base de données dans une (Session) table.-// On set un cookie avec le refresh token & l'access token.-// On renvoit l'User sans le mot de passe.--func (dc *AuthController) Login(c *gin.Context) {+func (dc *Controller) Login(c *gin.Context) {username := c.PostForm("username")password := c.PostForm("password")- fmt.Println(username, password)-if username == "" || password == "" {- c.JSON(400, gin.H{"error": "Invalid credentials. 1"})+ c.JSON(400, utils.Error("Invalid credentials."))+ return+ }+ user, err := dc.model.GetUserByUsername(username)+ if user == nil || err != nil {+ c.JSON(401, utils.Error("Invalid credentials."))return}- user := dc.model.GetUserByUsername(username)-- macth_err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password))- if macth_err != nil {- c.JSON(401, gin.H{"error": "Invalid credentials."})+ if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password)); err != nil {+ 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, gin.H{"error": "Failed to sign token."})-+ c.JSON(500, utils.Error("Failed to sign token."))return}@@ -70,58 +50,62 @@ func (dc *AuthController) Login(c *gin.Context) {LoginTimestamp: time.Now().UnixMilli(),LogoutTimestamp: 0,}- _, errs := dc.model.CreateSession(&session)- if errs != nil {- c.JSON(500, gin.H{"error": "Failed to create session."})++ if _, err := dc.model.CreateSession(&session); err != nil {+ c.JSON(500, utils.Error("Failed to create session."))return}c.SetCookie("Authorization", tokenString, 1800, "/", "localhost", false, true) // TODO: Replace with configc.SetCookie("RefreshToken", session.RefreshToken, int(time.Duration(refresh_token_expiration).Seconds()), "/", "localhost", false, true)- c.JSON(200, gin.H{"message": "Login successful"})+ c.JSON(200, utils.Success(user))}-func (dc *AuthController) RefreshSession(c *gin.Context) {+func (dc *Controller) RefreshSession(c *gin.Context) {// Get the refresh token from the cookierefreshToken, err := c.Cookie("RefreshToken")if err != nil {- c.JSON(401, gin.H{"error": "No refresh token provided."})+ c.JSON(401, utils.Error("No refresh token provided."))return}session, err := dc.model.GetSession(refreshToken)if err != nil {- c.JSON(401, gin.H{"error": "Invalid refresh token."})+ c.JSON(401, utils.Error("Invalid refresh token."))return}if session.ExpireToken < time.Now().UnixMilli() {- c.JSON(401, gin.H{"error": "Refresh token expired."})+ c.JSON(401, utils.Error("Refresh token expired."))return}// Generate a new access token- user := dc.model.GetUserById(session.UserId)- tokenString, err := dc.signAccessToken(user)+ user, err := dc.model.GetUserById(session.UserId)+ if user == nil || err != nil {+ c.JSON(500, utils.Error("Failed to get user."))+ return+ }+ tokenString, err := dc.signAccessToken(*user)if err != nil {- c.JSON(500, gin.H{"error": "Failed to sign token."})+ c.JSON(500, utils.Error("Failed to sign token."))return}// Update the sessionsession.RefreshToken = signRefreshToken()session.ExpireToken = time.Now().Add(time.Duration(refresh_token_expiration)).UnixMilli()session.LastRefreshTimestamp = time.Now().UnixMilli()- _, err = dc.model.UpdateSession(&session)- if err != nil {- c.JSON(500, gin.H{"error": "Failed to update session."})+ if _, err = dc.model.UpdateSession(&session); err != nil {+ c.JSON(500, utils.Error("Failed to update session."))return}+c.SetCookie("Authorization", tokenString, 1800, "/", "localhost", false, true) // TODO: Replace with configc.SetCookie("RefreshToken", session.RefreshToken, int(time.Duration(refresh_token_expiration).Seconds()), "/", "localhost", false, true)- c.JSON(200, gin.H{"message": "Token refreshed."})+ c.JSON(200, utils.Error("Token refreshed."))}-func (dc *AuthController) signAccessToken(user models.User) (string, error) {+func (dc *Controller) signAccessToken(user models.User) (string, error) {claims := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{"sub": user.Username, // Subject (user identifier)"iss": "alexandrie", // Issuerdiff --git a/backend/controllers/index.go b/backend/controllers/index.gonew file mode 100644index 00000000..472068c1--- /dev/null+++ b/backend/controllers/index.go@@ -0,0 +1,18 @@+package controllers++import (+ "Smaug6739/Alexandrie/app"+ "Smaug6739/Alexandrie/models"+)++type Controller struct {+ app *app.App+ model *models.Model+}++func NewController(app *app.App) *Controller {+ return &Controller{+ app: app,+ model: models.NewModel(app.DB),+ }+}diff --git a/backend/controllers/users.controller.go b/backend/controllers/users.controller.goindex a1e47abb..c834dd77 100644--- a/backend/controllers/users.controller.go+++ b/backend/controllers/users.controller.go@@ -1,28 +1,14 @@package controllersimport (- "Smaug6739/Alexandrie/app"- "Smaug6739/Alexandrie/models""net/http""github.com/gin-gonic/gin")-type UserController struct {- app *app.App- user_model *models.Model-}--func NewUserController(app *app.App) *UserController {- return &UserController{- app: app,- user_model: models.NewModel(app.DB),- }-}--func (ctr *UserController) GetUsers(c *gin.Context) {+func (ctr *Controller) GetUsers(c *gin.Context) {- users, err := ctr.user_model.GetAllUsers()+ users, err := ctr.model.GetAllUsers()if err != nil {c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})returndiff --git a/backend/models/user.model.go b/backend/models/user.model.goindex 77daa030..f9aed175 100644--- a/backend/models/user.model.go+++ b/backend/models/user.model.go@@ -1,5 +1,10 @@package models+import (+ "database/sql"+ "errors"+)+type User struct {Id int64 `json:"id"`Username string `json:"username"`@@ -40,32 +45,53 @@ func (m *Model) GetAllUsers() ([]User, error) {return users, nil}-func (m *Model) GetUser(id int64) (User, error) {+func (m *Model) GetUser(id int64) (*User, error) {var user User- m.DB.QueryRow("SELECT id, username, firstname, lastname, role, avatar, email, password, created_timestamp, updated_timestamp FROM users WHERE id = ?", id).Scan(+ err := m.DB.QueryRow("SELECT id, username, firstname, lastname, role, avatar, email, password, created_timestamp, updated_timestamp FROM users WHERE id = ?", id).Scan(&user.Id, &user.Username, &user.Firstname, &user.Lastname,&user.Role, &user.Avatar, &user.Email, &user.Password, &user.CreatedTimestamp, &user.UpdatedTimestamp,)- return user, nil+ if errors.Is(err, sql.ErrNoRows) {+ return nil, nil+ }+ if err != nil {+ return nil, err+ }++ return &user, nil}-func (m *Model) GetUserByUsername(username string) User {+func (m *Model) GetUserByUsername(username string) (*User, error) {var user User- m.DB.QueryRow("SELECT id, username, firstname, lastname, role, avatar, email, password, created_timestamp, updated_timestamp FROM users WHERE username = ?", username).Scan(+ err := m.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.Password, &user.CreatedTimestamp, &user.UpdatedTimestamp,)- return user+ if errors.Is(err, sql.ErrNoRows) {+ return nil, nil+ }+ if err != nil {+ return nil, err+ }++ return &user, nil}-func (m *Model) GetUserById(id int64) User {+func (m *Model) GetUserById(id int64) (*User, error) {var user User- m.DB.QueryRow("SELECT id, username, firstname, lastname, role, avatar, email, created_timestamp, updated_timestamp FROM users WHERE id = ?", id).Scan(+ err := m.DB.QueryRow("SELECT id, username, firstname, lastname, role, avatar, email, created_timestamp, updated_timestamp FROM users WHERE id = ?", id).Scan(&user.Id, &user.Username, &user.Firstname, &user.Lastname,&user.Role, &user.Avatar, &user.Email, &user.CreatedTimestamp, &user.UpdatedTimestamp,)- return user+ if errors.Is(err, sql.ErrNoRows) {+ return nil, nil+ }+ if err != nil {+ return nil, err+ }++ return &user, nil}diff --git a/backend/router/routes/auth.go b/backend/router/routes/auth.goindex afd823f3..d6fb193f 100644--- a/backend/router/routes/auth.go+++ b/backend/router/routes/auth.go@@ -10,7 +10,7 @@ import (func Auth(app *app.App, router *gin.RouterGroup) {auth := router.Group("/auth")- authCtrl := controllers.NewAuthController(app)+ authCtrl := controllers.NewController(app)auth.POST("/", authCtrl.Login)auth.POST("/refresh", authCtrl.RefreshSession)diff --git a/backend/router/routes/users.go b/backend/router/routes/users.goindex ddc963ec..2285e6e7 100644--- a/backend/router/routes/users.go+++ b/backend/router/routes/users.go@@ -12,7 +12,7 @@ func Users(app *app.App, router *gin.RouterGroup) {documents := router.Group("/users")documents.Use(middlewares.Auth())- documentsCtrl := controllers.NewUserController(app)+ documentsCtrl := controllers.NewController(app)documents.GET("/", documentsCtrl.GetUsers)}diff --git a/backend/utils/responses.go b/backend/utils/responses.goindex a6fe71bc..ca89df60 100644--- a/backend/utils/responses.go+++ b/backend/utils/responses.go@@ -2,34 +2,22 @@ package utilsimport ("time"-)---type internal_success struct {- status string- result any- timestamp int64-}-type internal_error struct {- status string- message string- timestamp int64-}-+ "github.com/gin-gonic/gin"+)-func Success(data any) internal_success {- return internal_success{- status: "success",- result: data,- timestamp: time.Now().UnixMilli(),+func Success(data any) gin.H {+ return gin.H{+ "status": "success",+ "result": data,+ "timestamp": time.Now().UnixMilli(),}}-func Error(message string) internal_error {- return internal_error{- status: "error",- message: message,- timestamp: time.Now().UnixMilli(),+func Error(message string) gin.H {+ return gin.H{+ "status": "error",+ "message": message,+ "timestamp": time.Now().UnixMilli(),}-}\ No newline at end of file+}