From 425a58afd662297a1697349890f8611cf79d2019 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 16 Mar 2014 10:35:25 -0400 Subject: Bug fix --- models/user.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'models') diff --git a/models/user.go b/models/user.go index 4b5a1109..c42599de 100644 --- a/models/user.go +++ b/models/user.go @@ -168,6 +168,11 @@ func DeleteUser(user *User) error { } } + // Delete user directory. + if err = os.RemoveAll(UserPath(user.Name)); err != nil { + return err + } + _, err = orm.Delete(user) // TODO: delete and update follower information. return err @@ -175,8 +180,8 @@ func DeleteUser(user *User) error { // EncodePasswd encodes password to safe format. func (user *User) EncodePasswd() error { - var err error - user.Passwd, err = EncodePasswd(user.Passwd) + newPasswd, err := scrypt.Key([]byte(user.Passwd), []byte(UserPasswdSalt), 16384, 8, 1, 64) + user.Passwd = fmt.Sprintf("%x", newPasswd) return err } @@ -184,14 +189,6 @@ func UserPath(userName string) string { return filepath.Join(RepoRootPath, userName) } -func EncodePasswd(rawPasswd string) (string, error) { - newPasswd, err := scrypt.Key([]byte(rawPasswd), []byte(UserPasswdSalt), 16384, 8, 1, 64) - if err != nil { - return "", err - } - return fmt.Sprintf("%x", newPasswd), nil -} - func GetUserByKeyId(keyId int64) (*User, error) { user := new(User) has, err := orm.Sql("select a.* from user as a, public_key as b where a.id = b.owner_id and b.id=?", keyId).Get(user) -- cgit v1.2.3