Added auth to the container.

auth/auth.go

@@ -3,6 +3,10 @@ package auth
 import (
 	"errors"
 
+	"goweb/config"
+	"goweb/ent"
+	"goweb/ent/user"
+
 	"github.com/labstack/echo-contrib/session"
 	"github.com/labstack/echo/v4"
 	"golang.org/x/crypto/bcrypt"
@@ -14,28 +18,39 @@ const (
 	sessionKeyAuthenticated = "authenticated"
 )
 
-func Login(c echo.Context, userID int) error {
-	sess, err := session.Get(sessionName, c)
+type Client struct {
+	config *config.Config
+	orm    *ent.Client
+}
+
+func NewClient(cfg *config.Config, orm *ent.Client) *Client {
+	return &Client{
+		config: cfg,
+		orm:    orm,
+	}
+}
+
+func (c *Client) Login(ctx echo.Context, userID int) error {
+	sess, err := session.Get(sessionName, ctx)
 	if err != nil {
 		return err
 	}
 	sess.Values[sessionKeyUserID] = userID
 	sess.Values[sessionKeyAuthenticated] = true
-	// TODO: max age?
-	return sess.Save(c.Request(), c.Response())
+	return sess.Save(ctx.Request(), ctx.Response())
 }
 
-func Logout(c echo.Context) error {
-	sess, err := session.Get(sessionName, c)
+func (c *Client) Logout(ctx echo.Context) error {
+	sess, err := session.Get(sessionName, ctx)
 	if err != nil {
 		return err
 	}
 	sess.Values[sessionKeyAuthenticated] = false
-	return sess.Save(c.Request(), c.Response())
+	return sess.Save(ctx.Request(), ctx.Response())
 }
 
-func GetUserID(c echo.Context) (int, error) {
-	sess, err := session.Get(sessionName, c)
+func (c *Client) GetAuthenticatedUserID(ctx echo.Context) (int, error) {
+	sess, err := session.Get(sessionName, ctx)
 	if err != nil {
 		return 0, err
 	}
@@ -47,7 +62,17 @@ func GetUserID(c echo.Context) (int, error) {
 	return 0, errors.New("user not authenticated")
 }
 
-func HashPassword(password string) (string, error) {
+func (c *Client) GetAuthenticatedUser(ctx echo.Context) (*ent.User, error) {
+	if userID, err := c.GetAuthenticatedUserID(ctx); err == nil {
+		return c.orm.User.Query().
+			Where(user.ID(userID)).
+			First(ctx.Request().Context())
+	}
+
+	return nil, errors.New("user not authenticated")
+}
+
+func (c *Client) HashPassword(password string) (string, error) {
 	hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
 	if err != nil {
 		return "", err
@@ -55,6 +80,6 @@ func HashPassword(password string) (string, error) {
 	return string(hash), nil
 }
 
-func CheckPassword(password, hash string) error {
+func (c *Client) CheckPassword(password, hash string) error {
 	return bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
 }