Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
093c55616c | ||
|
|
a99189b31a | ||
|
|
38a7660d41 | ||
|
|
7d604189af | ||
|
|
4b574d4486 | ||
|
|
a094b70b5b | ||
|
|
3eb40bc02f | ||
|
|
81959425a1 | ||
|
|
857d84d3a9 | ||
|
|
1f4f9a12aa | ||
|
|
206639cf72 | ||
|
|
9a47a74764 | ||
|
|
8cbf36c5b3 | ||
|
|
21daaf1819 | ||
|
|
8156fea488 | ||
|
|
e15a94184c | ||
|
|
2736aa1f6b |
66
db_test.go
66
db_test.go
@@ -62,7 +62,7 @@ func TestDatabase(t *testing.T) {
|
|||||||
|
|
||||||
Name: "guest",
|
Name: "guest",
|
||||||
Password: "passwordd1",
|
Password: "passwordd1",
|
||||||
Role: "admin",
|
Role: &models.Role{Role: "guest"},
|
||||||
Email: "guest@gmail.com",
|
Email: "guest@gmail.com",
|
||||||
}, ignoreError: true},
|
}, ignoreError: true},
|
||||||
request{Log: "Get all users", Name: "get all users", Method: "GET", Path: "/users"},
|
request{Log: "Get all users", Name: "get all users", Method: "GET", Path: "/users"},
|
||||||
@@ -72,12 +72,12 @@ func TestDatabase(t *testing.T) {
|
|||||||
}, ignoreError: true},
|
}, ignoreError: true},
|
||||||
request{Log: "Get all roles", Name: "get all roles", Method: "GET", Path: "/roles"},
|
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 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 {
|
for _, request := range requests {
|
||||||
if request.Log != "" {
|
if request.Log != "" {
|
||||||
t.Log(request.Log)
|
t.Log(request.Log)
|
||||||
|
|
||||||
}
|
}
|
||||||
var bodyReader io.Reader
|
var bodyReader io.Reader
|
||||||
if request.Payload != nil {
|
if request.Payload != nil {
|
||||||
@@ -98,64 +98,6 @@ 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) {
|
func TestLoginAndAuthorization(t *testing.T) {
|
||||||
@@ -177,6 +119,7 @@ func TestLoginAndAuthorization(t *testing.T) {
|
|||||||
|
|
||||||
r.POST("/login", aH.Login)
|
r.POST("/login", aH.Login)
|
||||||
r.POST("/login/refresh", aH.Refresh)
|
r.POST("/login/refresh", aH.Refresh)
|
||||||
|
r.POST("/roles/update", aH.UpdateRole)
|
||||||
r.GET("/login/me", aH.Me)
|
r.GET("/login/me", aH.Me)
|
||||||
r.GET("/logout", aH.Logout)
|
r.GET("/logout", aH.Logout)
|
||||||
middleware := r.Group("", aH.AuthMiddleware())
|
middleware := r.Group("", aH.AuthMiddleware())
|
||||||
@@ -239,6 +182,9 @@ func TestLoginAndAuthorization(t *testing.T) {
|
|||||||
requests = append(requests,
|
requests = append(requests,
|
||||||
request{Name: "Refresh", Method: "POST", Path: "/login/refresh", Cookie: refreshCookie},
|
request{Name: "Refresh", Method: "POST", Path: "/login/refresh", Cookie: refreshCookie},
|
||||||
request{Name: "Me", Method: "GET", Path: "/login/me", Cookie: accessCookie},
|
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: "Authorization", Method: "GET", Path: "/members", Cookie: accessCookie},
|
||||||
request{Name: "Change Password", Method: "POST", Path: "/login/change/password", Cookie: accessCookie, Payload: user},
|
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: "Logout", Method: "GET", Path: "/logout", Cookie: refreshCookie},
|
||||||
|
|||||||
4
go.mod
4
go.mod
@@ -3,11 +3,12 @@ module gitea.tecamino.com/paadi/access-handler
|
|||||||
go 1.24.5
|
go 1.24.5
|
||||||
|
|
||||||
require (
|
require (
|
||||||
gitea.tecamino.com/paadi/dbHandler v1.0.8
|
gitea.tecamino.com/paadi/dbHandler v1.1.12
|
||||||
gitea.tecamino.com/paadi/tecamino-logger v0.2.1
|
gitea.tecamino.com/paadi/tecamino-logger v0.2.1
|
||||||
github.com/gin-gonic/gin v1.11.0
|
github.com/gin-gonic/gin v1.11.0
|
||||||
github.com/go-playground/assert/v2 v2.2.0
|
github.com/go-playground/assert/v2 v2.2.0
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.0
|
github.com/golang-jwt/jwt/v5 v5.3.0
|
||||||
|
github.com/google/uuid v1.3.0
|
||||||
golang.org/x/crypto v0.43.0
|
golang.org/x/crypto v0.43.0
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -25,7 +26,6 @@ require (
|
|||||||
github.com/go-playground/validator/v10 v10.27.0 // indirect
|
github.com/go-playground/validator/v10 v10.27.0 // indirect
|
||||||
github.com/goccy/go-json v0.10.2 // indirect
|
github.com/goccy/go-json v0.10.2 // indirect
|
||||||
github.com/goccy/go-yaml v1.18.0 // indirect
|
github.com/goccy/go-yaml v1.18.0 // indirect
|
||||||
github.com/google/uuid v1.3.0 // indirect
|
|
||||||
github.com/jinzhu/inflection v1.0.0 // indirect
|
github.com/jinzhu/inflection v1.0.0 // indirect
|
||||||
github.com/jinzhu/now v1.1.5 // indirect
|
github.com/jinzhu/now v1.1.5 // indirect
|
||||||
github.com/json-iterator/go v1.1.12 // indirect
|
github.com/json-iterator/go v1.1.12 // indirect
|
||||||
|
|||||||
4
go.sum
4
go.sum
@@ -1,5 +1,5 @@
|
|||||||
gitea.tecamino.com/paadi/dbHandler v1.0.8 h1:ZWSBM/KFtLwTv2cBqwK1mOxWAxAfL0BcWEC3kJ9JALU=
|
gitea.tecamino.com/paadi/dbHandler v1.1.12 h1:F1ARSTUm0MZmF84FfD/g5RQNMYyDYXHYrB3cXPSi4qw=
|
||||||
gitea.tecamino.com/paadi/dbHandler v1.0.8/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
|
gitea.tecamino.com/paadi/dbHandler v1.1.12/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 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE=
|
||||||
gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
|
gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
|
||||||
github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=
|
github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import (
|
|||||||
type AccessHandler struct {
|
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
|
// NewAccessHandler
|
||||||
@@ -73,6 +74,32 @@ func NewAccessHandler(path string, logger *logging.Logger) (aH *AccessHandler, e
|
|||||||
return
|
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 workspace table")
|
||||||
|
// Add the role table to the database
|
||||||
|
err = aH.AddWorkspaceTable()
|
||||||
|
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")
|
logger.Debug("NewAccessHandler", "add user table")
|
||||||
// Add the user table to the database
|
// Add the user table to the database
|
||||||
err = aH.AddUserTable()
|
err = aH.AddUserTable()
|
||||||
@@ -88,22 +115,6 @@ func NewAccessHandler(path string, logger *logging.Logger) (aH *AccessHandler, e
|
|||||||
aH.logger.Error("NewAccessHandler", err)
|
aH.logger.Error("NewAccessHandler", err)
|
||||||
return
|
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
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ func (aH *AccessHandler) Login(c *gin.Context) {
|
|||||||
accessToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
|
accessToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
|
||||||
"id": user.Id,
|
"id": user.Id,
|
||||||
"username": user.Name,
|
"username": user.Name,
|
||||||
"role": user.Role,
|
"role": user.Role.Role,
|
||||||
"type": "access",
|
"type": "access",
|
||||||
"exp": accessTokenExp.Unix(),
|
"exp": accessTokenExp.Unix(),
|
||||||
})
|
})
|
||||||
@@ -87,7 +87,7 @@ func (aH *AccessHandler) Login(c *gin.Context) {
|
|||||||
refreshToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
|
refreshToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
|
||||||
"id": user.Id,
|
"id": user.Id,
|
||||||
"username": user.Name,
|
"username": user.Name,
|
||||||
"role": user.Role,
|
"role": user.Role.Role,
|
||||||
"type": "refresh",
|
"type": "refresh",
|
||||||
"exp": refreshTokenExp.Unix(),
|
"exp": refreshTokenExp.Unix(),
|
||||||
})
|
})
|
||||||
@@ -125,7 +125,7 @@ func (aH *AccessHandler) Login(c *gin.Context) {
|
|||||||
"message": "login successful",
|
"message": "login successful",
|
||||||
"id": user.Id,
|
"id": user.Id,
|
||||||
"user": user.Name,
|
"user": user.Name,
|
||||||
"role": user.Role,
|
"role": user.Role.Role,
|
||||||
"settings": user.Settings,
|
"settings": user.Settings,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -177,7 +177,7 @@ func (aH *AccessHandler) Refresh(c *gin.Context) {
|
|||||||
newAccess := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
|
newAccess := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
|
||||||
"id": id,
|
"id": id,
|
||||||
"username": username,
|
"username": username,
|
||||||
"role": user.Role,
|
"role": user.Role.Role,
|
||||||
"exp": accessExp.Unix(),
|
"exp": accessExp.Unix(),
|
||||||
})
|
})
|
||||||
accessString, _ := newAccess.SignedString(ACCESS_SECRET)
|
accessString, _ := newAccess.SignedString(ACCESS_SECRET)
|
||||||
@@ -215,7 +215,13 @@ func (aH *AccessHandler) Me(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
claims := token.Claims.(jwt.MapClaims)
|
claims, ok := token.Claims.(jwt.MapClaims)
|
||||||
|
if !ok {
|
||||||
|
aH.logger.Error("Me", "error: token.Claims.(jwt.MapClaims)")
|
||||||
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"id": claims["id"],
|
"id": claims["id"],
|
||||||
"user": claims["username"],
|
"user": claims["username"],
|
||||||
@@ -241,7 +247,8 @@ func (aH *AccessHandler) getUserFromDB(c *gin.Context, userName string) (user mo
|
|||||||
hasError = true
|
hasError = true
|
||||||
// Fetch user record from DB
|
// Fetch user record from DB
|
||||||
var dbRecord []models.User
|
var dbRecord []models.User
|
||||||
err := aH.dbHandler.GetByKey(&dbRecord, "user_name", userName, false)
|
|
||||||
|
err := aH.dbHandler.GetByKey(&dbRecord, "user_name", userName, false, "Role")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
aH.logger.Error("Login", err)
|
aH.logger.Error("Login", err)
|
||||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ func (aH *AccessHandler) AddRole(c *gin.Context) {
|
|||||||
if aH.dbHandler.Exists(&models.Role{}, "role", role.Role, false) {
|
if aH.dbHandler.Exists(&models.Role{}, "role", role.Role, false) {
|
||||||
aH.logger.Error("AddRole", fmt.Sprintf("role with name %s already exists", role.Role))
|
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)))
|
c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("role with name %s already exists", role.Role)))
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Insert new role with provided permissions
|
// Insert new role with provided permissions
|
||||||
@@ -62,6 +63,7 @@ func (aH *AccessHandler) AddRole(c *gin.Context) {
|
|||||||
Role: role.Role,
|
Role: role.Role,
|
||||||
Permissions: role.Permissions,
|
Permissions: role.Permissions,
|
||||||
})
|
})
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"message": fmt.Sprintf("role '%s' successfully added", role.Role),
|
"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)
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if role.Id != 0 {
|
||||||
err := aH.dbHandler.UpdateValuesById(&role, role.Id)
|
err := aH.dbHandler.UpdateValuesById(&role, role.Id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
aH.logger.Error("UpdateRole", err)
|
aH.logger.Error("UpdateRole", err)
|
||||||
c.JSON(http.StatusInternalServerError, nil)
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
return
|
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+"'"))
|
c.JSON(http.StatusOK, models.NewJsonMessageResponse("successfully updated role '"+role.Role+"'"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
114
handlers/user.go
114
handlers/user.go
@@ -16,31 +16,37 @@ func (aH *AccessHandler) AddUserTable() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (aH *AccessHandler) AddDefaultUser() (err 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
|
// Create default settings for the new user
|
||||||
settings := models.Settings{}
|
settings := models.Settings{}
|
||||||
aH.logger.Debug("AddDefaultUser", "set default quasar settings")
|
aH.logger.Debug("AddDefaultUser", "set default quasar settings")
|
||||||
settings.DefaultQuasarSettings()
|
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",
|
Password: "$2a$10$sZZOWBP8DSFLrLFQNoXw8OsEEr0tez1B8lPzKCHofaHg6PMNxx1pG",
|
||||||
Settings: settings,
|
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) {
|
func (aH *AccessHandler) AddUser(c *gin.Context) {
|
||||||
@@ -73,7 +79,7 @@ func (aH *AccessHandler) AddUser(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Hash the provided password before saving
|
// Hash the provided password before saving
|
||||||
hash, err := utils.HashPassword(user.Password)
|
user.Password, err = utils.HashPassword(user.Password)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
aH.logger.Error("AddUser", err)
|
aH.logger.Error("AddUser", err)
|
||||||
c.JSON(http.StatusInternalServerError, nil)
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
@@ -83,16 +89,33 @@ func (aH *AccessHandler) AddUser(c *gin.Context) {
|
|||||||
aH.logger.Debug("AddUser", "add default quasar user setting ")
|
aH.logger.Debug("AddUser", "add default quasar user setting ")
|
||||||
user.Settings.DefaultQuasarSettings()
|
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
|
// 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,
|
|
||||||
})
|
if len(user.Workspaces) > 0 {
|
||||||
|
aH.dbHandler.AddRelation(&user, user.Workspaces, "Workspaces")
|
||||||
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"message": fmt.Sprintf("user '%s' successfully added", user.Name),
|
"message": fmt.Sprintf("user '%s' successfully added", user.Name),
|
||||||
@@ -110,7 +133,7 @@ func (aH *AccessHandler) ChangePassword(c *gin.Context) {
|
|||||||
|
|
||||||
// get user to check ChangePassword
|
// get user to check ChangePassword
|
||||||
var dbRecord models.User
|
var dbRecord models.User
|
||||||
err = aH.dbHandler.GetById(&dbRecord, user.Id)
|
err = aH.dbHandler.GetById(&dbRecord, user.Id, "Role", "Workspaces")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
aH.logger.Error("ChangePassword", err)
|
aH.logger.Error("ChangePassword", err)
|
||||||
c.JSON(http.StatusInternalServerError, nil)
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
@@ -119,13 +142,11 @@ func (aH *AccessHandler) ChangePassword(c *gin.Context) {
|
|||||||
|
|
||||||
// Check if old password is correct
|
// Check if old password is correct
|
||||||
if !utils.CheckPassword(user.Password, dbRecord.Password) {
|
if !utils.CheckPassword(user.Password, dbRecord.Password) {
|
||||||
fmt.Println(123, dbRecord.Password, user.Password)
|
|
||||||
// Found a user → skip create
|
// Found a user → skip create
|
||||||
aH.logger.Error("ChangePassword", "wrong password entered for user: "+user.Name)
|
aH.logger.Error("ChangePassword", "wrong password entered for user: "+user.Name)
|
||||||
c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse("invalid credentials"))
|
c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse("invalid credentials"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
fmt.Println(3)
|
|
||||||
|
|
||||||
// Hash the provided password before saving
|
// Hash the provided password before saving
|
||||||
user.Password, err = utils.HashPassword(user.NewPassword)
|
user.Password, err = utils.HashPassword(user.NewPassword)
|
||||||
@@ -134,13 +155,11 @@ func (aH *AccessHandler) ChangePassword(c *gin.Context) {
|
|||||||
c.JSON(http.StatusInternalServerError, nil)
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
fmt.Println(4)
|
|
||||||
|
|
||||||
aH.logger.Debug("ChangePassword", "change user "+user.Name+" password")
|
aH.logger.Debug("ChangePassword", "change user "+user.Name+" password")
|
||||||
|
|
||||||
// Update user
|
// Update user
|
||||||
aH.dbHandler.UpdateValuesById(&user, user.Id)
|
aH.dbHandler.UpdateValuesById(&user, user.Id, "Role", "Workspaces")
|
||||||
fmt.Println(5)
|
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"message": fmt.Sprintf("password of user '%s' changed", user.Name),
|
"message": fmt.Sprintf("password of user '%s' changed", user.Name),
|
||||||
@@ -164,12 +183,18 @@ func (aH *AccessHandler) GetUser(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var users []models.User
|
var users []models.User
|
||||||
err = aH.dbHandler.GetById(&users, uint(i))
|
err = aH.dbHandler.GetById(&users, uint(i), "Role", "Workspaces")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
aH.logger.Error("GetUser", err)
|
aH.logger.Error("GetUser", err)
|
||||||
c.JSON(http.StatusInternalServerError, nil)
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//remove password
|
||||||
|
for i := range users {
|
||||||
|
users[i].Password = ""
|
||||||
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, users)
|
c.JSON(http.StatusOK, users)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,12 +205,29 @@ func (aH *AccessHandler) UpdateUser(c *gin.Context) {
|
|||||||
c.JSON(http.StatusInternalServerError, nil)
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err := aH.dbHandler.UpdateValuesById(&user, user.Id)
|
|
||||||
|
var currentUser models.User
|
||||||
|
err := aH.dbHandler.GetById(¤tUser, user.Id, "Role", "Workspaces")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
aH.logger.Error("UpdateUser", err)
|
aH.logger.Error("UpdateUser", err)
|
||||||
c.JSON(http.StatusInternalServerError, nil)
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = aH.dbHandler.ReplaceRelation(&user, "Workspaces", user.Workspaces)
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("UpdateUser", err)
|
||||||
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = aH.dbHandler.UpdateValuesById(&user, user.Id, "Role", "Workspaces")
|
||||||
|
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+"'"))
|
c.JSON(http.StatusOK, models.NewJsonMessageResponse("successfully updated user '"+user.Email+"'"))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -238,7 +280,7 @@ func (aH *AccessHandler) DeleteUser(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
err = aH.dbHandler.DeleteById(&models.User{}, removeIds...)
|
err = aH.dbHandler.DeleteById(&models.User{}, "", removeIds...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
aH.logger.Error("DeleteUser", err)
|
aH.logger.Error("DeleteUser", err)
|
||||||
c.JSON(http.StatusInternalServerError, nil)
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
|
|||||||
208
handlers/workspace.go
Normal file
208
handlers/workspace.go
Normal file
@@ -0,0 +1,208 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"slices"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"gitea.tecamino.com/paadi/access-handler/models"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (aH *AccessHandler) AddWorkspaceTable() error {
|
||||||
|
return aH.dbHandler.AddNewTable(models.Workspace{})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (aH *AccessHandler) AddWorkspace(c *gin.Context) {
|
||||||
|
var workspace models.Workspace
|
||||||
|
err := c.BindJSON(&workspace)
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("AddWorkspace", err)
|
||||||
|
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if a workspace with this name already exists
|
||||||
|
if aH.dbHandler.Exists(&models.Workspace{}, "name", workspace.Name, false) {
|
||||||
|
aH.logger.Error("AddWorkspace", fmt.Sprintf("workspace with name %s already exists", workspace.Name))
|
||||||
|
c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("workspace with name %s already exists", workspace.Name)))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uid, err := uuid.NewUUID()
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("AddWorkspace", err)
|
||||||
|
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// create new folder
|
||||||
|
err = os.MkdirAll(uid.String(), 0644)
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("AddWorkspace", err)
|
||||||
|
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Insert new workspace with provided permissions
|
||||||
|
aH.dbHandler.AddNewColum(&models.Workspace{
|
||||||
|
Name: workspace.Name,
|
||||||
|
Description: workspace.Description,
|
||||||
|
Uuid: uid,
|
||||||
|
})
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, gin.H{
|
||||||
|
"message": fmt.Sprintf("workspace '%s' successfully added", workspace.Name),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (aH *AccessHandler) GetWorkspace(c *gin.Context) {
|
||||||
|
var i int
|
||||||
|
var err error
|
||||||
|
var workspaces []models.Workspace
|
||||||
|
|
||||||
|
workspace := c.Query("workspace")
|
||||||
|
id := c.Query("id")
|
||||||
|
|
||||||
|
if workspace != "" {
|
||||||
|
err = aH.dbHandler.GetByKey(&workspaces, "workspace", workspace, 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(&workspaces, uint(i))
|
||||||
|
} else {
|
||||||
|
err = aH.dbHandler.GetById(&workspaces, 0)
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("GetWorkspace", err)
|
||||||
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.JSON(http.StatusOK, workspaces)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (aH *AccessHandler) UpdateWorkspace(c *gin.Context) {
|
||||||
|
var workspace models.Workspace
|
||||||
|
if err := c.BindJSON(&workspace); err != nil {
|
||||||
|
aH.logger.Error("UpdateWorkspace", err)
|
||||||
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if workspace.Id != 0 {
|
||||||
|
err := aH.dbHandler.UpdateValuesById(&workspace, workspace.Id)
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("UpdateWorkspace", err)
|
||||||
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
err := aH.dbHandler.UpdateValuesByKey(&workspace, "", "workspace", workspace.Name)
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("UpdateWorkspace", err)
|
||||||
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, models.NewJsonMessageResponse("successfully updated workspace '"+workspace.Name+"'"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (aH *AccessHandler) DeleteWorkspace(c *gin.Context) {
|
||||||
|
|
||||||
|
var request struct {
|
||||||
|
Workspaces []models.Workspace `json:"workspaces"`
|
||||||
|
}
|
||||||
|
|
||||||
|
err := c.BindJSON(&request)
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("DeleteWorkspace", err)
|
||||||
|
c.JSON(http.StatusBadRequest, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(request.Workspaces) == 0 {
|
||||||
|
aH.logger.Error("DeleteWorkspace", "no ids given to be deleted")
|
||||||
|
c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse("no workspaces given to be deleted"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, workspace := range request.Workspaces {
|
||||||
|
err = aH.dbHandler.DeleteByKey(&models.Workspace{}, "id", workspace.Id, false)
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("DeleteWorkspace", err)
|
||||||
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var users []models.User
|
||||||
|
if err := aH.dbHandler.GetById(&users, 0); err != nil {
|
||||||
|
aH.logger.Error("DeleteWorkspace", err)
|
||||||
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, u := range users {
|
||||||
|
if u.Settings.Workspace == workspace.Name {
|
||||||
|
u.Settings.Workspace = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
u.Workspaces = slices.DeleteFunc(u.Workspaces, func(w *models.Workspace) bool {
|
||||||
|
return w != nil && w.Name == workspace.Name
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// crearemove folder
|
||||||
|
err = os.RemoveAll(workspace.Uuid.String())
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("DeleteWorkspace", err)
|
||||||
|
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, gin.H{
|
||||||
|
"message": "workspace(s) deleted",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (aH *AccessHandler) ReadWorkspaceData(c *gin.Context) {
|
||||||
|
|
||||||
|
var workspace models.Workspace
|
||||||
|
|
||||||
|
err := c.ShouldBindBodyWithJSON(&workspace)
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("ReadWorkspaceData", err)
|
||||||
|
c.JSON(http.StatusBadRequest, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
files, err := os.ReadDir(workspace.Uuid.String())
|
||||||
|
if err != nil {
|
||||||
|
aH.logger.Error("ReadWorkspaceData", err)
|
||||||
|
c.JSON(http.StatusBadRequest, nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var response []string
|
||||||
|
for _, f := range files {
|
||||||
|
if f.IsDir() || !strings.Contains(filepath.Ext(f.Name()), ".db") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
response = append(response, f.Name())
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, gin.H{
|
||||||
|
"data": response,
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -15,6 +15,7 @@ type Settings struct {
|
|||||||
AppName string `json:"appName,omitempty"`
|
AppName string `json:"appName,omitempty"`
|
||||||
DatabaseName string `json:"databaseName,omitempty"`
|
DatabaseName string `json:"databaseName,omitempty"`
|
||||||
DatabaseToken string `json:"databaseToken,omitempty"`
|
DatabaseToken string `json:"databaseToken,omitempty"`
|
||||||
|
Workspace string `json:"workspace,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Settings) DefaultQuasarSettings() {
|
func (s *Settings) DefaultQuasarSettings() {
|
||||||
|
|||||||
@@ -8,11 +8,13 @@ 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,omitempty"`
|
RoleID *uint `gorm:"column:roleId" json:"roleId,omitempty"`
|
||||||
Password string `gorm:"column:password" json:"password"`
|
Role *Role `gorm:"foreignKey:RoleID" json:"role,omitempty"`
|
||||||
NewPassword string `gorm:"-" json:"newPassword"`
|
Password string `gorm:"column:password" json:"password,omitempty"`
|
||||||
|
NewPassword string `gorm:"-" json:"newPassword,omitempty"`
|
||||||
Expiration string `gorm:"column:expiration" json:"expiration,omitempty"`
|
Expiration string `gorm:"column:expiration" json:"expiration,omitempty"`
|
||||||
Settings Settings `gorm:"type:json" json:"settings"`
|
Settings Settings `gorm:"type:json" json:"settings"`
|
||||||
|
Workspaces []*Workspace `gorm:"many2many:users_workspaces;" json:"workspaces"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *User) IsValid() bool {
|
func (u *User) IsValid() bool {
|
||||||
|
|||||||
11
models/workspace.go
Normal file
11
models/workspace.go
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
import "github.com/google/uuid"
|
||||||
|
|
||||||
|
type Workspace struct {
|
||||||
|
Id uint `gorm:"primaryKey" json:"id"`
|
||||||
|
Name string `gorm:"column:name" json:"name"`
|
||||||
|
Description string `gorm:"type:json" json:"description"`
|
||||||
|
Uuid uuid.UUID `gorm:"type:text" json:"uuid"`
|
||||||
|
Users []*User `gorm:"many2many:users_workspaces;" `
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user