From 120fbed0f7715506cee8d2ba90f445eefcb072d7 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Thu, 9 Nov 2017 09:16:42 -0800 Subject: PLT-8061 re-activate SAML and Oauth on successful login (#7810) --- app/user.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/user.go') 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 { -- cgit v1.2.3-1-g7c22