Compare commits

..

3 Commits

Author SHA1 Message Date
Adrian Zürcher
38a7660d41 add new uuid for workspace and create uuid folder 2026-02-17 07:30:10 +01:00
Adrian Zürcher
7d604189af fixes 2026-02-16 22:24:05 +01:00
Adrian Zürcher
4b574d4486 fix wrong relation name 2026-02-16 22:00:25 +01:00
5 changed files with 30 additions and 9 deletions

2
go.mod
View File

@@ -8,6 +8,7 @@ require (
github.com/gin-gonic/gin v1.11.0
github.com/go-playground/assert/v2 v2.2.0
github.com/golang-jwt/jwt/v5 v5.3.0
github.com/google/uuid v1.3.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/goccy/go-json v0.10.2 // 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/now v1.1.5 // indirect
github.com/json-iterator/go v1.1.12 // indirect

View File

@@ -207,7 +207,7 @@ func (aH *AccessHandler) UpdateUser(c *gin.Context) {
}
var currentUser models.User
err := aH.dbHandler.GetById(&currentUser, user.Id, "Role", "Workspace")
err := aH.dbHandler.GetById(&currentUser, user.Id, "Role", "Workspaces")
if err != nil {
aH.logger.Error("UpdateUser", err)
c.JSON(http.StatusInternalServerError, nil)

View File

@@ -3,11 +3,13 @@ package handlers
import (
"fmt"
"net/http"
"os"
"slices"
"strconv"
"gitea.tecamino.com/paadi/access-handler/models"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
)
func (aH *AccessHandler) AddWorkspaceTable() error {
@@ -24,16 +26,32 @@ func (aH *AccessHandler) AddWorkspace(c *gin.Context) {
}
// Check if a workspace with this name already exists
if aH.dbHandler.Exists(&models.Workspace{}, "workspace", workspace.Name, false) {
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{
@@ -120,7 +138,7 @@ func (aH *AccessHandler) DeleteWorkspace(c *gin.Context) {
}
for _, workspace := range request.Workspaces {
err = aH.dbHandler.DeleteByKey(&models.Workspace{}, "id", workspace, false)
err = aH.dbHandler.DeleteByKey(&models.Workspace{}, "id", workspace.Id, false)
if err != nil {
aH.logger.Error("DeleteWorkspace", err)
c.JSON(http.StatusInternalServerError, nil)

View File

@@ -14,7 +14,7 @@ type User struct {
NewPassword string `gorm:"-" json:"newPassword,omitempty"`
Expiration string `gorm:"column:expiration" json:"expiration,omitempty"`
Settings Settings `gorm:"type:json" json:"settings"`
Workspaces []*Workspace `gorm:"many2many:users_workspaces;" `
Workspaces []*Workspace `gorm:"many2many:users_workspaces;" json:"workspaces"`
}
func (u *User) IsValid() bool {

View File

@@ -1,8 +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"`
Users []*User `gorm:"many2many:users_workspaces;" `
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;" `
}