feat(handlers): replace boltdb with sqlite in handlers
This commit is contained in:
parent
791848f75c
commit
085a3e4e10
14 changed files with 342 additions and 307 deletions
|
@ -1,6 +1,7 @@
|
|||
package multiusers
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
|
@ -144,7 +145,7 @@ func NewMultiUsersSvc(cfg gocfg.ICfg, deps *depidx.Deps) (*MultiUsersSvc, error)
|
|||
return handlers, nil
|
||||
}
|
||||
|
||||
func (h *MultiUsersSvc) Init(adminName, adminPwd string) (string, error) {
|
||||
func (h *MultiUsersSvc) Init(ctx context.Context, adminName, adminPwd string) (string, error) {
|
||||
var err error
|
||||
|
||||
fsPath := q.FsRootPath(adminName, "/")
|
||||
|
@ -156,12 +157,6 @@ func (h *MultiUsersSvc) Init(adminName, adminPwd string) (string, error) {
|
|||
return "", err
|
||||
}
|
||||
|
||||
// TODO: return "" for being compatible with singleuser service, should remove this
|
||||
err = h.deps.Users().Init(c, adminName, adminPwd)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
usersInterface, ok := h.cfg.Slice("Users.PredefinedUsers")
|
||||
spaceLimit := int64(h.cfg.IntOr("Users.SpaceLimit", 100*1024*1024))
|
||||
uploadSpeedLimit := h.cfg.IntOr("Users.UploadSpeedLimit", 100*1024)
|
||||
|
@ -205,7 +200,7 @@ func (h *MultiUsersSvc) Init(adminName, adminPwd string) (string, error) {
|
|||
Preferences: &preferences,
|
||||
}
|
||||
|
||||
err = h.deps.Users().AddUser(c, user)
|
||||
err = h.deps.Users().AddUser(ctx, user)
|
||||
if err != nil {
|
||||
h.deps.Log().Warn("warning: failed to add user(%s): %s", user, err)
|
||||
return "", err
|
||||
|
@ -216,10 +211,6 @@ func (h *MultiUsersSvc) Init(adminName, adminPwd string) (string, error) {
|
|||
return "", nil
|
||||
}
|
||||
|
||||
func (h *MultiUsersSvc) IsInited() bool {
|
||||
return h.deps.Users().IsInited()
|
||||
}
|
||||
|
||||
type LoginReq struct {
|
||||
User string `json:"user"`
|
||||
Pwd string `json:"pwd"`
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue