add new user database creation indicator

.gitignore

@@ -1 +1,2 @@
 *.log
+*.db

accessHandler.go

@@ -0,0 +1,10 @@
+package AccessHandler
+
+import (
+	"gitea.tecamino.com/paadi/access-handler/handlers"
+	"gitea.tecamino.com/paadi/tecamino-logger/logging"
+)
+
+func NewAccessHandler(path string, logger *logging.Logger) (aH *handlers.AccessHandler, err error) {
+	return handlers.NewAccessHandler(path, logger)
+}

db_test.go

@@ -3,126 +3,140 @@ package AccessHandler
 import (
 	"bytes"
 	"encoding/json"
+	"io"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
 
-	"gitea.tecamino.com/paadi/AccessHandler/models"
+	"gitea.tecamino.com/paadi/access-handler/models"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/assert/v2"
 )
 
-func TestAccesshandlerLogin(t *testing.T) {
+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")
+		if err := os.Remove(dbName); err != nil {
+			t.Fatal(err)
+		}
+	}
+
 	t.Log("start access handler test")
 
 	t.Log("initialize accessHandler")
-	accessHandler, err := NewAccessHandler("test.db", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	t.Log("add another user")
-	err = accessHandler.AddNewUser("guest", "guest@gmail.com", "passwordd1", "admin")
-	if err != nil {
-		t.Log(err)
-	}
-
-	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 all users")
-	result, err = accessHandler.GetUserById(0)
-	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 TestLoginHandler(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	// Setup your AccessHandler and router
-	aH, err := NewAccessHandler("test.db", nil)
+	accessHandler, err := NewAccessHandler(".", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	r := gin.Default()
 
-	SetMiddlewareLogger(r, aH.GetLogger())
+	accessHandler.SetMiddlewareLogger(r)
+
+	r.POST("/users/add", accessHandler.AddUser)
+	r.GET("/users", accessHandler.GetUser)
+	r.GET("/roles", accessHandler.GetRole)
+	r.POST("/roles/add", accessHandler.AddRole)
+
+	type request struct {
+		Log         string
+		Name        string
+		Method      string
+		Path        string
+		Payload     any
+		Cookie      *http.Cookie
+		ignoreError bool
+	}
+	var requests []request
+
+	requests = append(requests,
+		request{Log: "add another user", Name: "add user", Method: "POST", Path: "/users/add", Payload: models.User{
+
+			Name:     "guest",
+			Password: "passwordd1",
+			Role:     &models.Role{Role: "guest"},
+			Email:    "guest@gmail.com",
+		}, ignoreError: true},
+		request{Log: "Get all users", Name: "get all users", Method: "GET", Path: "/users"},
+		request{Log: "Get user id 1", Name: "get user id 1", Method: "GET", Path: "/users?id=1"},
+		request{Log: "Add new role", Name: "add new role", Method: "POST", Path: "/roles/add", Payload: models.Role{
+			Role: "testRole",
+		}, 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 {
+			jsonBytes, _ := json.Marshal(request.Payload)
+			bodyReader = bytes.NewBuffer(jsonBytes)
+		}
+		req, _ := http.NewRequest(request.Method, request.Path, bodyReader)
+		if request.Cookie != nil {
+			req.AddCookie(request.Cookie) // attach refresh_token cookie
+		}
+		w := httptest.NewRecorder()
+
+		r.ServeHTTP(w, req)
+
+		t.Log(request.Name+" response:", w.Body.String())
+		if !request.ignoreError {
+			assert.Equal(t, http.StatusOK, w.Code)
+		}
+	}
+
+}
+
+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
+	aH, err := NewAccessHandler(".", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r := gin.Default()
+
+	aH.SetMiddlewareLogger(r)
 
 	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("", AuthMiddleware())
+	middleware := r.Group("", aH.AuthMiddleware())
 
 	auth := middleware.Group("/members", aH.AuthorizeRole(""))
 	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)
 
@@ -154,19 +168,40 @@ func TestLoginHandler(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
 		}
@@ -175,6 +210,8 @@ func TestLoginHandler(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

@@ -1,15 +1,14 @@
-module gitea.tecamino.com/paadi/AccessHandler
+module gitea.tecamino.com/paadi/access-handler
 
 go 1.24.5
 
 require (
+	gitea.tecamino.com/paadi/dbHandler v1.1.8
 	gitea.tecamino.com/paadi/tecamino-logger v0.2.1
 	github.com/gin-gonic/gin v1.11.0
-	github.com/glebarez/sqlite v1.11.0
 	github.com/go-playground/assert/v2 v2.2.0
 	github.com/golang-jwt/jwt/v5 v5.3.0
 	golang.org/x/crypto v0.43.0
-	gorm.io/gorm v1.31.0
 )
 
 require (
@@ -20,6 +19,7 @@ require (
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
 	github.com/gin-contrib/sse v1.1.0 // indirect
 	github.com/glebarez/go-sqlite v1.21.2 // indirect
+	github.com/glebarez/sqlite v1.11.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.27.0 // indirect
@@ -52,6 +52,7 @@ require (
 	golang.org/x/tools v0.37.0 // indirect
 	google.golang.org/protobuf v1.36.9 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	gorm.io/gorm v1.31.0 // indirect
 	modernc.org/libc v1.22.5 // indirect
 	modernc.org/mathutil v1.5.0 // indirect
 	modernc.org/memory v1.5.0 // indirect

go.sum

@@ -1,3 +1,5 @@
+gitea.tecamino.com/paadi/dbHandler v1.1.8 h1:8iB3vunMyb9M/nYzErmvU/CjhY6IZt8aRGQryeGiO+c=
+gitea.tecamino.com/paadi/dbHandler v1.1.8/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

@@ -0,0 +1,130 @@
+package handlers
+
+import (
+	"gitea.tecamino.com/paadi/dbHandler"
+	"gitea.tecamino.com/paadi/tecamino-logger/logging"
+)
+
+// AccessHandler
+//
+// Description:
+//
+//	AccessHandler manages access-related functionality, including
+//	database operations for users and roles, as well as logging.
+//	It encapsulates a database handler and a logger so that
+//	authentication and authorization operations can be performed
+//	consistently across the application.
+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
+//
+// Description:
+//
+//	Creates and initializes a new AccessHandler instance.
+//
+// Behavior:
+//  1. If a logger is not provided (nil), it creates a new logger instance
+//     that writes to "accessHandler.log".
+//  2. Initializes the AccessHandler struct.
+//  3. Sets up the internal DBAHandler with the same logger.
+//  4. Automatically creates required database tables and default data:
+//     - User table
+//     - Default user(s)
+//     - Role table
+//     - Default role(s)
+//
+// Parameters:
+//   - dbPath: The file path to the database.
+//   - logger: Optional pointer to a logging.Logger instance. If nil, a new one is created.
+//
+// Returns:
+//   - aH:  A pointer to the fully initialized AccessHandler.
+//   - err: Any error that occurs during initialization.
+//
+// Example:
+//
+//	handler, err := NewAccessHandler("data/app.db", appLogger)
+//	if err != nil {
+//	    log.Fatal(err)
+//	}
+func NewAccessHandler(path string, logger *logging.Logger) (aH *AccessHandler, err error) {
+	if logger == nil {
+		logger, err = logging.NewLogger("accessHandler.log", nil)
+		if err != nil {
+			return
+		}
+	}
+
+	logger.Debug("NewAccessHandler", "initialize new access handler")
+
+	// Initialize AccessHandler with logger
+	aH = &AccessHandler{
+		logger: logger,
+	}
+
+	logger.Debug("NewAccessHandler", "initialize db handler")
+	// Create a new DB handler instance
+	aH.dbHandler, err = dbHandler.NewDBHandler("user", path, logger)
+	if err != nil {
+		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
+	}
+
+	//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()
+	if err != nil {
+		aH.logger.Error("NewAccessHandler", err)
+		return
+	}
+
+	logger.Debug("NewAccessHandler", "add default user")
+	// Add default users to the system
+	err = aH.AddDefaultUser()
+	if err != nil {
+		aH.logger.Error("NewAccessHandler", err)
+		return
+	}
+	return
+}
+
+// GetLogger
+//
+// Description:
+//
+//	Returns the logger associated with this AccessHandler instance.
+//	Useful when another component or handler needs to reuse the
+//	same logging instance for consistent log output.
+//
+// Returns:
+//   - *logging.Logger: The logger assigned to this AccessHandler.
+//
+// Example:
+//
+//	log := accessHandler.GetLogger()
+//	log.Info("Some event")
+func (aH *AccessHandler) GetLogger() *logging.Logger {
+	return aH.logger
+}

handlers/login.go

@@ -0,0 +1,270 @@
+package handlers
+
+import (
+	"fmt"
+	"net/http"
+	"os"
+	"time"
+
+	"gitea.tecamino.com/paadi/access-handler/internal/utils"
+	"gitea.tecamino.com/paadi/access-handler/models"
+
+	"github.com/gin-gonic/gin"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// -----------------------------
+// 🔐 AUTHENTICATION CONSTANTS
+// -----------------------------
+
+// JWT secrets
+var ACCESS_SECRET = []byte(os.Getenv("ACCESS_SECRET"))
+var REFRESH_SECRET = []byte(os.Getenv("REFRESH_SECRET"))
+
+// DOMAIN defines where cookies are valid. Change this in production.
+var DOMAIN = os.Getenv("DOMAIN")
+
+// ACCESS_TOKEN_TIME defines how long access tokens are valid.
+var ACCESS_TOKEN_TIME = 15 * time.Minute
+
+// REFRESH_TOKEN_TIME defines how long refresh tokens are valid.
+var REFRESH_TOKEN_TIME = 72 * time.Hour
+
+// -----------------------------
+// 🧠 HANDLERS
+// -----------------------------
+
+// Login authenticates a user and returns JWT tokens (access + refresh).
+func (aH *AccessHandler) Login(c *gin.Context) {
+	var user models.User
+
+	aH.logger.Debug("Login", "bind JSON request")
+	if err := c.BindJSON(&user); err != nil {
+		aH.logger.Error("Login", err)
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
+		return
+	}
+
+	// Validate input
+	if !user.IsValid() {
+		aH.logger.Error("Login", "user empty")
+		c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse("user empty"))
+		return
+	}
+
+	// Fetch user record from DB
+	dbUser, hasError := aH.getUserFromDB(c, user.Name)
+	if hasError {
+		return
+	}
+
+	// Check password
+	if !utils.CheckPassword(user.Password, dbUser.Password) {
+		aH.logger.Error("Login", "invalid password")
+		c.JSON(http.StatusUnauthorized, models.NewJsonMessageResponse("invalid credentials"))
+		return
+	}
+	user = dbUser
+
+	// -----------------------------
+	// 🔑 TOKEN CREATION
+	// -----------------------------
+	aH.logger.Debug("Login", "create tokens")
+
+	accessTokenExp := time.Now().Add(ACCESS_TOKEN_TIME)
+	refreshTokenExp := time.Now().Add(REFRESH_TOKEN_TIME)
+
+	// Create access token
+	accessToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
+		"id":       user.Id,
+		"username": user.Name,
+		"role":     user.Role.Role,
+		"type":     "access",
+		"exp":      accessTokenExp.Unix(),
+	})
+
+	// Create refresh token
+	refreshToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
+		"id":       user.Id,
+		"username": user.Name,
+		"role":     user.Role.Role,
+		"type":     "refresh",
+		"exp":      refreshTokenExp.Unix(),
+	})
+
+	// Sign tokens
+	accessString, err := accessToken.SignedString(ACCESS_SECRET)
+	if err != nil {
+		aH.logger.Error("Login", "failed to sign access token")
+		c.JSON(http.StatusInternalServerError, models.NewJsonMessageResponse("could not create access token"))
+		return
+	}
+
+	refreshString, err := refreshToken.SignedString(REFRESH_SECRET)
+	if err != nil {
+		aH.logger.Error("Login", "failed to sign refresh token")
+		c.JSON(http.StatusInternalServerError, models.NewJsonMessageResponse("could not create refresh token"))
+		return
+	}
+
+	// -----------------------------
+	// 🍪 SET COOKIES
+	// -----------------------------
+	aH.logger.Debug("Login", "set cookies")
+
+	secure := gin.Mode() == gin.ReleaseMode
+
+	c.SetCookie("access_token", accessString, int(time.Until(accessTokenExp).Seconds()),
+		"/", "", secure, true)
+	c.SetCookie("refresh_token", refreshString, int(time.Until(refreshTokenExp).Seconds()),
+		"/", "", secure, true)
+
+	aH.logger.Info("Login", "user "+user.Name+" logged in successfully")
+
+	c.JSON(http.StatusOK, gin.H{
+		"message":  "login successful",
+		"id":       user.Id,
+		"user":     user.Name,
+		"role":     user.Role.Role,
+		"settings": user.Settings,
+	})
+}
+
+// Refresh generates a new access token from a valid refresh token.
+func (aH *AccessHandler) Refresh(c *gin.Context) {
+	aH.logger.Debug("Refresh", "get refresh cookie")
+
+	refreshCookie, err := c.Cookie("refresh_token")
+	if err != nil {
+		aH.logger.Error("Refresh", "no refresh token")
+		c.JSON(http.StatusUnauthorized, gin.H{"message": "no refresh token"})
+		return
+	}
+
+	// Validate token
+	aH.logger.Debug("Refresh", "parse token")
+	token, err := jwt.Parse(refreshCookie, func(token *jwt.Token) (any, error) {
+		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
+			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
+		}
+		return REFRESH_SECRET, nil
+	})
+	if err != nil || !token.Valid {
+		aH.logger.Error("Refresh", err)
+		c.JSON(http.StatusUnauthorized, gin.H{"message": "invalid refresh token"})
+		return
+	}
+
+	// Extract claims
+	claims, ok := token.Claims.(jwt.MapClaims)
+	if !ok || claims["type"] != "refresh" {
+		aH.logger.Error("Refresh", "invalid token type")
+		c.JSON(http.StatusUnauthorized, gin.H{"message": "invalid token type"})
+		return
+	}
+
+	username := claims["username"].(string)
+	id := int(claims["id"].(float64))
+
+	user, hasError := aH.getUserFromDB(c, username)
+	if hasError {
+		return
+	}
+
+	// Create new access token
+	aH.logger.Debug("Refresh", "create new access token")
+	accessExp := time.Now().Add(ACCESS_TOKEN_TIME)
+	newAccess := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
+		"id":       id,
+		"username": username,
+		"role":     user.Role.Role,
+		"exp":      accessExp.Unix(),
+	})
+	accessString, _ := newAccess.SignedString(ACCESS_SECRET)
+
+	// Set new access cookie
+	aH.logger.Debug("Refresh", "set new access cookie")
+	c.SetCookie("access_token", accessString, int(time.Until(accessExp).Seconds()),
+		"/", DOMAIN, gin.Mode() == gin.ReleaseMode, true)
+
+	c.JSON(http.StatusOK, gin.H{"message": "token refreshed"})
+}
+
+// Me returns information about the currently authenticated user.
+func (aH *AccessHandler) Me(c *gin.Context) {
+	aH.logger.Debug("Me", "get access cookie")
+
+	cookie, err := c.Cookie("access_token")
+	if err != nil {
+		aH.logger.Error("Me", err)
+		c.JSON(http.StatusUnauthorized, gin.H{"message": "not logged in"})
+		return
+	}
+
+	// Parse and validate access token
+	aH.logger.Debug("Me", "parse token")
+	token, err := jwt.Parse(cookie, func(t *jwt.Token) (any, error) {
+		if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
+			return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
+		}
+		return ACCESS_SECRET, nil
+	})
+	if err != nil || !token.Valid {
+		aH.logger.Error("Me", err)
+		c.JSON(http.StatusUnauthorized, gin.H{"message": "invalid token"})
+		return
+	}
+
+	claims := token.Claims.(jwt.MapClaims)
+	c.JSON(http.StatusOK, gin.H{
+		"id":   claims["id"],
+		"user": claims["username"],
+		"role": claims["role"],
+	})
+}
+
+// Logout clears authentication cookies and ends the session.
+func (aH *AccessHandler) Logout(c *gin.Context) {
+	aH.logger.Info("Logout", "logout user")
+
+	secure := gin.Mode() == gin.ReleaseMode
+	aH.logger.Debug("Logout", fmt.Sprintf("domain=%s secure=%t", DOMAIN, secure))
+
+	// Clear cookies
+	c.SetCookie("access_token", "", -1, "/", DOMAIN, secure, true)
+	c.SetCookie("refresh_token", "", -1, "/", DOMAIN, secure, true)
+
+	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

@@ -0,0 +1,171 @@
+package handlers
+
+import (
+	"log"
+	"net/http"
+	"slices"
+	"strings"
+
+	"gitea.tecamino.com/paadi/access-handler/models"
+	"gitea.tecamino.com/paadi/tecamino-logger/logging"
+	"github.com/gin-gonic/gin"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// SetMiddlewareLogger
+//
+// Description:
+//
+//	Registers a Gin middleware that attaches a custom logger instance
+//	to every incoming request via the Gin context. This allows other
+//	middleware and handlers to access the logger using:
+//
+//	    logger := c.MustGet("logger").(*logging.Logger)
+//
+// Parameters:
+//   - r:      The Gin engine to which the middleware is applied.
+//   - logger: A pointer to the application's custom logger.
+//
+// Usage:
+//
+//	SetMiddlewareLogger(router, logger)
+func (aH *AccessHandler) SetMiddlewareLogger(r *gin.Engine) {
+	// Add middleware that injects logger into context
+	r.Use(func(c *gin.Context) {
+		c.Set("logger", aH.logger)
+		c.Next()
+	})
+}
+
+// AuthMiddleware
+//
+// Description:
+//
+//	A Gin middleware that performs authentication using a JWT token stored
+//	in a cookie named "access_token". It validates the token and extracts
+//	the user's role from the claims, storing it in the Gin context.
+//
+// Behavior:
+//   - Requires that SetMiddlewareLogger was used earlier to inject the logger.
+//   - If the JWT cookie is missing or invalid, it aborts the request with
+//     an appropriate HTTP error (401 or 500).
+//
+// Returns:
+//
+//	A Gin handler function that can be used as middleware.
+//
+// Usage:
+//
+//	r.Use(AuthMiddleware())
+func (aH *AccessHandler) AuthMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// Retrieve logger from Gin context
+		middlewareLogger, ok := c.Get("logger")
+		if !ok {
+			log.Fatal("middleware logger not set — use SetMiddlewareLogger first")
+			c.AbortWithStatusJSON(http.StatusInternalServerError, http.StatusInternalServerError)
+			return
+		}
+		logger := middlewareLogger.(*logging.Logger)
+
+		// Read access token from cookie
+		cookie, err := c.Cookie("access_token")
+		if err != nil {
+			logger.Error("AuthMiddleware", err)
+			c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"message": "not logged in"})
+			return
+		}
+
+		// Parse and validate JWT token
+		token, err := jwt.Parse(cookie, func(t *jwt.Token) (any, error) {
+			return ACCESS_SECRET, nil
+		})
+		if err != nil || !token.Valid {
+			logger.Error("AuthMiddleware", err)
+			c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"message": "invalid token"})
+			return
+		}
+
+		// Extract custom claims (role)
+		if claims, ok := token.Claims.(jwt.MapClaims); ok {
+			role, _ := claims["role"].(string)
+			c.Set("role", role)
+		}
+		c.Next()
+	}
+}
+
+// (AccessHandler).AuthorizeRole
+//
+// Description:
+//
+//	A role-based authorization middleware. It checks whether the authenticated
+//	user (based on the "role" set in AuthMiddleware) has permission to access
+//	the given route. The check is performed by comparing the requested URL
+//	path against the user’s allowed permissions.
+//
+// Parameters:
+//   - suffix: A URL prefix to trim from the request path before matching
+//     permissions (e.g., "/api/v1").
+//
+// Behavior:
+//   - Fetches the user role from Gin context.
+//   - Uses aH.GetRoleByKey() to retrieve role records and permissions.
+//   - Grants access (calls c.Next()) if a matching permission is found.
+//   - Denies access (401 Unauthorized) if no permission matches.
+//
+// Usage:
+//
+//	router.GET("/secure/:id", aH.AuthorizeRole("/api/v1"))
+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+"/")
+
+		aH.logger.Debug("AuthorizeRole", "get set role")
+		role, ok := c.Get("role")
+		if !ok {
+			aH.logger.Error("AuthorizeRole", "no role set")
+			c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"message": http.StatusInternalServerError})
+			return
+		}
+
+		// Fetch roles and associated permissions from the database or store
+		var roles []models.Role
+		err := aH.dbHandler.GetByKey(&roles, "role", role, false)
+		if err != nil {
+			aH.logger.Error("AuthorizeRole", err)
+			c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"message": http.StatusInternalServerError})
+			return
+		}
+
+		// Validate that a role was found
+		if len(roles) == 0 {
+			aH.logger.Error("AuthorizeRole", "not logged in")
+			c.JSON(http.StatusUnauthorized, http.StatusUnauthorized)
+			return
+		} else if len(roles) > 1 {
+			aH.logger.Error("AuthorizeRole", "more than one record found")
+			c.JSON(http.StatusInternalServerError, http.StatusInternalServerError)
+			return
+		}
+
+		// check exeptions
+		if slices.Contains(exeptions, permissionPath) {
+			c.Next()
+			return
+		}
+
+		// Check permissions
+		for _, permission := range roles[0].Permissions {
+			if permission.Name == permissionPath {
+				c.Next()
+				return
+			}
+		}
+
+		// Access denied
+		aH.logger.Error("AuthorizeRole", "Forbidden")
+		c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"message": "Forbidden"})
+	}
+}

handlers/role.go

@@ -0,0 +1,183 @@
+package handlers
+
+import (
+	"fmt"
+	"net/http"
+	"strconv"
+
+	"gitea.tecamino.com/paadi/access-handler/models"
+	"github.com/gin-gonic/gin"
+)
+
+func (aH *AccessHandler) AddRoleTable() error {
+	return aH.dbHandler.AddNewTable(models.Role{})
+}
+
+func (aH *AccessHandler) AddDefaultRole() (err error) {
+	role := "admin"
+
+	// Check if a role with this name already exists
+	if aH.dbHandler.Exists(&models.Role{}, "role", role, false) {
+		// Found a role → skip creation
+		aH.logger.Debug("AddDefaultRole", "role "+role+" exists already")
+		return nil
+	}
+
+	// Initialize default permissions for admin
+	permissions := models.Permissions{}
+	aH.logger.Debug("AddDefaultRole", "set default Permissions")
+	permissions.DefaultPermissions()
+
+	// Create the default admin role
+	aH.dbHandler.AddNewColum(&models.Role{
+		Role:        role,
+		Permissions: permissions,
+	})
+	return
+}
+
+func (aH *AccessHandler) AddRole(c *gin.Context) {
+	var role models.Role
+	err := c.BindJSON(&role)
+	if err != nil {
+		aH.logger.Error("AddRole", err)
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
+		return
+	}
+
+	if !role.IsValid() {
+		aH.logger.Error("AddRole", "user empty")
+		c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse("user empty"))
+		return
+	}
+
+	// Check if a role with this name already exists
+	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
+	aH.dbHandler.AddNewColum(&models.Role{
+		Role:        role.Role,
+		Permissions: role.Permissions,
+	})
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": fmt.Sprintf("role '%s' successfully added", role.Role),
+	})
+}
+
+func (aH *AccessHandler) GetRole(c *gin.Context) {
+	var i int
+	var err error
+	var roles []models.Role
+
+	role := c.Query("role")
+	id := c.Query("id")
+
+	if role != "" {
+		err = aH.dbHandler.GetByKey(&roles, "role", role, false)
+	} else if id != "" {
+		i, err = strconv.Atoi(id)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{
+				"message": err.Error(),
+			})
+			return
+		}
+		err = aH.dbHandler.GetById(&roles, uint(i))
+	} else {
+		err = aH.dbHandler.GetById(&roles, 0)
+
+	}
+
+	if err != nil {
+		aH.logger.Error("GetRole", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+	c.JSON(http.StatusOK, roles)
+}
+
+func (aH *AccessHandler) UpdateRole(c *gin.Context) {
+	var role models.Role
+	if err := c.BindJSON(&role); err != nil {
+		aH.logger.Error("UpdateRole", err)
+		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+"'"))
+}
+
+func (aH *AccessHandler) DeleteRole(c *gin.Context) {
+	queryRole := c.Query("role")
+	if queryRole == "" || queryRole == "null" || queryRole == "undefined" {
+		aH.logger.Error("DeleteRole", "id query missing or wrong value: "+queryRole)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	var request struct {
+		Roles []string `json:"roles"`
+	}
+
+	err := c.BindJSON(&request)
+	if err != nil {
+		aH.logger.Error("DeleteRole", err)
+		c.JSON(http.StatusBadRequest, nil)
+		return
+	}
+
+	if len(request.Roles) == 0 {
+		aH.logger.Error("DeleteRole", "no ids given to be deleted")
+		c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse("no roles given to be deleted"))
+		return
+	}
+
+	var ownRole string
+
+	for _, role := range request.Roles {
+		if queryRole == role {
+			ownRole = role
+			continue
+		}
+		err = aH.dbHandler.DeleteByKey(&models.Role{}, "role", role, false)
+		if err != nil {
+			aH.logger.Error("DeleteRole", err)
+			c.JSON(http.StatusInternalServerError, nil)
+			return
+		}
+	}
+
+	if ownRole != "" {
+		aH.logger.Error("DeleteRole", "can not delete logged in role id: "+ownRole)
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": "can not delete logged in role id: " + ownRole,
+			"role":    ownRole,
+		})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": "role(s) deleted",
+	})
+}

handlers/user.go

@@ -0,0 +1,265 @@
+package handlers
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"strconv"
+
+	"gitea.tecamino.com/paadi/access-handler/internal/utils"
+	"gitea.tecamino.com/paadi/access-handler/models"
+	"github.com/gin-gonic/gin"
+)
+
+func (aH *AccessHandler) AddUserTable() error {
+	return aH.dbHandler.AddNewTable(models.User{})
+}
+
+func (aH *AccessHandler) AddDefaultUser() (err error) {
+	// Create default settings for the new user
+	settings := models.Settings{}
+	aH.logger.Debug("AddDefaultUser", "set default quasar settings")
+	settings.DefaultQuasarSettings()
+
+	user := &models.User{
+		Name:     "admin",
+		Email:    "zuercher@tecamino.ch",
+		Password: "$2a$10$sZZOWBP8DSFLrLFQNoXw8OsEEr0tez1B8lPzKCHofaHg6PMNxx1pG",
+		Settings: settings,
+	}
+
+	// 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) {
+	var user models.User
+	err := c.BindJSON(&user)
+	if err != nil {
+		aH.logger.Error("AddUser", err)
+		c.JSON(http.StatusInternalServerError, models.NewJsonErrorResponse(err))
+		return
+	}
+
+	if !user.IsValid() {
+		aH.logger.Error("AddUser", "user empty")
+		c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse("user empty"))
+		return
+	}
+
+	// Check if a user with this email already exists
+	if aH.dbHandler.Exists(&models.User{}, "email", user.Email, false) {
+		// Found a user → skip create
+		aH.logger.Error("AddUser", "user with email "+user.Email+" already exists")
+		c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("user with email %s already exists", user.Email)))
+		return
+	}
+
+	if !utils.IsValidEmail(user.Email) {
+		aH.logger.Error("AddUser", "not valid email address")
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(errors.New("not valid email address")))
+		return
+	}
+
+	// Hash the provided password before saving
+	user.Password, err = utils.HashPassword(user.Password)
+	if err != nil {
+		aH.logger.Error("AddUser", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	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.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
+	if err := aH.dbHandler.AddNewColum(&user); err != nil {
+		aH.logger.Error("AddUser", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	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
+
+	id := c.Query("id")
+	if id == "undefined" || id == "null" || id == "" {
+		i = 0
+	} else {
+		i, err = strconv.Atoi(id)
+		if err != nil {
+			aH.logger.Error("GetUser", err)
+			c.JSON(http.StatusInternalServerError, nil)
+			return
+		}
+	}
+
+	var users []models.User
+	err = aH.dbHandler.GetById(&users, uint(i), "Role")
+	if err != nil {
+		aH.logger.Error("GetUser", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+	c.JSON(http.StatusOK, users)
+}
+
+func (aH *AccessHandler) UpdateUser(c *gin.Context) {
+	var user models.User
+	if err := c.BindJSON(&user); err != nil {
+		aH.logger.Error("UpdateUser", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+	err := aH.dbHandler.UpdateValuesById(&user, user.Id, "Role")
+	if err != nil {
+		aH.logger.Error("UpdateUser", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+	c.JSON(http.StatusOK, models.NewJsonMessageResponse("successfully updated user '"+user.Email+"'"))
+}
+
+func (aH *AccessHandler) DeleteUser(c *gin.Context) {
+	queryId := c.Query("id")
+
+	if queryId == "" || queryId == "null" || queryId == "undefined" {
+		aH.logger.Error("DeleteUser", "id query missing or wrong value: "+queryId)
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": "id query missing or wrong value: " + queryId,
+		})
+		return
+	}
+
+	var request struct {
+		Ids []int `json:"ids"`
+	}
+
+	err := c.BindJSON(&request)
+	if err != nil {
+		aH.logger.Error("DeleteUser", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	if len(request.Ids) == 0 {
+		aH.logger.Error("DeleteUser", "no ids given to be deleted")
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": "no ids given to be deleted",
+		})
+		return
+	}
+
+	var ownId string
+	removeIds := make([]uint, len(request.Ids))
+	for i, id := range request.Ids {
+		if queryId == fmt.Sprint(id) {
+			ownId = queryId
+			continue
+		}
+		removeIds[i] = uint(id)
+	}
+
+	if ownId != "" {
+		aH.logger.Error("DeleteUser", "can not delete logged in member id: "+queryId)
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": "can not delete logged in member id: " + queryId,
+			"id":      queryId,
+		})
+		return
+	}
+
+	err = aH.dbHandler.DeleteById(&models.User{}, "", removeIds...)
+	if err != nil {
+		aH.logger.Error("DeleteUser", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": "member(s) deleted",
+	})
+}

internal/utils/utils.go

@@ -0,0 +1,8 @@
+package utils
+
+import "regexp"
+
+func IsValidEmail(email string) bool {
+	re := regexp.MustCompile(`^[a-zA-Z0-9._%+\-]+@[a-zA-Z0-9.\-]+\.[a-zA-Z]{2,}$`)
+	return re.MatchString(email)
+}

models/permission.go

@@ -12,8 +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/role.go

@@ -5,3 +5,7 @@ type Role struct {
 	Role        string      `gorm:"column:role" json:"role"`
 	Permissions Permissions `gorm:"type:json" json:"permissions"`
 }
+
+func (r *Role) IsValid() bool {
+	return r.Role != ""
+}

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,14 +1,30 @@
 package models
 
+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"`
+	RoleID      *uint    `gorm:"column:roleId" json:"roleId,omitempty"`
+	Role        *Role    `gorm:"foreignKey:RoleID" json:"role,omitempty"`
 	Password    string   `gorm:"column:password" json:"password"`
+	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())
+}