doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(userstore): use copy of default preferences

Browse source
This commit is contained in:
hexxa 2021-11-07 12:09:25 +08:00 • committed by Hexxa
parent edcec3698f
commit 769ddb078a
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/db/userstore/user_store.go
View file

@ -125,6 +125,7 @@ func NewKVUserStore(store kvstore.IKVStore) (*KVUserStore, error) {
func (us *KVUserStore) Init(rootName, rootPwd string) error { func (us *KVUserStore) Init(rootName, rootPwd string) error {
var err error var err error
adminPreferences := DefaultPreferences
admin := &User{ admin := &User{
ID: 0, ID: 0,
Name: rootName, Name: rootName,
@ -135,8 +136,10 @@ func (us *KVUserStore) Init(rootName, rootPwd string) error {
UploadSpeedLimit: defaultUploadSpeedLimit, UploadSpeedLimit: defaultUploadSpeedLimit,
DownloadSpeedLimit: defaultDownloadSpeedLimit, DownloadSpeedLimit: defaultDownloadSpeedLimit,
}, },
Preferences: &DefaultPreferences, Preferences: &adminPreferences,
} }
visitorPreferences := DefaultPreferences
visitor := &User{ visitor := &User{
ID: VisitorID, ID: VisitorID,
Name: VisitorName, Name: VisitorName,
@ -147,7 +150,7 @@ func (us *KVUserStore) Init(rootName, rootPwd string) error {
UploadSpeedLimit: visitorUploadSpeedLimit, UploadSpeedLimit: visitorUploadSpeedLimit,
DownloadSpeedLimit: visitorDownloadSpeedLimit, DownloadSpeedLimit: visitorDownloadSpeedLimit,
}, },
Preferences: &DefaultPreferences, Preferences: &visitorPreferences,
} }
for _, user := range []*User{admin, visitor} { for _, user := range []*User{admin, visitor} {

6
src/handlers/multiusers/handlers.go
View file

@ -171,6 +171,7 @@ func (h *MultiUsersSvc) Init(adminName, adminPwd string) (string, error) {
return "", err return "", err
} }
preferences := userstore.DefaultPreferences
user := &userstore.User{ user := &userstore.User{
ID: h.deps.ID().Gen(), ID: h.deps.ID().Gen(),
Name: userCfg.Name, Name: userCfg.Name,
@ -181,7 +182,7 @@ func (h *MultiUsersSvc) Init(adminName, adminPwd string) (string, error) {
UploadSpeedLimit: uploadSpeedLimit, UploadSpeedLimit: uploadSpeedLimit,
DownloadSpeedLimit: downloadSpeedLimit, DownloadSpeedLimit: downloadSpeedLimit,
}, },
Preferences: &userstore.DefaultPreferences, Preferences: &preferences,
} }
err = h.deps.Users().AddUser(user) err = h.deps.Users().AddUser(user)
@ -425,6 +426,7 @@ func (h *MultiUsersSvc) AddUser(c *gin.Context) {
return return
} }
newPreferences := userstore.DefaultPreferences
err = h.deps.Users().AddUser(&userstore.User{ err = h.deps.Users().AddUser(&userstore.User{
ID: uid, ID: uid,
Name: req.Name, Name: req.Name,
@ -435,7 +437,7 @@ func (h *MultiUsersSvc) AddUser(c *gin.Context) {
UploadSpeedLimit: h.cfg.IntOr("Users.UploadSpeedLimit", 100*1024), UploadSpeedLimit: h.cfg.IntOr("Users.UploadSpeedLimit", 100*1024),
DownloadSpeedLimit: h.cfg.IntOr("Users.DownloadSpeedLimit", 100*1024), DownloadSpeedLimit: h.cfg.IntOr("Users.DownloadSpeedLimit", 100*1024),
}, },
Preferences: &userstore.DefaultPreferences, Preferences: &newPreferences,
}) })
if err != nil { if err != nil {
c.JSON(q.ErrResp(c, 500, err)) c.JSON(q.ErrResp(c, 500, err))

1
src/handlers/settings/handlers.go
View file

@ -51,7 +51,6 @@ func (h *SettingsSvc) SetClientCfg(c *gin.Context) {
c.JSON(q.ErrResp(c, 400, err)) c.JSON(q.ErrResp(c, 400, err))
return return
} }
h.deps.Log().Info(req.ClientCfg)
if err = validateClientCfg(req.ClientCfg); err != nil { if err = validateClientCfg(req.ClientCfg); err != nil {
c.JSON(q.ErrResp(c, 400, err)) c.JSON(q.ErrResp(c, 400, err))