change user db structure for workspaces
This commit is contained in:
@@ -122,11 +122,12 @@ func (aH *AccessHandler) Login(c *gin.Context) {
|
||||
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,
|
||||
"message": "login successful",
|
||||
"id": user.Id,
|
||||
"user": user.Name,
|
||||
"role": user.Role.Role,
|
||||
"settings": user.Settings,
|
||||
"workspace": user.WorkspaceID,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -223,9 +224,10 @@ func (aH *AccessHandler) Me(c *gin.Context) {
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"id": claims["id"],
|
||||
"user": claims["username"],
|
||||
"role": claims["role"],
|
||||
"id": claims["id"],
|
||||
"user": claims["username"],
|
||||
"role": claims["role"],
|
||||
"workspace": claims["workspace"],
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -156,10 +156,10 @@ func (aH *AccessHandler) DeleteWorkspace(c *gin.Context) {
|
||||
}
|
||||
|
||||
for _, u := range users {
|
||||
if u.Settings.Workspace == nil {
|
||||
if u.WorkspaceID == nil {
|
||||
continue
|
||||
} else if u.Settings.Workspace.Uuid.String() == workspace.Uuid.String() {
|
||||
u.Settings.Workspace = nil
|
||||
} else if *u.WorkspaceID == workspace.Id {
|
||||
u.WorkspaceID = nil
|
||||
}
|
||||
|
||||
u.Workspaces = slices.DeleteFunc(u.Workspaces, func(w *models.Workspace) bool {
|
||||
|
||||
Reference in New Issue
Block a user