github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(settings): Use default setting if UserSessionTimeout not set (#4521) 

* fix(settings): Use default settings if UserSessionTimeout not set

* Update UserSessionTimeout settings in database if set to empty string
pull/4609/head
Stéphane Busso 2021-01-11 14:44:15 +13:00 committed by GitHub
parent 51ba0876a5
commit 6a504e7134
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/cmd/portainer/main.go
View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/portainer/portainer/api" portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/bolt" "github.com/portainer/portainer/api/bolt"
"github.com/portainer/portainer/api/chisel" "github.com/portainer/portainer/api/chisel"
"github.com/portainer/portainer/api/cli" "github.com/portainer/portainer/api/cli"
@ -89,6 +89,10 @@ func initJWTService(dataStore portainer.DataStore) (portainer.JWTService, error)
return nil, err return nil, err
} }
if settings.UserSessionTimeout == "" {
settings.UserSessionTimeout = portainer.DefaultUserSessionTimeout
dataStore.Settings().UpdateSettings(settings)
}
jwtService, err := jwt.NewService(settings.UserSessionTimeout) jwtService, err := jwt.NewService(settings.UserSessionTimeout)
if err != nil { if err != nil {
return nil, err return nil, err