Skip to content

Commit 888dee3

Browse files
authored
fix delete user failed on sqlite (#1321)
1 parent bd8fe49 commit 888dee3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

models/external_login_user.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import "github.com/markbates/goth"
99
// ExternalLoginUser makes the connecting between some existing user and additional external login sources
1010
type ExternalLoginUser struct {
1111
ExternalID string `xorm:"NOT NULL"`
12-
UserID int64 `xorm:"NOT NULL"`
13-
LoginSourceID int64 `xorm:"NOT NULL"`
12+
UserID int64 `xorm:"NOT NULL"`
13+
LoginSourceID int64 `xorm:"NOT NULL"`
1414
}
1515

1616
// GetExternalLogin checks if a externalID in loginSourceID scope already exists
@@ -67,8 +67,8 @@ func RemoveAccountLink(user *User, loginSourceID int64) (int64, error) {
6767
return deleted, err
6868
}
6969

70-
// RemoveAllAccountLinks will remove all external login sources for the given user
71-
func RemoveAllAccountLinks(user *User) error {
72-
_, err := x.Delete(&ExternalLoginUser{UserID: user.ID})
70+
// removeAllAccountLinks will remove all external login sources for the given user
71+
func removeAllAccountLinks(e Engine, user *User) error {
72+
_, err := e.Delete(&ExternalLoginUser{UserID: user.ID})
7373
return err
7474
}

models/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ func deleteUser(e *xorm.Session, u *User) error {
990990
}
991991

992992
// ***** START: ExternalLoginUser *****
993-
if err = RemoveAllAccountLinks(u); err != nil {
993+
if err = removeAllAccountLinks(e, u); err != nil {
994994
return fmt.Errorf("ExternalLoginUser: %v", err)
995995
}
996996
// ***** END: ExternalLoginUser *****

0 commit comments

Comments
 (0)