syntax fixes
This commit is contained in:
parent
8e748aaa90
commit
1ce33aa89a
13 changed files with 45 additions and 43 deletions
|
|
@ -40,21 +40,22 @@ func (db *DB) GetUsers() (users core.Users, err error) {
|
|||
return
|
||||
}
|
||||
|
||||
func (db *DB) GetUserWithoutPassword(username string) (u core.User, err error) {
|
||||
func (db *DB) GetUserWithoutPassword(username string) (u *core.User, err error) {
|
||||
u, err = db.GetUser(username)
|
||||
u.Password = ""
|
||||
return
|
||||
}
|
||||
|
||||
func (db *DB) GetUserSecret(username string) (secret string, err error) {
|
||||
var user core.User
|
||||
var user *core.User
|
||||
user, err = db.GetUser(username)
|
||||
secret = user.Secret
|
||||
return
|
||||
}
|
||||
|
||||
func (db *DB) GetUser(username string) (u core.User, err error) {
|
||||
err = db.store.Get(userPrefix+username, &u)
|
||||
func (db *DB) GetUser(username string) (u *core.User, err error) {
|
||||
u = new(core.User)
|
||||
err = db.store.Get(userPrefix+username, u)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +87,7 @@ func (db *DB) CreateUser(username, password string, admin bool) error {
|
|||
})
|
||||
}
|
||||
|
||||
func (db *DB) Login(username, password string) (u core.User, err error) {
|
||||
func (db *DB) Login(username, password string) (u *core.User, err error) {
|
||||
if username == defUser && !db.admin {
|
||||
err = errors.New("db: user disabled")
|
||||
return
|
||||
|
|
@ -118,7 +119,7 @@ func (db *DB) Login(username, password string) (u core.User, err error) {
|
|||
return
|
||||
}
|
||||
|
||||
func (db *DB) Totp(username, pin string) (u core.User, err error) {
|
||||
func (db *DB) Totp(username, pin string) (u *core.User, err error) {
|
||||
u, err = db.GetUser(username)
|
||||
if err != nil {
|
||||
return
|
||||
|
|
@ -147,7 +148,7 @@ func (db *DB) Totp(username, pin string) (u core.User, err error) {
|
|||
}
|
||||
|
||||
func (db *DB) UnlockUser(username string) (err error) {
|
||||
var u core.User
|
||||
var u *core.User
|
||||
u, err = db.GetUser(username)
|
||||
if err != nil {
|
||||
return
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue