mirror of
https://github.com/mattermost/mattermost.git
synced 2026-09-24 16:05:00 +08:00
PLT-8061 re-activate SAML and Oauth on successful login (#7810)
This commit is contained in:
committed by
Christopher Speller
parent
7ef60d47c9
commit
120fbed0f7
@@ -1534,6 +1534,12 @@ func (a *App) UpdateOAuthUserAttrs(userData io.Reader, user *model.User, provide
|
||||
}
|
||||
}
|
||||
|
||||
if user.DeleteAt > 0 {
|
||||
// Make sure they are not disabled
|
||||
user.DeleteAt = 0
|
||||
userAttrsChanged = true
|
||||
}
|
||||
|
||||
if userAttrsChanged {
|
||||
var result store.StoreResult
|
||||
if result = <-a.Srv.Store.User().Update(user, true); result.Err != nil {
|
||||
|
||||
Reference in New Issue
Block a user