diff options
| author | Corey Hulen <corey@hulen.com> | 2017-11-09 09:16:42 -0800 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-11-09 09:16:42 -0800 |
| commit | 120fbed0f7715506cee8d2ba90f445eefcb072d7 (patch) | |
| tree | 31425ba9682bcdad6c7972c37df9e1a696856e5c /app/user.go | |
| parent | 7ef60d47c9486427a13380cf8424e487943f69f7 (diff) | |
| download | chat-120fbed0f7715506cee8d2ba90f445eefcb072d7.tar.gz chat-120fbed0f7715506cee8d2ba90f445eefcb072d7.tar.bz2 chat-120fbed0f7715506cee8d2ba90f445eefcb072d7.zip | |
PLT-8061 re-activate SAML and Oauth on successful login (#7810)
Diffstat (limited to 'app/user.go')
| -rw-r--r-- | app/user.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/user.go b/app/user.go index 60a6c887b..4eb1dc9c8 100644 --- a/app/user.go +++ b/app/user.go @@ -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 { |