Merge pull request #130 from carryall/release/2.6.0

Release 2.6.0

Author: carryall

constants/session.go

@@ -1,8 +1,9 @@
 package constants
 
 const (
-	SignInFail     = "Incorrect email or password"
-	SignInSuccess  = "Successfully signed in"
-	SignOutFail    = "Failed to sign out"
-	SignOutSuccess = "Successfully signed out"
+	ContextCurrentUser = "CurrentUser"
+	SignInFail         = "Incorrect email or password"
+	SignInSuccess      = "Successfully signed in"
+	SignOutFail        = "Failed to sign out"
+	SignOutSuccess     = "Successfully signed out"
 )

helpers/web/response.go

@@ -1,48 +1,19 @@
 package controllers
 
 import (
-	"strconv"
-
-	"go-google-scraper-challenge/errors"
-	. "go-google-scraper-challenge/helpers/api"
+	"go-google-scraper-challenge/constants"
 	"go-google-scraper-challenge/lib/models"
-	"go-google-scraper-challenge/lib/services/oauth"
 
 	"github.com/gin-gonic/gin"
 )
 
-type BaseController struct {
-	CurrentUser *models.User
-}
-
-func (b *BaseController) EnsureAuthenticatedUser(ctx *gin.Context) (err error) {
-	currentUser, err := b.GetCurrentUser(ctx)
-	if err != nil {
-		RenderJSONError(ctx, errors.ErrUnauthorizedUser, err.Error())
-
-		return err
-	}
-
-	b.CurrentUser = currentUser
-
-	return nil
-}
-
-func (b *BaseController) GetCurrentUser(ctx *gin.Context) (user *models.User, err error) {
-	tokenInfo, err := oauth.ValidateToken(ctx.Request)
-	if err != nil {
-		return nil, err
-	}
-
-	userID, err := strconv.Atoi(tokenInfo.GetUserID())
-	if err != nil {
-		return nil, err
-	}
+type BaseController struct{}
 
-	user, err = models.GetUserByID(int64(userID))
-	if err != nil {
-		return nil, err
+func (c *BaseController) GetCurrentUser(ctx *gin.Context) *models.User {
+	currentUser := ctx.MustGet(constants.ContextCurrentUser)
+	if currentUser == nil {
+		return nil
 	}
 
-	return user, nil
+	return currentUser.(*models.User)
 }

lib/api/v1/controllers/base.go

@@ -18,13 +18,10 @@ type ResultsController struct {
 }
 
 func (c *ResultsController) List(ctx *gin.Context) {
-	if c.EnsureAuthenticatedUser(ctx) != nil {
-		return
-	}
-
 	keyword := ctx.Query("keyword")
+	user := c.GetCurrentUser(ctx)
 
-	results, err := models.GetUserResults(c.CurrentUser.ID, []string{"User", "AdLinks", "Links"}, keyword)
+	results, err := models.GetUserResults(user.ID, []string{"User", "AdLinks", "Links"}, keyword)
 	if err != nil {
 		RenderJSONError(ctx, errors.ErrServerError, err.Error())
 
@@ -40,9 +37,7 @@ func (c *ResultsController) List(ctx *gin.Context) {
 }
 
 func (c *ResultsController) Show(ctx *gin.Context) {
-	if c.EnsureAuthenticatedUser(ctx) != nil {
-		return
-	}
+	user := c.GetCurrentUser(ctx)
 
 	resultID, err := strconv.Atoi(ctx.Param("id"))
 	if err != nil {
@@ -51,7 +46,7 @@ func (c *ResultsController) Show(ctx *gin.Context) {
 		return
 	}
 
-	result, err := models.GetResultByID(int64(resultID), c.CurrentUser, []string{"User", "AdLinks", "Links"})
+	result, err := models.GetResultByID(int64(resultID), user, []string{"User", "AdLinks", "Links"})
 	if err != nil {
 		RenderJSONError(ctx, errors.ErrNotFound, err.Error())
 
@@ -63,9 +58,7 @@ func (c *ResultsController) Show(ctx *gin.Context) {
 }
 
 func (c *ResultsController) Create(ctx *gin.Context) {
-	if c.EnsureAuthenticatedUser(ctx) != nil {
-		return
-	}
+	user := c.GetCurrentUser(ctx)
 
 	file, fileHeader, err := ctx.Request.FormFile("file")
 	if err != nil {
@@ -77,7 +70,7 @@ func (c *ResultsController) Create(ctx *gin.Context) {
 	uploadForm := &forms.UploadForm{
 		File:       file,
 		FileHeader: fileHeader,
-		User:       c.CurrentUser,
+		User:       user,
 	}
 
 	resultIDs, err := uploadForm.Save()