go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-06-25 00:47:17 +02:00
Code Issues Releases Activity

Rename Session Options to improve structure

Browse Source
This commit is contained in:
Joel Speed
2020-04-12 14:55:30 +01:00
parent 458710149c
commit e49f8542bc
5 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
options.go
View File

@ -66,8 +66,7 @@ type Options struct {
Cookie options.CookieOptions
// Embed SessionOptions
options.SessionOptions
Session options.SessionOptions
Upstreams []string `flag:"upstream" cfg:"upstreams" env:"OAUTH2_PROXY_UPSTREAMS"`
SkipAuthRegex []string `flag:"skip-auth-regex" cfg:"skip_auth_regex" env:"OAUTH2_PROXY_SKIP_AUTH_REGEX"`
@ -164,7 +163,7 @@ func NewOptions() *Options {
Expire: time.Duration(168) * time.Hour,
Refresh: time.Duration(0),
},
SessionOptions: options.SessionOptions{
Session: options.SessionOptions{
Type: "cookie",
},
SetXAuthRequest: false,
@ -412,8 +411,8 @@ func (o *Options) Validate() error {
}
}
o.SessionOptions.Cipher = cipher
sessionStore, err := sessions.NewSessionStore(&o.SessionOptions, &o.Cookie)
o.Session.Cipher = cipher
sessionStore, err := sessions.NewSessionStore(&o.Session, &o.Cookie)
if err != nil {
msgs = append(msgs, fmt.Sprintf("error initialising session storage: %v", err))
} else {