Use vanilla HTTP handlers (refactoring)

1 files changed, 1 insertions, 154 deletions

diff --git a/ui/oauth2.go b/ui/oauth2.go
index c5bf931..f1e6a4e 100644
--- a/ui/oauth2.go
+++ b/ui/oauth2.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Frédéric Guillot. All rights reserved.
+// Copyright 2018 Frédéric Guillot. All rights reserved.
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
@@ -6,162 +6,9 @@ package ui
 
 import (
 	"github.com/miniflux/miniflux/config"
-	"github.com/miniflux/miniflux/http/cookie"
-	"github.com/miniflux/miniflux/http/handler"
-	"github.com/miniflux/miniflux/logger"
-	"github.com/miniflux/miniflux/model"
 	"github.com/miniflux/miniflux/oauth2"
-
-	"github.com/tomasen/realip"
 )
 
-// OAuth2Redirect redirects the user to the consent page to ask for permission.
-func (c *Controller) OAuth2Redirect(ctx *handler.Context, request *handler.Request, response *handler.Response) {
-	provider := request.StringParam("provider", "")
-	if provider == "" {
-		logger.Error("[OAuth2] Invalid or missing provider: %s", provider)
-		response.Redirect(ctx.Route("login"))
-		return
-	}
-
-	authProvider, err := getOAuth2Manager(c.cfg).Provider(provider)
-	if err != nil {
-		logger.Error("[OAuth2] %v", err)
-		response.Redirect(ctx.Route("login"))
-		return
-	}
-
-	response.Redirect(authProvider.GetRedirectURL(ctx.GenerateOAuth2State()))
-}
-
-// OAuth2Callback receives the authorization code and create a new session.
-func (c *Controller) OAuth2Callback(ctx *handler.Context, request *handler.Request, response *handler.Response) {
-	provider := request.StringParam("provider", "")
-	if provider == "" {
-		logger.Error("[OAuth2] Invalid or missing provider")
-		response.Redirect(ctx.Route("login"))
-		return
-	}
-
-	code := request.QueryStringParam("code", "")
-	if code == "" {
-		logger.Error("[OAuth2] No code received on callback")
-		response.Redirect(ctx.Route("login"))
-		return
-	}
-
-	state := request.QueryStringParam("state", "")
-	if state == "" || state != ctx.OAuth2State() {
-		logger.Error(`[OAuth2] Invalid state value: got "%s" instead of "%s"`, state, ctx.OAuth2State())
-		response.Redirect(ctx.Route("login"))
-		return
-	}
-
-	authProvider, err := getOAuth2Manager(c.cfg).Provider(provider)
-	if err != nil {
-		logger.Error("[OAuth2] %v", err)
-		response.Redirect(ctx.Route("login"))
-		return
-	}
-
-	profile, err := authProvider.GetProfile(code)
-	if err != nil {
-		logger.Error("[OAuth2] %v", err)
-		response.Redirect(ctx.Route("login"))
-		return
-	}
-
-	if ctx.IsAuthenticated() {
-		user, err := c.store.UserByExtraField(profile.Key, profile.ID)
-		if err != nil {
-			response.HTML().ServerError(err)
-			return
-		}
-
-		if user != nil {
-			logger.Error("[OAuth2] User #%d cannot be associated because %s is already associated", ctx.UserID(), user.Username)
-			ctx.SetFlashErrorMessage(ctx.Translate("There is already someone associated with this provider!"))
-			response.Redirect(ctx.Route("settings"))
-			return
-		}
-
-		user = ctx.LoggedUser()
-		if err := c.store.UpdateExtraField(user.ID, profile.Key, profile.ID); err != nil {
-			response.HTML().ServerError(err)
-			return
-		}
-
-		ctx.SetFlashMessage(ctx.Translate("Your external account is now linked !"))
-		response.Redirect(ctx.Route("settings"))
-		return
-	}
-
-	user, err := c.store.UserByExtraField(profile.Key, profile.ID)
-	if err != nil {
-		response.HTML().ServerError(err)
-		return
-	}
-
-	if user == nil {
-		if !c.cfg.IsOAuth2UserCreationAllowed() {
-			response.HTML().Forbidden()
-			return
-		}
-
-		user = model.NewUser()
-		user.Username = profile.Username
-		user.IsAdmin = false
-		user.Extra[profile.Key] = profile.ID
-
-		if err := c.store.CreateUser(user); err != nil {
-			response.HTML().ServerError(err)
-			return
-		}
-	}
-
-	sessionToken, err := c.store.CreateUserSession(
-		user.Username,
-		request.Request().UserAgent(),
-		realip.RealIP(request.Request()),
-	)
-
-	if err != nil {
-		response.HTML().ServerError(err)
-		return
-	}
-
-	logger.Info("[Controller:OAuth2Callback] username=%s just logged in", user.Username)
-
-	response.SetCookie(cookie.New(cookie.CookieUserSessionID, sessionToken, c.cfg.IsHTTPS, c.cfg.BasePath()))
-	response.Redirect(ctx.Route("unread"))
-}
-
-// OAuth2Unlink unlink an account from the external provider.
-func (c *Controller) OAuth2Unlink(ctx *handler.Context, request *handler.Request, response *handler.Response) {
-	provider := request.StringParam("provider", "")
-	if provider == "" {
-		logger.Info("[OAuth2] Invalid or missing provider")
-		response.Redirect(ctx.Route("login"))
-		return
-	}
-
-	authProvider, err := getOAuth2Manager(c.cfg).Provider(provider)
-	if err != nil {
-		logger.Error("[OAuth2] %v", err)
-		response.Redirect(ctx.Route("settings"))
-		return
-	}
-
-	user := ctx.LoggedUser()
-	if err := c.store.RemoveExtraField(user.ID, authProvider.GetUserExtraKey()); err != nil {
-		response.HTML().ServerError(err)
-		return
-	}
-
-	response.Redirect(ctx.Route("settings"))
-	return
-}
-
 func getOAuth2Manager(cfg *config.Config) *oauth2.Manager {
 	return oauth2.NewManager(
 		cfg.OAuth2ClientID(),