remove useless print

db_test.go

@@ -16,6 +16,11 @@ import (
 )
 
 func TestDatabase(t *testing.T) {
+	// set enviroment variables
+	os.Setenv("ACCESS_SECRET", "12345678910111213141516171819202")
+	os.Setenv("REFRESH_SECRET", "9998979695949392919089888786858")
+	os.Setenv("DOMAIN", "localhost")
+
 	dbName := "user.db"
 	if _, err := os.Stat(dbName); err == nil {
 		t.Log("remove user.db to start test with empty database")
@@ -57,7 +62,7 @@ func TestDatabase(t *testing.T) {
 
 			Name:     "guest",
 			Password: "passwordd1",
-			Role:     "admin",
+			Role:     &models.Role{Role: "guest"},
 			Email:    "guest@gmail.com",
 		}, ignoreError: true},
 		request{Log: "Get all users", Name: "get all users", Method: "GET", Path: "/users"},
@@ -67,12 +72,12 @@ func TestDatabase(t *testing.T) {
 		}, ignoreError: true},
 		request{Log: "Get all roles", Name: "get all roles", Method: "GET", Path: "/roles"},
 		request{Log: "Get all role id 1", Name: "get role id 1", Method: "GET", Path: "/roles?id=1"},
+		request{Log: "Get user id 2", Name: "get user id 2", Method: "GET", Path: "/users?id=2"},
 	)
 
 	for _, request := range requests {
 		if request.Log != "" {
 			t.Log(request.Log)
-
 		}
 		var bodyReader io.Reader
 		if request.Payload != nil {
@@ -93,67 +98,13 @@ func TestDatabase(t *testing.T) {
 		}
 	}
 
-	// t.Log("get user id 1")
-	// result, err := accessHandler.GetUserByKey("user_name", "admin", false)
-	// if err != nil {
-	// 	t.Fatal(err)
-	// }
-	// t.Log(result)
-
-	// t.Log("get user by key")
-	// result, err = accessHandler.GetUserByKey("password", "passwordd", false)
-	// if err != nil {
-	// 	t.Fatal(err)
-	// }
-	// t.Log(result)
-
-	// t.Log("get user by key and like")
-	// result, err = accessHandler.GetUserByKey("user_name", "a*", true)
-	// if err != nil {
-	// 	t.Fatal(err)
-	// }
-	// t.Log(result)
-
-	// var user_name string = "admin1"
-	// if len(result) > 0 {
-	// 	if result[0].Name == user_name {
-	// 		user_name = "admin"
-	// 	}
-
-	// 	t.Log("update user to ", user_name)
-
-	// 	accessHandler.UpdateUserByKey(models.User{
-	// 		Name: user_name,
-	// 	}, "user_name", result[0].Name)
-	// }
-	// t.Log("read user again")
-	// result, err = accessHandler.GetUserByKey("user_name", "a*", true)
-	// if err != nil {
-	// 	t.Fatal(err)
-	// }
-	// t.Log(result)
-
-	// t.Log("delete user id 1")
-	// err = accessHandler.DeleteUserByKey("user_name", user_name, false)
-	// if err != nil {
-	// 	t.Fatal(err)
-	// }
-	// t.Log("read user again")
-	// result, err = accessHandler.GetUserById(0)
-	// if err != nil {
-	// 	t.Fatal(err)
-	// }
-	// t.Log(result)
-
-	// t.Log("read admin permissions")
-	// result1, err := accessHandler.GetRoleByKey("role", "admin", false)
-	// if err != nil {
-	// 	t.Fatal(err)
-	// }
-	// t.Log(result1)
 }
 
 func TestLoginAndAuthorization(t *testing.T) {
+	os.Setenv("ACCESS_SECRET", "12345678910111213141516171819202")
+	os.Setenv("REFRESH_SECRET", "9998979695949392919089888786858")
+	os.Setenv("DOMAIN", "localhost")
+
 	gin.SetMode(gin.TestMode)
 
 	// Setup your AccessHandler and router
@@ -168,6 +119,7 @@ func TestLoginAndAuthorization(t *testing.T) {
 
 	r.POST("/login", aH.Login)
 	r.POST("/login/refresh", aH.Refresh)
+	r.POST("/roles/update", aH.UpdateRole)
 	r.GET("/login/me", aH.Me)
 	r.GET("/logout", aH.Logout)
 	middleware := r.Group("", aH.AuthMiddleware())
@@ -176,11 +128,15 @@ func TestLoginAndAuthorization(t *testing.T) {
 	auth.GET("", func(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, "ok")
 	})
+	auth2 := middleware.Group("", aH.AuthorizeRole("/login/change", "password"))
+
+	auth2.POST("/login/change/password", aH.ChangePassword)
 
 	// ---- Step 1: Perform login ----
 	user := models.User{
 		Name:        "guest",
 		Password:    "passwordd1",
+		NewPassword: "Newpasswordd1",
 	}
 	jsonBody, _ := json.Marshal(user)
 
@@ -212,19 +168,40 @@ func TestLoginAndAuthorization(t *testing.T) {
 		Name        string
 		Method      string
 		Path        string
+		Payload     any
 		Cookie      *http.Cookie
+		ignoreError bool
 	}
 	var requests []request
 
+	user.Id = 2
+
+	correctUser := user
+	correctUser.Password = user.NewPassword
+
 	requests = append(requests,
 		request{Name: "Refresh", Method: "POST", Path: "/login/refresh", Cookie: refreshCookie},
 		request{Name: "Me", Method: "GET", Path: "/login/me", Cookie: accessCookie},
+		request{Name: "add new role", Method: "POST", Path: "/roles/update", Payload: models.Role{
+			Role: "guest", Permissions: models.Permissions{{Name: "members", Permission: 31}},
+		}, ignoreError: true},
 		request{Name: "Authorization", Method: "GET", Path: "/members", Cookie: accessCookie},
+		request{Name: "Change Password", Method: "POST", Path: "/login/change/password", Cookie: accessCookie, Payload: user},
 		request{Name: "Logout", Method: "GET", Path: "/logout", Cookie: refreshCookie},
+		request{Name: "New wrong login", Method: "POST", Path: "/login", Payload: user, ignoreError: true},
+		request{Name: "New login", Method: "POST", Path: "/login", Payload: correctUser},
 	)
 
 	for _, request := range requests {
-		req, _ := http.NewRequest(request.Method, request.Path, nil)
+		var body io.Reader
+		if request.Payload != nil {
+			jsonBytes, err := json.Marshal(request.Payload)
+			if err != nil {
+				t.Fatal(err)
+			}
+			body = bytes.NewBuffer(jsonBytes)
+		}
+		req, _ := http.NewRequest(request.Method, request.Path, body)
 		if request.Cookie != nil {
 			req.AddCookie(request.Cookie) // attach refresh_token cookie
 		}
@@ -233,6 +210,8 @@ func TestLoginAndAuthorization(t *testing.T) {
 		r.ServeHTTP(w, req)
 
 		t.Log(request.Name+" response:", w.Body.String())
+		if !request.ignoreError {
 			assert.Equal(t, http.StatusOK, w.Code)
 		}
+	}
 }

go.mod

@@ -3,7 +3,7 @@ module gitea.tecamino.com/paadi/access-handler
 go 1.24.5
 
 require (
-	gitea.tecamino.com/paadi/dbHandler v1.0.7
+	gitea.tecamino.com/paadi/dbHandler v1.1.10
 	gitea.tecamino.com/paadi/tecamino-logger v0.2.1
 	github.com/gin-gonic/gin v1.11.0
 	github.com/go-playground/assert/v2 v2.2.0

go.sum

@@ -1,5 +1,5 @@
-gitea.tecamino.com/paadi/dbHandler v1.0.7 h1:777QiVuv6CNsRT/dVtiiQd3NIOQcw7PoYo3Anz4ll+M=
+gitea.tecamino.com/paadi/dbHandler v1.1.10 h1:zZQbDTJ0bu6CIW90Zms8yYIzTLHtWPNhVKRxLUXEDuE=
-gitea.tecamino.com/paadi/dbHandler v1.0.7/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
+gitea.tecamino.com/paadi/dbHandler v1.1.10/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
 gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE=
 gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
 github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=

handlers/access.go

@@ -17,6 +17,7 @@ import (
 type AccessHandler struct {
 	dbHandler    *dbHandler.DBHandler // Database handler used for managing users and roles
 	logger       *logging.Logger      // Centralized application logger
+	NewDBCreated bool                 // inticator new user db created
 }
 
 // NewAccessHandler
@@ -73,6 +74,24 @@ func NewAccessHandler(path string, logger *logging.Logger) (aH *AccessHandler, e
 		return
 	}
 
+	logger.Debug("NewAccessHandler", "add role table")
+	// Add the role table to the database
+	err = aH.AddRoleTable()
+	if err != nil {
+		aH.logger.Error("NewAccessHandler", err)
+		return
+	}
+
+	//indicator that user database was created
+	aH.NewDBCreated = aH.dbHandler.NewCreatedDB
+
+	logger.Debug("NewAccessHandler", "add default role")
+	// Add default roles to the system
+	err = aH.AddDefaultRole()
+	if err != nil {
+		aH.logger.Error("NewAccessHandler", err)
+	}
+
 	logger.Debug("NewAccessHandler", "add user table")
 	// Add the user table to the database
 	err = aH.AddUserTable()
@@ -88,22 +107,6 @@ func NewAccessHandler(path string, logger *logging.Logger) (aH *AccessHandler, e
 		aH.logger.Error("NewAccessHandler", err)
 		return
 	}
-
-	logger.Debug("NewAccessHandler", "add role table")
-	// Add the role table to the database
-	err = aH.AddRoleTable()
-	if err != nil {
-		aH.logger.Error("NewAccessHandler", err)
-		return
-	}
-
-	logger.Debug("NewAccessHandler", "add default role")
-	// Add default roles to the system
-	err = aH.AddDefaultRole()
-	if err != nil {
-		aH.logger.Error("NewAccessHandler", err)
-	}
-
 	return
 }
 

handlers/login.go

@@ -3,6 +3,7 @@ package handlers
 import (
 	"fmt"
 	"net/http"
+	"os"
 	"time"
 
 	"gitea.tecamino.com/paadi/access-handler/internal/utils"
@@ -16,12 +17,12 @@ import (
 // 🔐 AUTHENTICATION CONSTANTS
 // -----------------------------
 
-// JWT secrets (replace "*" with strong random values in production!)
+// JWT secrets
-var ACCESS_SECRET = []byte("ShFRprALcXjlosJ2hFCnGYGG3Ce2uRx6")
+var ACCESS_SECRET = []byte(os.Getenv("ACCESS_SECRET"))
-var REFRESH_SECRET = []byte("pQIjuX6g6Tzf0FEfdScxttT3hlL9NFaa")
+var REFRESH_SECRET = []byte(os.Getenv("REFRESH_SECRET"))
 
 // DOMAIN defines where cookies are valid. Change this in production.
-var DOMAIN = "localhost"
+var DOMAIN = os.Getenv("DOMAIN")
 
 // ACCESS_TOKEN_TIME defines how long access tokens are valid.
 var ACCESS_TOKEN_TIME = 15 * time.Minute
@@ -52,27 +53,18 @@ func (aH *AccessHandler) Login(c *gin.Context) {
 	}
 
 	// Fetch user record from DB
-	var dbRecord []models.User
+	dbUser, hasError := aH.getUserFromDB(c, user.Name)
-	err := aH.dbHandler.GetByKey(&dbRecord, "user_name", user.Name, false)
+	if hasError {
-	if err != nil {
-		aH.logger.Error("Login", err)
-		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-		return
-	}
-
-	if len(dbRecord) > 1 {
-		aH.logger.Error("Login", "more than one record found")
-		c.JSON(http.StatusInternalServerError, models.NewJsonMessageResponse("internal error"))
 		return
 	}
 
 	// Check password
-	if !utils.CheckPassword(user.Password, dbRecord[0].Password) {
+	if !utils.CheckPassword(user.Password, dbUser.Password) {
 		aH.logger.Error("Login", "invalid password")
 		c.JSON(http.StatusUnauthorized, models.NewJsonMessageResponse("invalid credentials"))
 		return
 	}
-	user = dbRecord[0]
+	user = dbUser
 
 	// -----------------------------
 	// 🔑 TOKEN CREATION
@@ -86,7 +78,7 @@ func (aH *AccessHandler) Login(c *gin.Context) {
 	accessToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
 		"id":       user.Id,
 		"username": user.Name,
-		"role":     user.Role,
+		"role":     user.Role.Role,
 		"type":     "access",
 		"exp":      accessTokenExp.Unix(),
 	})
@@ -95,7 +87,7 @@ func (aH *AccessHandler) Login(c *gin.Context) {
 	refreshToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
 		"id":       user.Id,
 		"username": user.Name,
-		"role":     user.Role,
+		"role":     user.Role.Role,
 		"type":     "refresh",
 		"exp":      refreshTokenExp.Unix(),
 	})
@@ -133,7 +125,7 @@ func (aH *AccessHandler) Login(c *gin.Context) {
 		"message":  "login successful",
 		"id":       user.Id,
 		"user":     user.Name,
-		"role":     user.Role,
+		"role":     user.Role.Role,
 		"settings": user.Settings,
 	})
 }
@@ -173,7 +165,11 @@ func (aH *AccessHandler) Refresh(c *gin.Context) {
 
 	username := claims["username"].(string)
 	id := int(claims["id"].(float64))
-	role := claims["role"].(string)
+
+	user, hasError := aH.getUserFromDB(c, username)
+	if hasError {
+		return
+	}
 
 	// Create new access token
 	aH.logger.Debug("Refresh", "create new access token")
@@ -181,7 +177,7 @@ func (aH *AccessHandler) Refresh(c *gin.Context) {
 	newAccess := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
 		"id":       id,
 		"username": username,
-		"role":     role,
+		"role":     user.Role.Role,
 		"exp":      accessExp.Unix(),
 	})
 	accessString, _ := newAccess.SignedString(ACCESS_SECRET)
@@ -240,3 +236,35 @@ func (aH *AccessHandler) Logout(c *gin.Context) {
 
 	c.JSON(http.StatusOK, gin.H{"message": "logged out"})
 }
+
+func (aH *AccessHandler) getUserFromDB(c *gin.Context, userName string) (user models.User, hasError bool) {
+	hasError = true
+	// Fetch user record from DB
+	var dbRecord []models.User
+
+	err := aH.dbHandler.GetByKey(&dbRecord, "user_name", userName, false, "Role")
+	if err != nil {
+		aH.logger.Error("Login", err)
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
+		return
+	}
+
+	if len(dbRecord) == 0 {
+		aH.logger.Error("Login", "no user "+userName+" found")
+		c.JSON(http.StatusUnauthorized, models.NewJsonMessageResponse("invalid credentials"))
+		return
+	}
+
+	if len(dbRecord) > 1 {
+		aH.logger.Error("Login", "more than one record found")
+		c.JSON(http.StatusInternalServerError, models.NewJsonMessageResponse("internal error"))
+		return
+	}
+
+	if !dbRecord[0].ExpirationIsValid() {
+		aH.logger.Error("Login", fmt.Sprintf("user %s is expired", userName))
+		c.JSON(http.StatusUnauthorized, models.NewJsonMessageResponse("user "+userName+" is expired"))
+		return
+	}
+	return dbRecord[0], false
+}

handlers/middleware.go

@@ -3,6 +3,7 @@ package handlers
 import (
 	"log"
 	"net/http"
+	"slices"
 	"strings"
 
 	"gitea.tecamino.com/paadi/access-handler/models"
@@ -116,7 +117,7 @@ func (aH *AccessHandler) AuthMiddleware() gin.HandlerFunc {
 // Usage:
 //
 //	router.GET("/secure/:id", aH.AuthorizeRole("/api/v1"))
-func (aH *AccessHandler) AuthorizeRole(suffix string) gin.HandlerFunc {
+func (aH *AccessHandler) AuthorizeRole(suffix string, exeptions ...string) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		aH.logger.Debug("AuthorizeRole", "permission path of url path")
 		permissionPath := strings.TrimPrefix(c.Request.URL.Path, suffix+"/")
@@ -149,6 +150,12 @@ func (aH *AccessHandler) AuthorizeRole(suffix string) gin.HandlerFunc {
 			return
 		}
 
+		// check exeptions
+		if slices.Contains(exeptions, permissionPath) {
+			c.Next()
+			return
+		}
+
 		// Check permissions
 		for _, permission := range roles[0].Permissions {
 			if permission.Name == permissionPath {

handlers/role.go

@@ -55,6 +55,7 @@ func (aH *AccessHandler) AddRole(c *gin.Context) {
 	if aH.dbHandler.Exists(&models.Role{}, "role", role.Role, false) {
 		aH.logger.Error("AddRole", fmt.Sprintf("role with name %s already exists", role.Role))
 		c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("role with name %s already exists", role.Role)))
+		return
 	}
 
 	// Insert new role with provided permissions
@@ -62,6 +63,7 @@ func (aH *AccessHandler) AddRole(c *gin.Context) {
 		Role:        role.Role,
 		Permissions: role.Permissions,
 	})
+
 	c.JSON(http.StatusOK, gin.H{
 		"message": fmt.Sprintf("role '%s' successfully added", role.Role),
 	})
@@ -106,12 +108,23 @@ func (aH *AccessHandler) UpdateRole(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, nil)
 		return
 	}
+
+	if role.Id != 0 {
 		err := aH.dbHandler.UpdateValuesById(&role, role.Id)
 		if err != nil {
 			aH.logger.Error("UpdateRole", err)
 			c.JSON(http.StatusInternalServerError, nil)
 			return
 		}
+	} else {
+		err := aH.dbHandler.UpdateValuesByKey(&role, "", "role", role.Role)
+		if err != nil {
+			aH.logger.Error("UpdateRole", err)
+			c.JSON(http.StatusInternalServerError, nil)
+			return
+		}
+	}
+
 	c.JSON(http.StatusOK, models.NewJsonMessageResponse("successfully updated role '"+role.Role+"'"))
 }
 

handlers/user.go

@@ -16,31 +16,36 @@ func (aH *AccessHandler) AddUserTable() error {
 }
 
 func (aH *AccessHandler) AddDefaultUser() (err error) {
-	name := "admin"
-	role := "admin"
-	email := "zuercher@tecamino.ch"
-
-	// Check if a user with this email already exists
-	if aH.dbHandler.Exists(&models.User{}, "email", email, false) {
-		aH.logger.Debug("AddDefaultUser", "user email "+email+" exists already")
-		// Found a user → skip create
-		return nil
-	}
-
 	// Create default settings for the new user
 	settings := models.Settings{}
 	aH.logger.Debug("AddDefaultUser", "set default quasar settings")
 	settings.DefaultQuasarSettings()
 
-	// Insert default admin user into the database
+	user := &models.User{
-	aH.dbHandler.AddNewColum(&models.User{
+		Name:     "admin",
-		Name:     name,
+		Email:    "zuercher@tecamino.ch",
-		Role:     role,
-		Email:    email,
 		Password: "$2a$10$sZZOWBP8DSFLrLFQNoXw8OsEEr0tez1B8lPzKCHofaHg6PMNxx1pG",
 		Settings: settings,
-	})
+	}
-	return
+
+	// Check if a user with this email already exists
+	if aH.dbHandler.Exists(&models.User{}, "email", user.Email, false) {
+		aH.logger.Debug("AddDefaultUser", "user email "+user.Email+" exists already")
+		// Found a user → skip create
+		return nil
+	}
+
+	// Insert default admin user into the database
+
+	if err := aH.dbHandler.AddNewColum(user); err != nil {
+		return err
+	}
+
+	role := &models.Role{}
+	if err := aH.dbHandler.GetByKey(role, "role", "admin", false); err != nil {
+		return err
+	}
+	return aH.dbHandler.AddRelation(user, role, "Role")
 }
 
 func (aH *AccessHandler) AddUser(c *gin.Context) {
@@ -73,7 +78,7 @@ func (aH *AccessHandler) AddUser(c *gin.Context) {
 	}
 
 	// Hash the provided password before saving
-	hash, err := utils.HashPassword(user.Password)
+	user.Password, err = utils.HashPassword(user.Password)
 	if err != nil {
 		aH.logger.Error("AddUser", err)
 		c.JSON(http.StatusInternalServerError, nil)
@@ -83,22 +88,79 @@ func (aH *AccessHandler) AddUser(c *gin.Context) {
 	aH.logger.Debug("AddUser", "add default quasar user setting ")
 	user.Settings.DefaultQuasarSettings()
 
-	aH.logger.Debug("AddUser", "add new user "+user.Name+" with role "+user.Role)
+	aH.logger.Debug("AddUser", "add new user "+user.Name+" with role "+user.Role.Role)
+
+	if user.Role.Id != 0 {
+		if err := aH.dbHandler.GetById(&user.Role, user.Role.Id); err != nil {
+			aH.logger.Error("AddUser", err)
+			c.JSON(http.StatusInternalServerError, nil)
+			return
+		}
+	} else {
+		if err := aH.dbHandler.GetByKey(&user.Role, "role", user.Role.Role, false); err != nil {
+			aH.logger.Error("AddUser", err)
+			c.JSON(http.StatusInternalServerError, nil)
+			return
+		}
+	}
+	user.RoleID = &user.Role.Id
 
 	// Insert the new user record
-	aH.dbHandler.AddNewColum(&models.User{
+	if err := aH.dbHandler.AddNewColum(&user); err != nil {
-		Name:     user.Name,
+		aH.logger.Error("AddUser", err)
-		Role:     user.Role,
+		c.JSON(http.StatusInternalServerError, nil)
-		Email:    user.Email,
+		return
-		Password: hash,
+	}
-		Settings: user.Settings,
-	})
 
 	c.JSON(http.StatusOK, gin.H{
 		"message": fmt.Sprintf("user '%s' successfully added", user.Name),
 	})
 }
 
+func (aH *AccessHandler) ChangePassword(c *gin.Context) {
+	var user models.User
+	err := c.BindJSON(&user)
+	if err != nil {
+		aH.logger.Error("ChangePassword", err)
+		c.JSON(http.StatusInternalServerError, models.NewJsonErrorResponse(err))
+		return
+	}
+
+	// get user to check ChangePassword
+	var dbRecord models.User
+	err = aH.dbHandler.GetById(&dbRecord, user.Id, "Role")
+	if err != nil {
+		aH.logger.Error("ChangePassword", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	// Check if old password is correct
+	if !utils.CheckPassword(user.Password, dbRecord.Password) {
+		// Found a user → skip create
+		aH.logger.Error("ChangePassword", "wrong password entered for user: "+user.Name)
+		c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse("invalid credentials"))
+		return
+	}
+
+	// Hash the provided password before saving
+	user.Password, err = utils.HashPassword(user.NewPassword)
+	if err != nil {
+		aH.logger.Error("ChangePassword", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	aH.logger.Debug("ChangePassword", "change user "+user.Name+" password")
+
+	// Update user
+	aH.dbHandler.UpdateValuesById(&user, user.Id, "Role")
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": fmt.Sprintf("password of user '%s' changed", user.Name),
+	})
+}
+
 func (aH *AccessHandler) GetUser(c *gin.Context) {
 	var i int
 	var err error
@@ -116,7 +178,7 @@ func (aH *AccessHandler) GetUser(c *gin.Context) {
 	}
 
 	var users []models.User
-	err = aH.dbHandler.GetById(&users, uint(i))
+	err = aH.dbHandler.GetById(&users, uint(i), "Role")
 	if err != nil {
 		aH.logger.Error("GetUser", err)
 		c.JSON(http.StatusInternalServerError, nil)
@@ -132,7 +194,7 @@ func (aH *AccessHandler) UpdateUser(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, nil)
 		return
 	}
-	err := aH.dbHandler.UpdateValuesById(&user, user.Id)
+	err := aH.dbHandler.UpdateValuesById(&user, user.Id, "Role")
 	if err != nil {
 		aH.logger.Error("UpdateUser", err)
 		c.JSON(http.StatusInternalServerError, nil)
@@ -190,7 +252,7 @@ func (aH *AccessHandler) DeleteUser(c *gin.Context) {
 		return
 	}
 
-	err = aH.dbHandler.DeleteById(&models.User{}, removeIds...)
+	err = aH.dbHandler.DeleteById(&models.User{}, "", removeIds...)
 	if err != nil {
 		aH.logger.Error("DeleteUser", err)
 		c.JSON(http.StatusInternalServerError, nil)

models/permission.go

@@ -12,9 +12,10 @@ func (r *Permissions) DefaultPermissions() {
 	*r = append(*r,
 		Permission{Name: "settings", Permission: 7},
 		Permission{Name: "userSettings", Permission: 7},
-		Permission{Name: "members", Permission: 7},
+		Permission{Name: "members", Permission: 31},
 		Permission{Name: "events", Permission: 7},
 		Permission{Name: "responsible", Permission: 7},
+		Permission{Name: "group", Permission: 7},
 	)
 }
 

models/settings.go

@@ -12,6 +12,7 @@ type Settings struct {
 	SecondaryColor     string `json:"secondaryColor,omitempty"`
 	SecondaryColorText string `json:"secondaryColorText,omitempty"`
 	Icon               string `json:"icon,omitempty"`
+	AppName            string `json:"appName,omitempty"`
 	DatabaseName       string `json:"databaseName,omitempty"`
 	DatabaseToken      string `json:"databaseToken,omitempty"`
 }

models/user.go

@@ -1,17 +1,30 @@
 package models
 
-import "time"
+import (
+	"time"
+)
 
 type User struct {
 	Id          uint     `gorm:"primaryKey" json:"id"`
 	Name        string   `gorm:"column:user_name" json:"user"`
 	Email       string   `gorm:"column:email" json:"email"`
-	Role       string     `gorm:"column:role" json:"role,omitempty"`
+	RoleID      *uint    `gorm:"column:roleId" json:"roleId,omitempty"`
+	Role        *Role    `gorm:"foreignKey:RoleID" json:"role,omitempty"`
 	Password    string   `gorm:"column:password" json:"password"`
-	Expiration *time.Time `gorm:"column:expiration" json:"expiration,omitempty"`
+	NewPassword string   `gorm:"-" json:"newPassword,omitempty"`
+	Expiration  string   `gorm:"column:expiration" json:"expiration,omitempty"`
 	Settings    Settings `gorm:"type:json" json:"settings"`
 }
 
 func (u *User) IsValid() bool {
 	return u.Name != ""
 }
+
+func (u *User) ExpirationIsValid() bool {
+	if u.Expiration == "" || u.Expiration == "never" {
+		return true
+	}
+	loc := time.Now().Location()
+	parsedTime, _ := time.ParseInLocation("2006-01-02 15:04:05", u.Expiration, loc)
+	return parsedTime.After(time.Now())
+}