|
|
|
@ -1038,25 +1038,26 @@ func deleteUser(e *xorm.Session, u *User) error {
|
|
|
|
|
&EmailAddress{UID: u.ID},
|
|
|
|
|
&UserOpenID{UID: u.ID},
|
|
|
|
|
&Reaction{UserID: u.ID},
|
|
|
|
|
&TeamUser{UID: u.ID},
|
|
|
|
|
&Collaboration{UserID: u.ID},
|
|
|
|
|
&Stopwatch{UserID: u.ID},
|
|
|
|
|
); err != nil {
|
|
|
|
|
return fmt.Errorf("deleteBeans: %v", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// ***** START: PublicKey *****
|
|
|
|
|
keys := make([]*PublicKey, 0, 10)
|
|
|
|
|
if err = e.Find(&keys, &PublicKey{OwnerID: u.ID}); err != nil {
|
|
|
|
|
return fmt.Errorf("get all public keys: %v", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
keyIDs := make([]int64, len(keys))
|
|
|
|
|
for i := range keys {
|
|
|
|
|
keyIDs[i] = keys[i].ID
|
|
|
|
|
}
|
|
|
|
|
if err = deletePublicKeys(e, keyIDs...); err != nil {
|
|
|
|
|
if _, err = e.Delete(&PublicKey{OwnerID: u.ID}); err != nil {
|
|
|
|
|
return fmt.Errorf("deletePublicKeys: %v", err)
|
|
|
|
|
}
|
|
|
|
|
rewriteAllPublicKeys(e)
|
|
|
|
|
// ***** END: PublicKey *****
|
|
|
|
|
|
|
|
|
|
// ***** START: GPGPublicKey *****
|
|
|
|
|
if _, err = e.Delete(&GPGKey{OwnerID: u.ID}); err != nil {
|
|
|
|
|
return fmt.Errorf("deleteGPGKeys: %v", err)
|
|
|
|
|
}
|
|
|
|
|
// ***** END: GPGPublicKey *****
|
|
|
|
|
|
|
|
|
|
// Clear assignee.
|
|
|
|
|
if err = clearAssigneeByUserID(e, u.ID); err != nil {
|
|
|
|
|
return fmt.Errorf("clear assignee: %v", err)
|
|
|
|
@ -1110,6 +1111,7 @@ func DeleteUser(u *User) (err error) {
|
|
|
|
|
if err = sess.Commit(); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
sess.Close()
|
|
|
|
|
|
|
|
|
|
return RewriteAllPublicKeys()
|
|
|
|
|
}
|
|
|
|
|