eessppeelllloo/listmonk
1
0
Fork 0
mirror of https://github.com/knadh/listmonk.git synced 2025-12-06 00:10:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update user APIs and queries to embed role + list permissions.

Browse Source
This commit is contained in:
Kailash Nadh
2024-06-24 00:08:37 +05:30
parent 612c1d6eac
commit d52eac0948
7 changed files with 108 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
models/models.go
View File

@@ -151,21 +151,31 @@ type User struct {
Username string `db:"username" json:"username"`
// For API users, this is the plaintext API token.
Password null.String `db:"password" json:"password,omitempty"`
PasswordLogin bool `db:"password_login" json:"password_login"`
Email null.String `db:"email" json:"email"`
Name string `db:"name" json:"name"`
Type string `db:"type" json:"type"`
RoleID int `db:"role_id" json:"role_id"`
RoleName string `db:"role_name" json:"role_name"`
Permissions pq.StringArray `db:"permissions" json:"permissions"`
Status string `db:"status" json:"status"`
Avatar null.String `db:"-" json:"avatar"`
Password null.String `db:"password" json:"password,omitempty"`
PasswordLogin bool `db:"password_login" json:"password_login"`
Email null.String `db:"email" json:"email"`
Name string `db:"name" json:"name"`
Type string `db:"type" json:"type"`
Status string `db:"status" json:"status"`
Avatar null.String `db:"-" json:"avatar"`
LoggedInAt null.Time `db:"loggedin_at" json:"loggedin_at"`
PermissionsMap map[string]struct{} `db:"-" json:"-"`
LoggedInAt null.Time `db:"loggedin_at" json:"loggedin_at"`
// Filled post-retrieval.
Role struct {
ID int `db:"-" json:"id"`
Name string `db:"-" json:"name"`
Permissions []string `db:"-" json:"permissions"`
Lists []ListPermission `db:"-" json:"lists"`
} `db:"-" json:"role"`
HasPassword bool `db:"-" json:"-"`
RoleID int `db:"role_id" json:"role_id,omitempty"`
RoleName string `db:"role_name" json:"-"`
RolePerms pq.StringArray `db:"role_permissions" json:"-"`
ListsPermsRaw json.RawMessage `db:"list_permissions" json:"-"`
PermissionsMap map[string]struct{} `db:"-" json:"-"`
ListPermissionsMap map[int]map[string]struct{} `db:"-" json:"-"`
HasPassword bool `db:"-" json:"-"`
}
type ListPermission struct {