mirror of
https://github.com/mindoc-org/mindoc.git
synced 2025-10-25 02:44:52 +08:00
重写Auth2.0登录逻辑 (#851)
* go mod update * feat: change to new wxwork sso login * fix: can't log in by workwx browser * fix: workwx auto regist * fix: change app.conf.example * fix: workwx account can't be disabled * fix: workwx account delete * fix: workwx bind error * feat: optimize wecom login * feat: rewrite dingtalk login * feat: rewrite dingtalk login * feat: optimize auth2 login
This commit is contained in:
@@ -90,7 +90,6 @@ func (m *Member) Login(account string, password string) (*Member, error) {
|
||||
}
|
||||
|
||||
switch member.AuthMethod {
|
||||
case "":
|
||||
case "local":
|
||||
ok, err := utils.PasswordVerify(member.Password, password)
|
||||
if ok && err == nil {
|
||||
@@ -109,15 +108,15 @@ func (m *Member) Login(account string, password string) (*Member, error) {
|
||||
}
|
||||
|
||||
// TmpLogin 用于钉钉临时登录
|
||||
func (m *Member) TmpLogin(account string) (*Member, error) {
|
||||
o := orm.NewOrm()
|
||||
member := &Member{}
|
||||
err := o.Raw("select * from md_members where account = ? and status = 0 limit 1;", account).QueryRow(member)
|
||||
if err != nil {
|
||||
return member, ErrorMemberPasswordError
|
||||
}
|
||||
return member, nil
|
||||
}
|
||||
//func (m *Member) TmpLogin(account string) (*Member, error) {
|
||||
// o := orm.NewOrm()
|
||||
// member := &Member{}
|
||||
// err := o.Raw("select * from md_members where account = ? and status = 0 limit 1;", account).QueryRow(member)
|
||||
// if err != nil {
|
||||
// return member, ErrorMemberPasswordError
|
||||
// }
|
||||
// return member, nil
|
||||
//}
|
||||
|
||||
// ldapLogin 通过LDAP登陆
|
||||
func (m *Member) ldapLogin(account string, password string) (*Member, error) {
|
||||
@@ -510,17 +509,26 @@ func (m *Member) Delete(oldId int, newId int) error {
|
||||
ormer := orm.NewOrm()
|
||||
|
||||
o, err := ormer.Begin()
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = o.Raw("DELETE FROM md_dingtalk_accounts WHERE member_id = ?", oldId).Exec()
|
||||
if err != nil {
|
||||
o.Rollback()
|
||||
return err
|
||||
}
|
||||
_, err = o.Raw("DELETE FROM md_workweixin_accounts WHERE member_id = ?", oldId).Exec()
|
||||
if err != nil {
|
||||
o.Rollback()
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = o.Raw("DELETE FROM md_members WHERE member_id = ?", oldId).Exec()
|
||||
if err != nil {
|
||||
o.Rollback()
|
||||
return err
|
||||
}
|
||||
_, err = o.Raw("UPDATE md_attachment SET `create_at` = ? WHERE `create_at` = ?", newId, oldId).Exec()
|
||||
_, err = o.Raw("UPDATE md_attachment SET create_at = ? WHERE create_at = ?", newId, oldId).Exec()
|
||||
|
||||
if err != nil {
|
||||
o.Rollback()
|
||||
|
||||
Reference in New Issue
Block a user