remove useless print

db_test.go

@@ -3,8 +3,10 @@ package AccessHandler
 import (
 	"bytes"
 	"encoding/json"
+	"io"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
 
 	"gitea.tecamino.com/paadi/access-handler/models"
@@ -13,7 +15,20 @@ import (
 	"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")
@@ -22,80 +37,74 @@ func TestAccesshandlerLogin(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	t.Log("add another user")
+	r := gin.Default()
-	err = accessHandler.AddNewUser("guest", "guest@gmail.com", "passwordd1", "admin")
+
-	if err != nil {
+	accessHandler.SetMiddlewareLogger(r)
-		t.Log(err)
+
+	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)
+		}
 	}
 
-	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) {
+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
@@ -110,6 +119,7 @@ func TestLoginHandler(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())
@@ -118,11 +128,15 @@ func TestLoginHandler(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",
+		Name:        "guest",
-		Password: "passwordd1",
+		Password:    "passwordd1",
+		NewPassword: "Newpasswordd1",
 	}
 	jsonBody, _ := json.Marshal(user)
 
@@ -151,22 +165,43 @@ func TestLoginHandler(t *testing.T) {
 	}
 
 	type request struct {
-		Name   string
+		Name        string
-		Method string
+		Method      string
-		Path   string
+		Path        string
-		Cookie *http.Cookie
+		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())
-		assert.Equal(t, http.StatusOK, w.Code)
+		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.2
+	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.2 h1:5d3sWIFY6JQLX0PGSTsxcvZFCSNTgtx4lHTX5lwF2H8=
+gitea.tecamino.com/paadi/dbHandler v1.1.10 h1:zZQbDTJ0bu6CIW90Zms8yYIzTLHtWPNhVKRxLUXEDuE=
-gitea.tecamino.com/paadi/dbHandler v1.0.2/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

@@ -15,8 +15,9 @@ import (
 //	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
+	dbHandler    *dbHandler.DBHandler // Database handler used for managing users and roles
-	logger    *logging.Logger      // Centralized application logger
+	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

@@ -2,8 +2,8 @@ package handlers
 
 import (
 	"fmt"
-	"log"
 	"net/http"
+	"os"
 	"time"
 
 	"gitea.tecamino.com/paadi/access-handler/internal/utils"
@@ -17,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
@@ -53,28 +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 {
-		log.Println("multiple users found")
-		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
@@ -88,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(),
 	})
@@ -97,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(),
 	})
@@ -135,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,
 	})
 }
@@ -175,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")
@@ -183,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)
@@ -242,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

@@ -1,9 +1,9 @@
 package handlers
 
 import (
-	"fmt"
 	"log"
 	"net/http"
+	"slices"
 	"strings"
 
 	"gitea.tecamino.com/paadi/access-handler/models"
@@ -117,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+"/")
@@ -141,8 +141,7 @@ func (aH *AccessHandler) AuthorizeRole(suffix string) gin.HandlerFunc {
 
 		// Validate that a role was found
 		if len(roles) == 0 {
-			log.Println("not logged in")
+			aH.logger.Error("AuthorizeRole", "not logged in")
-			aH.logger.Error("AuthorizeRole", "no logged in")
 			c.JSON(http.StatusUnauthorized, http.StatusUnauthorized)
 			return
 		} else if len(roles) > 1 {
@@ -151,9 +150,14 @@ 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 {
-			fmt.Println(100, permissionPath, permission.Name)
 			if permission.Name == permissionPath {
 				c.Next()
 				return

handlers/role.go

@@ -2,50 +2,22 @@ package handlers
 
 import (
 	"fmt"
+	"net/http"
+	"strconv"
 
 	"gitea.tecamino.com/paadi/access-handler/models"
+	"github.com/gin-gonic/gin"
 )
 
-// AddRoleTable
-//
-// Description:
-//
-//	Creates a new database table for storing role definitions if it does not already exist.
-//
-// Behavior:
-//   - Uses the DBHandler to add a table based on the `models.Role` struct.
-//   - Returns an error if table creation fails.
-//
-// Returns:
-//   - error: Any database error encountered.
 func (aH *AccessHandler) AddRoleTable() error {
 	return aH.dbHandler.AddNewTable(models.Role{})
 }
 
-// AddDefaultRole
-//
-// Description:
-//
-//	Ensures that a default administrative role exists in the database.
-//	If a role named "admin" is already present, it logs and skips creation.
-//
-// Behavior:
-//  1. Checks for an existing "admin" role.
-//  2. If not found, initializes default permissions using
-//     `models.Permissions.DefaultPermissions()`.
-//  3. Creates a new role record with those permissions.
-//
-// Default Role:
-//   - Role: "admin"
-//   - Permissions: all default permissions defined in `models.Permissions`.
-//
-// Returns:
-//   - error: Any database or creation error encountered.
 func (aH *AccessHandler) AddDefaultRole() (err error) {
 	role := "admin"
 
 	// Check if a role with this name already exists
-	if err := aH.dbHandler.Exists(&models.Role{}, "role", role, false); err == nil {
+	if aH.dbHandler.Exists(&models.Role{}, "role", role, false) {
 		// Found a role → skip creation
 		aH.logger.Debug("AddDefaultRole", "role "+role+" exists already")
 		return nil
@@ -64,134 +36,148 @@ func (aH *AccessHandler) AddDefaultRole() (err error) {
 	return
 }
 
-// AddNewRole
+func (aH *AccessHandler) AddRole(c *gin.Context) {
-//
+	var role models.Role
-// Description:
+	err := c.BindJSON(&role)
-//
+	if err != nil {
-//	Adds a new role with a specific set of permissions to the database.
+		aH.logger.Error("AddRole", err)
-//
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-// Behavior:
+		return
-//  1. Checks whether a role with the same name already exists.
+	}
-//  2. If it does not exist, creates a new role record.
+
-//
+	if !role.IsValid() {
-// Parameters:
+		aH.logger.Error("AddRole", "user empty")
-//   - role:        The role name (e.g., "manager", "viewer").
+		c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse("user empty"))
-//   - permissions: A `models.Permissions` struct defining allowed actions.
+		return
-//
+	}
-// Returns:
+
-//   - error: If the role already exists or insertion fails.
-func (aH *AccessHandler) AddNewRole(role string, permissions models.Permissions) (err error) {
 	// Check if a role with this name already exists
-	if err := aH.dbHandler.Exists(&models.Role{}, "role", role, false); err == nil {
+	if aH.dbHandler.Exists(&models.Role{}, "role", role.Role, false) {
-		// Found a role → skip creation
+		aH.logger.Error("AddRole", fmt.Sprintf("role with name %s already exists", role.Role))
-		return fmt.Errorf("role with name %s already exists", 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:        role.Role,
-		Permissions: permissions,
+		Permissions: role.Permissions,
+	})
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": fmt.Sprintf("role '%s' successfully added", role.Role),
 	})
-	return
 }
 
-// GetRoleById
+func (aH *AccessHandler) GetRole(c *gin.Context) {
-//
+	var i int
-// Description:
+	var err error
-//
+	var roles []models.Role
-//	Retrieves a role record from the database by its numeric ID.
+
-//
+	role := c.Query("role")
-// Parameters:
+	id := c.Query("id")
-//   - id: The unique ID of the role.
+
-//
+	if role != "" {
-// Returns:
+		err = aH.dbHandler.GetByKey(&roles, "role", role, false)
-//   - roles: A slice containing the matched role (usually length 1).
+	} else if id != "" {
-//   - err:   Any database error encountered.
+		i, err = strconv.Atoi(id)
-func (aH *AccessHandler) GetRoleById(id uint) (roles []models.Role, err error) {
+		if err != nil {
-	err = aH.dbHandler.GetById(&roles, id)
+			c.JSON(http.StatusBadRequest, gin.H{
-	return
+				"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)
 }
 
-// GetRoleByKey
+func (aH *AccessHandler) UpdateRole(c *gin.Context) {
-//
+	var role models.Role
-// Description:
+	if err := c.BindJSON(&role); err != nil {
-//
+		aH.logger.Error("UpdateRole", err)
-//	Retrieves one or more roles based on a key/value query.
+		c.JSON(http.StatusInternalServerError, nil)
-//
+		return
-// Parameters:
+	}
-//   - key:        The column name to search by (e.g., "role").
+
-//   - value:      The value to match (e.g., "admin").
+	if role.Id != 0 {
-//   - likeSearch: Whether to use SQL LIKE for partial matches.
+		err := aH.dbHandler.UpdateValuesById(&role, role.Id)
-//
+		if err != nil {
-// Returns:
+			aH.logger.Error("UpdateRole", err)
-//   - roles: A list of matched roles.
+			c.JSON(http.StatusInternalServerError, nil)
-//   - err:   Any database error encountered.
+			return
-func (aH *AccessHandler) GetRoleByKey(key string, value any, likeSearch bool) (roles []models.Role, err error) {
+		}
-	err = aH.dbHandler.GetByKey(&roles, key, value, likeSearch)
+	} else {
-	return
+		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+"'"))
 }
 
-// UpdateRoleById
+func (aH *AccessHandler) DeleteRole(c *gin.Context) {
-//
+	queryRole := c.Query("role")
-// Description:
+	if queryRole == "" || queryRole == "null" || queryRole == "undefined" {
-//
+		aH.logger.Error("DeleteRole", "id query missing or wrong value: "+queryRole)
-//	Updates a role record identified by its numeric ID.
+		c.JSON(http.StatusInternalServerError, nil)
-//
+		return
-// Parameters:
+	}
-//   - id:   The ID of the role to update.
-//   - role: A struct containing updated role data.
-//
-// Returns:
-//   - error: Any database error encountered.
-func (aH *AccessHandler) UpdateRoleById(id uint, role models.Role) error {
-	return aH.dbHandler.UpdateValuesById(&role, id)
-}
 
-// UpdateRoleByKey
+	var request struct {
-//
+		Roles []string `json:"roles"`
-// Description:
+	}
-//
-//	Updates a role record using a column key/value lookup.
-//
-// Parameters:
-//   - role:  The updated role data.
-//   - key:   The column name to search by.
-//   - value: The value to match against the key column.
-//
-// Returns:
-//   - error: Any database error encountered.
-func (aH *AccessHandler) UpdateRoleByKey(role models.Role, key string, value any) error {
-	return aH.dbHandler.UpdateValuesByKey(&role, key, value)
-}
 
-// DeleteRoleById
+	err := c.BindJSON(&request)
-//
+	if err != nil {
-// Description:
+		aH.logger.Error("DeleteRole", err)
-//
+		c.JSON(http.StatusBadRequest, nil)
-//	Deletes a role record from the database by its numeric ID.
+		return
-//
+	}
-// Parameters:
-//   - id: The ID of the role to delete.
-//
-// Returns:
-//   - error: Any database error encountered during deletion.
-func (aH *AccessHandler) DeleteRoleById(id uint) (err error) {
-	return aH.dbHandler.DeleteById(&models.Role{}, id)
-}
 
-// DeleteRoleByKey
+	if len(request.Roles) == 0 {
-//
+		aH.logger.Error("DeleteRole", "no ids given to be deleted")
-// Description:
+		c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse("no roles given to be deleted"))
-//
+		return
-//	Deletes one or more roles from the database matching a given key/value pair.
+	}
-//
+
-// Parameters:
+	var ownRole string
-//   - key:        The column name used for filtering (e.g., "role").
+
-//   - value:      The matching value (e.g., "admin").
+	for _, role := range request.Roles {
-//   - likeSearch: If true, performs a LIKE (partial) match.
+		if queryRole == role {
-//
+			ownRole = role
-// Returns:
+			continue
-//   - error: Any database error encountered.
+		}
-func (aH *AccessHandler) DeleteRoleByKey(key string, value any, likeSearch bool) (err error) {
+		err = aH.dbHandler.DeleteByKey(&models.Role{}, "role", role, false)
-	return aH.dbHandler.DeleteByKey(&models.Role{}, key, value, likeSearch)
+		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

@@ -1,218 +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"
 )
 
-// AddUserTable
-//
-// Description:
-//
-//	Creates a new database table for storing user records if it does not already exist.
-//
-// Behavior:
-//   - Uses the DBHandler to add a table based on the `models.User` struct.
-//   - Returns any error encountered during table creation.
-//
-// Returns:
-//   - error: Any database error that occurs while creating the table.
 func (aH *AccessHandler) AddUserTable() error {
 	return aH.dbHandler.AddNewTable(models.User{})
 }
 
-// AddDefaultUser
-//
-// Description:
-//
-//	Ensures a default administrative user exists in the database.
-//	If a user with the predefined email already exists, the function logs
-//	a debug message and exits without making changes.
-//
-// Behavior:
-//  1. Checks if the default user (admin) already exists by email.
-//  2. If not found, creates default Quasar UI settings and adds the user.
-//
-// Default User:
-//   - Name:  "admin"
-//   - Role:  "admin"
-//   - Email: "zuercher@tecamino.ch"
-//   - Password: (empty or hashed later)
-//
-// Returns:
-//   - error: Any database or creation error encountered.
 func (aH *AccessHandler) AddDefaultUser() (err error) {
-	name := "admin"
-	role := "admin"
-	email := "zuercher@tecamino.ch"
-
-	// Check if a user with this email already exists
-	if err := aH.dbHandler.Exists(&models.User{}, "email", email, false); err == nil {
-		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
-}
-
-// AddNewUser
-//
-// Description:
-//
-//	Adds a new user record to the database with a hashed password.
-//
-// Behavior:
-//  1. Verifies that the email does not already exist.
-//  2. Hashes the password using utils.HashPassword().
-//  3. Inserts the new user record into the database.
-//
-// Parameters:
-//   - userName: The user's display name.
-//   - email:    The user's unique email address.
-//   - password: The user's raw password (will be hashed).
-//   - role:     The role assigned to the user.
-//
-// Returns:
-//   - error: If the user already exists or if hashing/insertion fails.
-func (aH *AccessHandler) AddNewUser(userName, email, password, role string) (err error) {
-	// Check if a user with this email already exists
-	if err := aH.dbHandler.Exists(&models.User{}, "email", email, false); err == nil {
-		// Found a user → skip create
-		aH.logger.Error("AddNewUser", "user with email "+email+" already exists")
-		return fmt.Errorf("user with email %s already exists", email)
 	}
 
-	// Hash the provided password before saving
+	// Check if a user with this email already exists
-	hash, err := utils.HashPassword(password)
+	if aH.dbHandler.Exists(&models.User{}, "email", user.Email, false) {
-	if err != nil {
+		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
 	}
 
-	aH.logger.Debug("AddNewUser", "add new user "+userName+" with role "+role)
+	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
-	aH.dbHandler.AddNewColum(&models.User{
+	if err := aH.dbHandler.AddNewColum(&user); err != nil {
-		Name:     userName,
+		aH.logger.Error("AddUser", err)
-		Role:     role,
+		c.JSON(http.StatusInternalServerError, nil)
-		Email:    email,
+		return
-		Password: hash,
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": fmt.Sprintf("user '%s' successfully added", user.Name),
 	})
-	return
 }
 
-// GetUserById
+func (aH *AccessHandler) ChangePassword(c *gin.Context) {
-//
+	var user models.User
-// Description:
+	err := c.BindJSON(&user)
-//
+	if err != nil {
-//	Retrieves user(s) from the database by their unique ID.
+		aH.logger.Error("ChangePassword", err)
-//
+		c.JSON(http.StatusInternalServerError, models.NewJsonErrorResponse(err))
-// Parameters:
+		return
-//   - id: The numeric user ID.
+	}
-//
+
-// Returns:
+	// get user to check ChangePassword
-//   - users: A slice containing the matched user (usually length 1).
+	var dbRecord models.User
-//   - err:   Any database error encountered.
+	err = aH.dbHandler.GetById(&dbRecord, user.Id, "Role")
-func (aH *AccessHandler) GetUserById(id uint) (users []models.User, err error) {
+	if err != nil {
-	err = aH.dbHandler.GetById(&users, id)
+		aH.logger.Error("ChangePassword", err)
-	return
+		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),
+	})
 }
 
-// GetUserByKey
+func (aH *AccessHandler) GetUser(c *gin.Context) {
-//
+	var i int
-// Description:
+	var err error
-//
+
-//	Queries users based on a given column key and value.
+	id := c.Query("id")
-//
+	if id == "undefined" || id == "null" || id == "" {
-// Parameters:
+		i = 0
-//   - key:        The column name to search by (e.g., "email").
+	} else {
-//   - value:      The value to match.
+		i, err = strconv.Atoi(id)
-//   - likeSearch: If true, performs a LIKE (partial) search.
+		if err != nil {
-//
+			aH.logger.Error("GetUser", err)
-// Returns:
+			c.JSON(http.StatusInternalServerError, nil)
-//   - users: A list of users that match the search criteria.
+			return
-//   - err:   Any database error encountered.
+		}
-func (aH *AccessHandler) GetUserByKey(key string, value any, likeSearch bool) (users []models.User, err error) {
+	}
-	err = aH.dbHandler.GetByKey(&users, key, value, likeSearch)
+
-	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)
 }
 
-// UpdateUserById
+func (aH *AccessHandler) UpdateUser(c *gin.Context) {
-//
+	var user models.User
-// Description:
+	if err := c.BindJSON(&user); err != nil {
-//
+		aH.logger.Error("UpdateUser", err)
-//	Updates an existing user record identified by its numeric ID.
+		c.JSON(http.StatusInternalServerError, nil)
-//
+		return
-// Parameters:
+	}
-//   - id:   The user ID to update.
+	err := aH.dbHandler.UpdateValuesById(&user, user.Id, "Role")
-//   - user: A struct containing updated field values.
+	if err != nil {
-//
+		aH.logger.Error("UpdateUser", err)
-// Returns:
+		c.JSON(http.StatusInternalServerError, nil)
-//   - error: Any error encountered during the update.
+		return
-func (aH *AccessHandler) UpdateUserById(id uint, user models.User) error {
+	}
-	return aH.dbHandler.UpdateValuesById(&user, id)
+	c.JSON(http.StatusOK, models.NewJsonMessageResponse("successfully updated user '"+user.Email+"'"))
 }
 
-// UpdateUserByKey
+func (aH *AccessHandler) DeleteUser(c *gin.Context) {
-//
+	queryId := c.Query("id")
-// Description:
-//
-//	Updates a user record based on a specified column key and value.
-//
-// Parameters:
-//   - user:       The updated user data.
-//   - key:        The column name used for lookup.
-//   - value:      The value to match against the key column.
-//
-// Returns:
-//   - error: Any error encountered during the update.
-func (aH *AccessHandler) UpdateUserByKey(user models.User, key string, value any) error {
-	return aH.dbHandler.UpdateValuesByKey(&user, key, value)
-}
 
-// DeleteUserById
+	if queryId == "" || queryId == "null" || queryId == "undefined" {
-//
+		aH.logger.Error("DeleteUser", "id query missing or wrong value: "+queryId)
-// Description:
+		c.JSON(http.StatusBadRequest, gin.H{
-//
+			"message": "id query missing or wrong value: " + queryId,
-//	Deletes a user from the database using their numeric ID.
+		})
-//
+		return
-// Parameters:
+	}
-//   - id: The ID of the user to delete.
-//
-// Returns:
-//   - error: Any database error encountered during deletion.
-func (aH *AccessHandler) DeleteUserById(id uint) (err error) {
-	return aH.dbHandler.DeleteById(&models.User{}, id)
-}
 
-// DeleteUserByKey
+	var request struct {
-//
+		Ids []int `json:"ids"`
-// Description:
+	}
-//
+
-//	Deletes users matching a specific key/value pair from the database.
+	err := c.BindJSON(&request)
-//
+	if err != nil {
-// Parameters:
+		aH.logger.Error("DeleteUser", err)
-//   - key:        The column name to search by.
+		c.JSON(http.StatusInternalServerError, nil)
-//   - value:      The value to match.
+		return
-//   - likeSearch: Whether to use a partial match (LIKE).
+	}
-//
+
-// Returns:
+	if len(request.Ids) == 0 {
-//   - error: Any database error encountered during deletion.
+		aH.logger.Error("DeleteUser", "no ids given to be deleted")
-func (aH *AccessHandler) DeleteUserByKey(key string, value any, likeSearch bool) (err error) {
+		c.JSON(http.StatusBadRequest, gin.H{
-	return aH.dbHandler.DeleteByKey(&models.User{}, key, value, likeSearch)
+			"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",
+	})
 }

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/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"`
+	Id          uint     `gorm:"primaryKey" json:"id"`
-	Name     string   `gorm:"column:user_name" json:"user"`
+	Name        string   `gorm:"column:user_name" json:"user"`
-	Email    string   `gorm:"column:email" json:"email"`
+	Email       string   `gorm:"column:email" json:"email"`
-	Role     string   `gorm:"column:role" json:"role"`
+	RoleID      *uint    `gorm:"column:roleId" json:"roleId,omitempty"`
-	Password string   `gorm:"column:password" json:"password"`
+	Role        *Role    `gorm:"foreignKey:RoleID" json:"role,omitempty"`
-	Settings Settings `gorm:"type:json" json:"settings"`
+	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())
+}