From e8aa6189be94236489abcb246f2c190c6640fd40 Mon Sep 17 00:00:00 2001 From: mountain Date: Thu, 31 Aug 2023 21:13:11 +0900 Subject: [PATCH] =?UTF-8?q?config=EB=A1=9C=20provider=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config_template.json | 3 +++ core/maingate.go | 6 ++---- go.mod | 2 +- go.sum | 8 ++++++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/config_template.json b/config_template.json index 5ba3080..aa36a4d 100644 --- a/config_template.json +++ b/config_template.json @@ -1,5 +1,8 @@ { "maingate_mongodb_url": "mongodb://...", + "session_storage": "", + "session_ttl" : 3600, + "autologin_ttl": 604800, "maximum_num_link_account": 10, "redirect_base_url": "", diff --git a/core/maingate.go b/core/maingate.go index ab416f9..21adce2 100644 --- a/core/maingate.go +++ b/core/maingate.go @@ -73,9 +73,8 @@ func SessionTTL() time.Duration { } type maingateConfig struct { + session.SessionConfig `json:",inline"` Mongo string `json:"maingate_mongodb_url"` - SessionTTL int64 `json:"maingate_session_ttl"` - SessionStorage string `json:"maingate_session_storage"` Autologin_ttl int64 `json:"autologin_ttl"` MaximumNumLinkAccount int64 `json:"maximum_num_link_account"` RedirectBaseUrl string `json:"redirect_base_url"` @@ -335,8 +334,7 @@ func (mg *Maingate) prepare(context context.Context) (err error) { return makeErrorWithStack(err) } - mg.sessionProvider, err = session.NewProvider(context, mg.SessionStorage, time.Duration(mg.SessionTTL*int64(time.Second))) - + mg.sessionProvider, err = session.NewProviderWithConfig(context, mg.SessionConfig) if err != nil { return makeErrorWithStack(err) } diff --git a/go.mod b/go.mod index cba7487..601dcd9 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/golang-jwt/jwt v3.2.2+incompatible go.mongodb.org/mongo-driver v1.11.7 google.golang.org/api v0.128.0 - repositories.action2quare.com/ayo/gocommon v0.0.0-20230831113900-57b518562eac + repositories.action2quare.com/ayo/gocommon v0.0.0-20230831121208-90502c3029c5 ) require ( diff --git a/go.sum b/go.sum index d4adc51..fa118d4 100644 --- a/go.sum +++ b/go.sum @@ -343,3 +343,11 @@ repositories.action2quare.com/ayo/gocommon v0.0.0-20230831053308-cde46e6a5fdb h1 repositories.action2quare.com/ayo/gocommon v0.0.0-20230831053308-cde46e6a5fdb/go.mod h1:PdpZ16O1czKKxCxn+0AFNaEX/0kssYwC3G8jR0V7ybw= repositories.action2quare.com/ayo/gocommon v0.0.0-20230831113900-57b518562eac h1:LFWGF8pTmYujUil9RNyRcZP+lY+w54na0NfSDLGiz6U= repositories.action2quare.com/ayo/gocommon v0.0.0-20230831113900-57b518562eac/go.mod h1:PdpZ16O1czKKxCxn+0AFNaEX/0kssYwC3G8jR0V7ybw= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230831120508-888abef7c06c h1:QxDVs/1hz9mXCSHn+o5kaskbBmXPhMDj1JsMbrGRIps= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230831120508-888abef7c06c/go.mod h1:PdpZ16O1czKKxCxn+0AFNaEX/0kssYwC3G8jR0V7ybw= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230831120706-319dbf5a549a h1:z1mIpwrvs047IMKtAzeMh3KpRePURDEw6lj8rgrc4RM= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230831120706-319dbf5a549a/go.mod h1:PdpZ16O1czKKxCxn+0AFNaEX/0kssYwC3G8jR0V7ybw= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230831120931-a01158850987 h1:sBEJF24nZjdZ1ZhB4Q2wS4OQy18ws2pVUHRbCOjdIYU= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230831120931-a01158850987/go.mod h1:PdpZ16O1czKKxCxn+0AFNaEX/0kssYwC3G8jR0V7ybw= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230831121208-90502c3029c5 h1:nzzZM5XEf4yI+zc7GQ9QKr02Y9MUGuNVgUGV52Yie3o= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230831121208-90502c3029c5/go.mod h1:PdpZ16O1czKKxCxn+0AFNaEX/0kssYwC3G8jR0V7ybw=