make cookie and session keys to const

Author: isoppp

internal/cookie/keys.go

@@ -0,0 +1,4 @@
+package cookie
+
+const SessionCookieKeyName = "session"
+const SecureCookieSessionKeyName = "session"

internal/scookie/scookie.go renamed to internal/cookie/securecookie.go

@@ -1,4 +1,4 @@
-package scookie
+package cookie
 
 import (
 	"sandbox-go-api-sqlboiler-rest-auth/internal/config"

internal/handlers/session.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"net/http"
+	"sandbox-go-api-sqlboiler-rest-auth/internal/cookie"
 	"sandbox-go-api-sqlboiler-rest-auth/internal/middleware"
 	"sandbox-go-api-sqlboiler-rest-auth/models"
 	"strconv"
@@ -41,7 +42,10 @@ func CreateSession(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusBadRequest)
 	}
 
-	expirationDays := strconv.Atoi(cc.Config.SessionExpirationDays)
+	expirationDays, err := strconv.Atoi(cc.Config.SessionExpirationDays)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusInternalServerError)
+	}
 
 	var s models.Session
 	var uid, _ = uuid.NewUUID()
@@ -53,21 +57,21 @@ func CreateSession(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusInternalServerError)
 	}
 
-	encoded, err := cc.SecureCookie.Encode("session", s.ID)
+	encoded, err := cc.SecureCookie.Encode(cookie.SecureCookieSessionKeyName, s.ID)
 	if err != nil {
 		return echo.NewHTTPError(http.StatusInternalServerError)
 	}
 
-	cookie := &http.Cookie{
-		Name:     "session",
+	ck := &http.Cookie{
+		Name:     cookie.SessionCookieKeyName,
 		Value:    encoded,
 		Path:     "/",
 		Expires:  time.Now().Add(time.Hour * 24 * time.Duration(expirationDays)),
 		Secure:   !cc.Config.IsDev,
 		HttpOnly: true,
 		SameSite: 2,
 	}
-	c.SetCookie(cookie)
+	c.SetCookie(ck)
 	return c.NoContent(http.StatusNoContent)
 }
 

internal/middleware/middleware.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"sandbox-go-api-sqlboiler-rest-auth/internal/config"
+	"sandbox-go-api-sqlboiler-rest-auth/internal/cookie"
 	"sandbox-go-api-sqlboiler-rest-auth/models"
 	"time"
 
@@ -28,13 +29,13 @@ func SessionRestorer(db *sql.DB, logger *zap.SugaredLogger, sc *securecookie.Sec
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
 			cc := c.(*CustomContext)
-			cv, err := c.Cookie("session")
+			cv, err := c.Cookie(cookie.SessionCookieKeyName)
 			if err != nil {
 				return next(c)
 			}
 
 			var dv string
-			err = sc.Decode("session", cv.Value, &dv)
+			err = sc.Decode(cookie.SecureCookieSessionKeyName, cv.Value, &dv)
 			if err != nil {
 				return echo.NewHTTPError(500, "cannot decode cookie", err)
 			}

internal/server/server.go

@@ -6,14 +6,14 @@ import (
 	"io/ioutil"
 	"log"
 	"sandbox-go-api-sqlboiler-rest-auth/internal/config"
-	"sandbox-go-api-sqlboiler-rest-auth/internal/scookie"
+	"sandbox-go-api-sqlboiler-rest-auth/internal/cookie"
 
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 )
 
 func NewServer(cfg *config.Config, db *sql.DB, l *zap.Logger) *echo.Echo {
-	sc := scookie.NewSecureCookie(cfg)
+	sc := cookie.NewSecureCookie(cfg)
 	e := echo.New()
 	e.HideBanner = true
 	e.Debug = cfg.IsDev