From da5c8c2edb4e7978bc3ef989ee774c3407905fac Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sat, 20 Jan 2018 16:49:47 -0800 Subject: Move environment variables to config package --- ui/oauth2.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ui/oauth2.go') diff --git a/ui/oauth2.go b/ui/oauth2.go index 12ca572..4afc7d8 100644 --- a/ui/oauth2.go +++ b/ui/oauth2.go @@ -11,6 +11,7 @@ import ( "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/model" "github.com/miniflux/miniflux/oauth2" + "github.com/tomasen/realip" ) @@ -102,7 +103,7 @@ func (c *Controller) OAuth2Callback(ctx *handler.Context, request *handler.Reque } if user == nil { - if c.cfg.GetInt("OAUTH2_USER_CREATION", 0) == 0 { + if !c.cfg.IsOAuth2UserCreationAllowed() { response.HTML().Forbidden() return } @@ -163,8 +164,8 @@ func (c *Controller) OAuth2Unlink(ctx *handler.Context, request *handler.Request func getOAuth2Manager(cfg *config.Config) *oauth2.Manager { return oauth2.NewManager( - cfg.Get("OAUTH2_CLIENT_ID", ""), - cfg.Get("OAUTH2_CLIENT_SECRET", ""), - cfg.Get("OAUTH2_REDIRECT_URL", ""), + cfg.OAuth2ClientID(), + cfg.OAuth2ClientSecret(), + cfg.OAuth2RedirectURL(), ) } -- cgit v1.2.3