mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-29 10:57:44 +09:00 
			
		
		
		
	finish delete ssh key and delete account. all with confirm.
This commit is contained in:
		| @@ -175,8 +175,8 @@ func DeleteUser(user *User) error { | ||||
|  | ||||
| // EncodePasswd encodes password to safe format. | ||||
| func (user *User) EncodePasswd() error { | ||||
| 	newPasswd, err := scrypt.Key([]byte(user.Passwd), []byte(UserPasswdSalt), 16384, 8, 1, 64) | ||||
| 	user.Passwd = fmt.Sprintf("%x", newPasswd) | ||||
| 	var err error | ||||
| 	user.Passwd, err = EncodePasswd(user.Passwd) | ||||
| 	return err | ||||
| } | ||||
|  | ||||
| @@ -184,6 +184,14 @@ 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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user