paadi/access-handler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change user db structure for workspaces

Browse Source
This commit is contained in:
Adrian Zürcher
2026-02-20 18:31:26 +01:00
parent 5b1488e347
commit f4b00ba297
4 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
handlers/login.go
View File

@@ -122,11 +122,12 @@ func (aH *AccessHandler) Login(c *gin.Context) {
aH.logger.Info("Login", "user "+user.Name+" logged in successfully") aH.logger.Info("Login", "user "+user.Name+" logged in successfully")
c.JSON(http.StatusOK, gin.H{ c.JSON(http.StatusOK, gin.H{
"message": "login successful", "message": "login successful",
"id": user.Id, "id": user.Id,
"user": user.Name, "user": user.Name,
"role": user.Role.Role, "role": user.Role.Role,
"settings": user.Settings, "settings": user.Settings,
"workspace": user.WorkspaceID,
}) })
} }
@@ -223,9 +224,10 @@ func (aH *AccessHandler) Me(c *gin.Context) {
} }
c.JSON(http.StatusOK, gin.H{ c.JSON(http.StatusOK, gin.H{
"id": claims["id"], "id": claims["id"],
"user": claims["username"], "user": claims["username"],
"role": claims["role"], "role": claims["role"],
"workspace": claims["workspace"],
}) })
} }

6
handlers/workspace.go
View File

@@ -156,10 +156,10 @@ func (aH *AccessHandler) DeleteWorkspace(c *gin.Context) {
} }
for _, u := range users { for _, u := range users {
if u.Settings.Workspace == nil { if u.WorkspaceID == nil {
continue continue
} else if u.Settings.Workspace.Uuid.String() == workspace.Uuid.String() { } else if *u.WorkspaceID == workspace.Id {
u.Settings.Workspace = nil u.WorkspaceID = nil
} }
u.Workspaces = slices.DeleteFunc(u.Workspaces, func(w *models.Workspace) bool { u.Workspaces = slices.DeleteFunc(u.Workspaces, func(w *models.Workspace) bool {

17
models/settings.go
View File

@@ -7,15 +7,14 @@ import (
) )
type Settings struct { type Settings struct {
PrimaryColor string `json:"primaryColor,omitempty"` PrimaryColor string `json:"primaryColor,omitempty"`
PrimaryColorText string `json:"primaryColorText,omitempty"` PrimaryColorText string `json:"primaryColorText,omitempty"`
SecondaryColor string `json:"secondaryColor,omitempty"` SecondaryColor string `json:"secondaryColor,omitempty"`
SecondaryColorText string `json:"secondaryColorText,omitempty"` SecondaryColorText string `json:"secondaryColorText,omitempty"`
Icon string `json:"icon,omitempty"` Icon string `json:"icon,omitempty"`
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 *Workspace `json:"workspace,omitempty"`
} }
func (s *Settings) DefaultQuasarSettings() { func (s *Settings) DefaultQuasarSettings() {

1
models/user.go
View File

@@ -15,6 +15,7 @@ type User struct {
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"` Workspaces []*Workspace `gorm:"many2many:users_workspaces;" json:"workspaces"`
WorkspaceID *uint `gorm:"column:workspaceId" json:"workspaceId,omitempty"`
} }
func (u *User) IsValid() bool { func (u *User) IsValid() bool {