diff options
author | Jesús Espino <jespinog@gmail.com> | 2018-02-07 18:05:23 +0100 |
---|---|---|
committer | Jesús Espino <jespinog@gmail.com> | 2018-02-07 18:05:23 +0100 |
commit | a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e (patch) | |
tree | 985cb699d278f68522b08b60b1e7b84e0bd243fc /app/session.go | |
parent | 7941c30117efe1b957ac0458c2f0479e3824196d (diff) | |
parent | 7bd298ceaa24c0721e0acd65692cb2d1ca4983f3 (diff) | |
download | chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.gz chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.bz2 chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
Diffstat (limited to 'app/session.go')
-rw-r--r-- | app/session.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/session.go b/app/session.go index 1c5daf29e..459618439 100644 --- a/app/session.go +++ b/app/session.go @@ -69,8 +69,9 @@ func (a *App) GetSession(token string) (*model.Session, *model.AppError) { return nil, model.NewAppError("GetSession", "api.context.invalid_token.error", map[string]interface{}{"Token": token}, "", http.StatusUnauthorized) } + license := a.License() if *a.Config().ServiceSettings.SessionIdleTimeoutInMinutes > 0 && - utils.IsLicensed() && *utils.License().Features.Compliance && + license != nil && *license.Features.Compliance && session != nil && !session.IsOAuth && !session.IsMobileApp() && session.Props[model.SESSION_PROP_TYPE] != model.SESSION_TYPE_USER_ACCESS_TOKEN { |