Skip to content

Commit eca5008

Browse files
okatu-loliokatu-loli
authored
feat: add user registration endpoint and role-based default settings (#9277)
* feat(setting): add role-based default and registration settings (closed #feat/register-and-statistics) - Added `AllowRegister` and `DefaultRole` settings to site configuration. - Integrated dynamic role options for `DefaultRole` using `op.GetRoles`. - Updated `setting.go` handlers to manage `DefaultRole` options dynamically. - Modified `const.go` to include new site settings constants. - Updated dependencies in `go.mod` and `go.sum` to support new functionality. * feat(register-and-statistics): add user registration endpoint - Added `POST /auth/register` endpoint to support user registration. - Implemented registration logic in `auth.go` with dynamic role assignment. - Integrated settings `AllowRegister` and `DefaultRole` for registration flow. - Updated imports to include new modules: `conf`, `setting`. - Adjusted user creation logic to use `DefaultRole` setting dynamically. * feat(register-and-statistics): add user registration endpoint (#register-and-statistics) - Added `POST /auth/register` endpoint to support user registration. - Implemented registration logic in `auth.go` with dynamic role assignment. - Integrated `AllowRegister` and `DefaultRole` settings for registration flow. - Updated imports to include new modules: `conf`, `setting`. - Adjusted user creation logic to use `DefaultRole` dynamically. * feat(register-and-statistics): enhance role management logic (#register-and-statistics) - Refactored CreateRole and UpdateRole functions to handle default role. - Added dynamic role assignment logic in 'role.go' using conf settings. - Improved request handling in 'handles/role.go' with structured data. - Implemented default role logic in 'db/role.go' to update non-default roles. - Modified 'model/role.go' to include a 'Default' field for role management. * feat(register-and-statistics): enhance role management logic - Refactor CreateRole and UpdateRole to handle default roles. - Add dynamic role assignment using conf settings in 'role.go'. - Improve request handling with structured data in 'handles/role.go'. - Implement default role logic in 'db/role.go' for non-default roles. - Modify 'model/role.go' to include 'Default' field for role management. * feat(register-and-statistics): improve role handling logic - Switch from role names to role IDs for better consistency. - Update logic to prioritize "guest" for default role ID. - Adjust `DefaultRole` setting to use role IDs. - Refactor `getRoleOptions` to return role IDs as a comma-separated string. * feat(register-and-statistics): improve role handling logic
1 parent 97d4f79 commit eca5008

File tree

13 files changed

+202
-24
lines changed

13 files changed

+202
-24
lines changed

‎go.mod

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ module github.com/alist-org/alist/v3
33
go 1.23.4
44

55
require (
6+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
7+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0
68
github.com/KirCute/ftpserverlib-pasvportmap v1.25.0
79
github.com/KirCute/sftpd-alist v0.0.12
810
github.com/ProtonMail/go-crypto v1.0.0
@@ -79,11 +81,7 @@ require (
7981
gorm.io/gorm v1.25.11
8082
)
8183

82-
require (
83-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
84-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
85-
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0 // indirect
86-
)
84+
require github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
8785

8886
require (
8987
github.com/STARRY-S/zip v0.2.1 // indirect
@@ -109,7 +107,6 @@ require (
109107
github.com/ipfs/boxo v0.12.0 // indirect
110108
github.com/jackc/puddle/v2 v2.2.1 // indirect
111109
github.com/klauspost/pgzip v1.2.6 // indirect
112-
github.com/kr/text v0.2.0 // indirect
113110
github.com/matoous/go-nanoid/v2 v2.1.0 // indirect
114111
github.com/microcosm-cc/bluemonday v1.0.27
115112
github.com/nwaples/rardecode/v2 v2.0.0-beta.4.0.20241112120701-034e449c6e78

‎go.sum

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,16 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
2121
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
2222
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=
2323
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
24+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 h1:B/dfvscEQtew9dVuoxqxrUKKv8Ih2f55PydknDamU+g=
25+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0/go.mod h1:fiPSssYvltE08HJchL04dOy+RD4hgrjph0cwGGMntdI=
2426
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
2527
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY=
28+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0 h1:PiSrjRPpkQNjrM8H0WwKMnZUdu1RGMtd/LdGKUrOo+c=
29+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0/go.mod h1:oDrbWx4ewMylP7xHivfgixbfGBT6APAwsSoHRKotnIc=
2630
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0 h1:UXT0o77lXQrikd1kgwIPQOUect7EoR/+sbP4wQKdzxM=
2731
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0/go.mod h1:cTvi54pg19DoT07ekoeMgE/taAwNtCShVeZqA+Iv2xI=
32+
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 h1:kYRSnvJju5gYVyhkij+RTJ/VR6QIUaCfWeaFm2ycsjQ=
33+
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
2834
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
2935
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
3036
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
@@ -172,7 +178,6 @@ github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03V
172178
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
173179
github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 h1:HVTnpeuvF6Owjd5mniCL8DEXo7uYXdQEmOP4FJbV5tg=
174180
github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3/go.mod h1:p1d6YEZWvFzEh4KLyvBcVSnrfNDDvK2zfK/4x2v/4pE=
175-
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
176181
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
177182
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
178183
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -398,6 +403,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
398403
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
399404
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
400405
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
406+
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
407+
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
401408
github.com/larksuite/oapi-sdk-go/v3 v3.3.1 h1:DLQQEgHUAGZB6RVlceB1f6A94O206exxW2RIMH+gMUc=
402409
github.com/larksuite/oapi-sdk-go/v3 v3.3.1/go.mod h1:ZEplY+kwuIrj/nqw5uSCINNATcH3KdxSN7y+UxYY5fI=
403410
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
@@ -492,6 +499,8 @@ github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6
492499
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
493500
github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
494501
github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
502+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
503+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
495504
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
496505
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
497506
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -739,8 +748,6 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
739748
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
740749
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
741750
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
742-
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
743-
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
744751
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
745752
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
746753
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=

‎internal/bootstrap/data/setting.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package data
22

33
import (
44
"strconv"
5+
"strings"
56

67
"github.com/alist-org/alist/v3/cmd/flags"
78
"github.com/alist-org/alist/v3/internal/conf"
@@ -91,6 +92,21 @@ func InitialSettings() []model.SettingItem {
9192
} else {
9293
token = random.Token()
9394
}
95+
roles, _, err := op.GetRoles(1, model.MaxInt)
96+
if err != nil {
97+
utils.Log.Fatalf("failed get roles: %+v", err)
98+
}
99+
roleNames := make([]string, len(roles))
100+
defaultRoleID := ""
101+
for i, role := range roles {
102+
roleNames[i] = role.Name
103+
if role.Name == "guest" {
104+
defaultRoleID = strconv.Itoa(int(role.ID))
105+
}
106+
}
107+
if defaultRoleID == "" && len(roles) > 0 {
108+
defaultRoleID = strconv.Itoa(int(roles[0].ID))
109+
}
94110
initialSettingItems = []model.SettingItem{
95111
// site settings
96112
{Key: conf.VERSION, Value: conf.Version, Type: conf.TypeString, Group: model.SITE, Flag: model.READONLY},
@@ -103,6 +119,8 @@ func InitialSettings() []model.SettingItem {
103119
{Key: conf.AllowIndexed, Value: "false", Type: conf.TypeBool, Group: model.SITE},
104120
{Key: conf.AllowMounted, Value: "true", Type: conf.TypeBool, Group: model.SITE},
105121
{Key: conf.RobotsTxt, Value: "User-agent: *\nAllow: /", Type: conf.TypeText, Group: model.SITE},
122+
{Key: conf.AllowRegister, Value: "false", Type: conf.TypeBool, Group: model.SITE},
123+
{Key: conf.DefaultRole, Value: defaultRoleID, Type: conf.TypeSelect, Options: strings.Join(roleNames, ","), Group: model.SITE},
106124
// newui settings
107125
{Key: conf.UseNewui, Value: "false", Type: conf.TypeBool, Group: model.SITE},
108126
// style settings

‎internal/conf/const.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ const (
1010

1111
const (
1212
// site
13-
VERSION = "version"
14-
SiteTitle = "site_title"
15-
Announcement = "announcement"
16-
AllowIndexed = "allow_indexed"
17-
AllowMounted = "allow_mounted"
18-
RobotsTxt = "robots_txt"
19-
UseNewui = "use_newui"
13+
VERSION = "version"
14+
SiteTitle = "site_title"
15+
Announcement = "announcement"
16+
AllowIndexed = "allow_indexed"
17+
AllowMounted = "allow_mounted"
18+
RobotsTxt = "robots_txt"
19+
AllowRegister = "allow_register"
20+
DefaultRole = "default_role"
21+
UseNewui = "use_newui"
2022

2123
Logo = "logo"
2224
Favicon = "favicon"

‎internal/db/role.go

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,27 @@ func GetRoles(pageIndex, pageSize int) (roles []model.Role, count int64, err err
3535
}
3636

3737
func CreateRole(r *model.Role) error {
38-
return errors.WithStack(db.Create(r).Error)
38+
if err := db.Create(r).Error; err != nil {
39+
return errors.WithStack(err)
40+
}
41+
if r.Default {
42+
if err := db.Model(&model.Role{}).Where("id <> ?", r.ID).Update("default", false).Error; err != nil {
43+
return errors.WithStack(err)
44+
}
45+
}
46+
return nil
3947
}
4048

4149
func UpdateRole(r *model.Role) error {
42-
return errors.WithStack(db.Save(r).Error)
50+
if err := db.Save(r).Error; err != nil {
51+
return errors.WithStack(err)
52+
}
53+
if r.Default {
54+
if err := db.Model(&model.Role{}).Where("id <> ?", r.ID).Update("default", false).Error; err != nil {
55+
return errors.WithStack(err)
56+
}
57+
}
58+
return nil
4359
}
4460

4561
func DeleteRole(id uint) error {

‎internal/model/role.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ type Role struct {
1717
ID uint `json:"id" gorm:"primaryKey"`
1818
Name string `json:"name" gorm:"unique" binding:"required"`
1919
Description string `json:"description"`
20+
Default bool `json:"default" gorm:"default:false"`
2021
// PermissionScopes stores structured permission list and is ignored by gorm.
2122
PermissionScopes []PermissionEntry `json:"permission_scopes" gorm:"-"`
2223
// RawPermission is the JSON representation of PermissionScopes stored in DB.

‎internal/op/hook.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package op
22

33
import (
44
"regexp"
5+
"strconv"
56
"strings"
67

78
"github.com/alist-org/alist/v3/internal/conf"
@@ -82,6 +83,18 @@ var settingItemHooks = map[string]SettingItemHook{
8283
conf.SlicesMap[conf.IgnoreDirectLinkParams] = strings.Split(item.Value, ",")
8384
return nil
8485
},
86+
conf.DefaultRole: func(item *model.SettingItem) error {
87+
v := strings.TrimSpace(item.Value)
88+
if v == "" {
89+
return nil
90+
}
91+
r, err := GetRoleByName(v)
92+
if err != nil {
93+
return err
94+
}
95+
item.Value = strconv.Itoa(int(r.ID))
96+
return nil
97+
},
8598
}
8699

87100
func RegisterSettingItemHook(key string, hook SettingItemHook) {

‎internal/op/role.go

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ package op
22

33
import (
44
"fmt"
5+
"strconv"
56
"time"
67

78
"github.com/Xhofe/go-cache"
9+
"github.com/alist-org/alist/v3/internal/conf"
810
"github.com/alist-org/alist/v3/internal/db"
911
"github.com/alist-org/alist/v3/internal/errs"
1012
"github.com/alist-org/alist/v3/internal/model"
@@ -50,6 +52,23 @@ func GetRoleByName(name string) (*model.Role, error) {
5052
return r, err
5153
}
5254

55+
func GetDefaultRoleID() int {
56+
item, err := GetSettingItemByKey(conf.DefaultRole)
57+
if err == nil && item != nil && item.Value != "" {
58+
if id, err := strconv.Atoi(item.Value); err == nil && id != 0 {
59+
return id
60+
}
61+
if r, err := db.GetRoleByName(item.Value); err == nil {
62+
return int(r.ID)
63+
}
64+
}
65+
var r model.Role
66+
if err := db.GetDb().Where("`default` = ?", true).First(&r).Error; err == nil {
67+
return int(r.ID)
68+
}
69+
return int(model.GUEST)
70+
}
71+
5372
func GetRolesByUserID(userID uint) ([]model.Role, error) {
5473
user, err := GetUserById(userID)
5574
if err != nil {
@@ -92,7 +111,21 @@ func CreateRole(r *model.Role) error {
92111
}
93112
roleCache.Del(fmt.Sprint(r.ID))
94113
roleCache.Del(r.Name)
95-
return db.CreateRole(r)
114+
if err := db.CreateRole(r); err != nil {
115+
return err
116+
}
117+
if r.Default {
118+
roleCache.Clear()
119+
item, err := GetSettingItemByKey(conf.DefaultRole)
120+
if err != nil {
121+
return err
122+
}
123+
item.Value = strconv.Itoa(int(r.ID))
124+
if err := SaveSettingItem(item); err != nil {
125+
return err
126+
}
127+
}
128+
return nil
96129
}
97130

98131
func UpdateRole(r *model.Role) error {
@@ -131,7 +164,21 @@ func UpdateRole(r *model.Role) error {
131164
//}
132165
roleCache.Del(fmt.Sprint(r.ID))
133166
roleCache.Del(r.Name)
134-
return db.UpdateRole(r)
167+
if err := db.UpdateRole(r); err != nil {
168+
return err
169+
}
170+
if r.Default {
171+
roleCache.Clear()
172+
item, err := GetSettingItemByKey(conf.DefaultRole)
173+
if err != nil {
174+
return err
175+
}
176+
item.Value = strconv.Itoa(int(r.ID))
177+
if err := SaveSettingItem(item); err != nil {
178+
return err
179+
}
180+
}
181+
return nil
135182
}
136183

137184
func DeleteRole(id uint) error {

‎server/handles/auth.go

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import (
99
"time"
1010

1111
"github.com/Xhofe/go-cache"
12+
"github.com/alist-org/alist/v3/internal/conf"
1213
"github.com/alist-org/alist/v3/internal/model"
1314
"github.com/alist-org/alist/v3/internal/op"
15+
"github.com/alist-org/alist/v3/internal/setting"
1416
"github.com/alist-org/alist/v3/server/common"
1517
"github.com/gin-gonic/gin"
1618
"github.com/pquerna/otp/totp"
@@ -89,6 +91,35 @@ func loginHash(c *gin.Context, req *LoginReq) {
8991
loginCache.Del(ip)
9092
}
9193

94+
type RegisterReq struct {
95+
Username string `json:"username" binding:"required"`
96+
Password string `json:"password" binding:"required"`
97+
}
98+
99+
// Register a new user
100+
func Register(c *gin.Context) {
101+
if !setting.GetBool(conf.AllowRegister) {
102+
common.ErrorStrResp(c, "registration is disabled", 403)
103+
return
104+
}
105+
var req RegisterReq
106+
if err := c.ShouldBind(&req); err != nil {
107+
common.ErrorResp(c, err, 400)
108+
return
109+
}
110+
user := &model.User{
111+
Username: req.Username,
112+
Role: model.Roles{op.GetDefaultRoleID()},
113+
Authn: "[]",
114+
}
115+
user.SetPassword(req.Password)
116+
if err := op.CreateUser(user); err != nil {
117+
common.ErrorResp(c, err, 500, true)
118+
return
119+
}
120+
common.SuccessResp(c)
121+
}
122+
92123
type UserResp struct {
93124
model.User
94125
Otp bool `json:"otp"`

‎server/handles/role.go

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func GetRole(c *gin.Context) {
4444

4545
func CreateRole(c *gin.Context) {
4646
var req model.Role
47-
if err := c.ShouldBind(&req); err != nil {
47+
if err := c.ShouldBindJSON(&req); err != nil {
4848
common.ErrorResp(c, err, 400)
4949
return
5050
}
@@ -56,8 +56,14 @@ func CreateRole(c *gin.Context) {
5656
}
5757

5858
func UpdateRole(c *gin.Context) {
59-
var req model.Role
60-
if err := c.ShouldBind(&req); err != nil {
59+
var req struct {
60+
ID uint `json:"id"`
61+
Name string `json:"name" binding:"required"`
62+
Description string `json:"description"`
63+
PermissionScopes []model.PermissionEntry `json:"permission_scopes"`
64+
Default *bool `json:"default"`
65+
}
66+
if err := c.ShouldBindJSON(&req); err != nil {
6167
common.ErrorResp(c, err, 400)
6268
return
6369
}
@@ -74,7 +80,13 @@ func UpdateRole(c *gin.Context) {
7480
case "guest":
7581
req.Name = "guest"
7682
}
77-
if err := op.UpdateRole(&req); err != nil {
83+
role.Name = req.Name
84+
role.Description = req.Description
85+
role.PermissionScopes = req.PermissionScopes
86+
if req.Default != nil {
87+
role.Default = *req.Default
88+
}
89+
if err := op.UpdateRole(role); err != nil {
7890
common.ErrorResp(c, err, 500, true)
7991
} else {
8092
common.SuccessResp(c)

0 commit comments

Comments
 (0)