change oauth package to improve readability and ensure individual res…

…ponsibility
marcopollivier · Jan 29, 2024 · edf0075 · edf0075
1 parent f60736d
commit edf0075
Show file tree

Hide file tree

Showing 17 changed files with 496 additions and 395 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -14,6 +14,7 @@ import (
 	"github.com/marcopollivier/techagenda/lib/ssr"
 	"github.com/marcopollivier/techagenda/pkg/event"
 	"github.com/marcopollivier/techagenda/pkg/lending"
+	"github.com/marcopollivier/techagenda/pkg/oauth"
 	"github.com/marcopollivier/techagenda/pkg/static"
 	"github.com/marcopollivier/techagenda/pkg/user"
 )
@@ -27,12 +28,13 @@ var rootCmd = &cobra.Command{
 		fx.New(
 			fx.Provide(database.NewDB),
 			fx.Provide(server.NewHTTPServer),
+			oauth.Module(),
 			ssr.Module(),
-			static.Module(),
 			user.Module(),
 			event.Module(),
-			// attendee.Module(),
+
 			lending.Module(),
+			static.Module(),
 		).Run()
 	},
 }

diff --git a/migrations/20240113234311_create_user_table.go b/migrations/20240113234311_create_user_table.go
@@ -27,10 +27,10 @@ func upCreateUsersTable(ctx context.Context, tx *sql.Tx) error {
 			created_at TIMESTAMP DEFAULT now(),
 			updated_at TIMESTAMP DEFAULT now(),
 			deleted_at TIMESTAMP,
-		
+
 			UNIQUE(email)
 		);
-		
+
 		CREATE INDEX idx_users_role on users (role);
 	`); err != nil {
 		return err
@@ -39,16 +39,16 @@ func upCreateUsersTable(ctx context.Context, tx *sql.Tx) error {
 	// OAuth table
 	if _, err := tx.ExecContext(ctx, `
 		CREATE TYPE provider AS ENUM ('github');
-		
+
 		CREATE TABLE IF NOT EXISTS oauths (
 			id         BIGSERIAL PRIMARY KEY,
-			user_id	   BIGINT NOT NULL,
+			user_id	   BIGINT NOT NULL REFERENCES users(id),
 			provider   PROVIDER NOT NULL,
 			identifier TEXT NOT NULL,
 			created_at TIMESTAMP DEFAULT now(),
 			updated_at TIMESTAMP DEFAULT now(),
 			deleted_at TIMESTAMP,
-			
+
 			CONSTRAINT fk_oauths_user_id FOREIGN KEY (user_id) REFERENCES users(id),
 			UNIQUE(user_id, provider, identifier)
 		);

diff --git a/pkg/event/model_enum.go b/pkg/event/model_enum.go
diff --git a/pkg/lending/handler.go b/pkg/lending/handler.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/marcopollivier/techagenda/lib/ssr"
 	"github.com/marcopollivier/techagenda/pkg/event"
-	"github.com/marcopollivier/techagenda/pkg/user"
+	"github.com/marcopollivier/techagenda/pkg/oauth"
 )
 
 type QueryParams struct {
@@ -45,7 +45,7 @@ func NewLendingHandler(server *echo.Echo, eventService event.Service, engine *ss
 			},
 			Props: &ssr.Props{
 				Events: events,
-				User:   user.GetUserFromCtx(ctx),
+				User:   oauth.GetUserFromCtx(ctx),
 			},
 		})
 		return c.HTML(http.StatusOK, string(page))

diff --git a/pkg/oauth/fx.go b/pkg/oauth/fx.go
@@ -0,0 +1,11 @@
+package oauth
+
+import "go.uber.org/fx"
+
+func Module() fx.Option {
+	return fx.Module("oauth",
+		fx.Provide(NewOAuthService),
+		fx.Provide(NewOAuthHandler),
+		fx.Invoke(SetOAuthAPIRoutes),
+	)
+}
diff --git a/pkg/user/handler_oauth.go → pkg/oauth/handler.go b/pkg/user/handler_oauth.go → pkg/oauth/handler.go
@@ -1,4 +1,4 @@
-package user
+package oauth
 
 import (
 	"fmt"
@@ -8,22 +8,31 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/marcopollivier/techagenda/lib/server"
 	"github.com/marcopollivier/techagenda/lib/session"
+	"github.com/marcopollivier/techagenda/pkg/user"
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/gothic"
 	"github.com/samber/lo"
 )
 
-func (h *UserHandler) AuthLogin(c echo.Context) (err error) {
+type OAuthHandler struct {
+	service Service
+}
+
+func NewOAuthHandler(service Service) *OAuthHandler {
+	return &OAuthHandler{service: service}
+}
+
+func (h *OAuthHandler) AuthLogin(c echo.Context) (err error) {
 	var (
 		ctx      = c.Request().Context()
 		res      = c.Response()
 		req      = c.Request()
 		authUser goth.User
-		userData User
+		userData user.User
 		token    string
 	)
 
-	if _, ok := c.Request().Context().Value(MiddlewareUserKey).(User); ok {
+	if _, ok := c.Request().Context().Value(MiddlewareUserKey).(user.User); ok {
 		res.Header().Set("Location", getReferer(req))
 		res.WriteHeader(http.StatusTemporaryRedirect)
 		return
@@ -55,7 +64,7 @@ func (h *UserHandler) AuthLogin(c echo.Context) (err error) {
 	return
 }
 
-func (h *UserHandler) AuthLogout(c echo.Context) (err error) {
+func (h *OAuthHandler) AuthLogout(c echo.Context) (err error) {
 	var (
 		res = c.Response()
 		req = c.Request()
@@ -73,18 +82,18 @@ func (h *UserHandler) AuthLogout(c echo.Context) (err error) {
 	return
 }
 
-func (h *UserHandler) AuthCallback(c echo.Context) (err error) {
+func (h *OAuthHandler) AuthCallback(c echo.Context) (err error) {
 	var (
 		ctx      = c.Request().Context()
 		res      = c.Response()
 		req      = c.Request()
 		authUser goth.User
-		userData User
+		userData user.User
 		token    string
 		provider string
 	)
 
-	if _, ok := c.Request().Context().Value(MiddlewareUserKey).(User); ok {
+	if _, ok := c.Request().Context().Value(MiddlewareUserKey).(user.User); ok {
 		res.Header().Set("Location", getReferer(req))
 		res.WriteHeader(http.StatusTemporaryRedirect)
 		return

diff --git a/pkg/user/middleware.go → pkg/oauth/middleware.go b/pkg/user/middleware.go → pkg/oauth/middleware.go
@@ -1,11 +1,12 @@
-package user
+package oauth
 
 import (
 	"context"
 	"log/slog"
 
 	"github.com/labstack/echo/v4"
 	"github.com/marcopollivier/techagenda/lib/session"
+	"github.com/marcopollivier/techagenda/pkg/user"
 )
 
 type MiddlewareCtxKey string
@@ -19,7 +20,7 @@ func AuthMiddleware(service Service) echo.MiddlewareFunc {
 		return func(c echo.Context) (err error) {
 			var (
 				ctx         = c.Request().Context()
-				user        User
+				user        user.User
 				req         = c.Request()
 				res         = c.Response()
 				userSession session.UserSession
@@ -38,9 +39,9 @@ func AuthMiddleware(service Service) echo.MiddlewareFunc {
 	}
 }
 
-func GetUserFromCtx(ctx context.Context) *User {
-	var userPtr *User
-	if userData, ok := ctx.Value(MiddlewareUserKey).(User); ok {
+func GetUserFromCtx(ctx context.Context) *user.User {
+	var userPtr *user.User
+	if userData, ok := ctx.Value(MiddlewareUserKey).(user.User); ok {
 		userPtr = &userData
 	}
 	return userPtr

diff --git a/pkg/oauth/oauth.go b/pkg/oauth/oauth.go
@@ -0,0 +1,19 @@
+package oauth
+
+import (
+	"gorm.io/gorm"
+)
+
+//go:generate go-enum --marshal --sql -f oauth.go
+
+type OAuth struct {
+	gorm.Model
+	UserID     uint
+	Provider   Provider
+	Identifier string
+}
+
+func (OAuth) TableName() string { return "oauths" }
+
+// ENUM(github)
+type Provider int
diff --git a/pkg/oauth/oauth_enum.go b/pkg/oauth/oauth_enum.go
diff --git a/pkg/user/oauth_providers.go → pkg/oauth/providers.go b/pkg/user/oauth_providers.go → pkg/oauth/providers.go
@@ -1,4 +1,4 @@
-package user
+package oauth
 
 import (
 	"fmt"

diff --git a/pkg/oauth/router.go b/pkg/oauth/router.go
@@ -0,0 +1,13 @@
+package oauth
+
+import "github.com/labstack/echo/v4"
+
+func SetOAuthAPIRoutes(server *echo.Echo, handler *OAuthHandler) {
+	registerProviders()
+	server.Use(AuthMiddleware(handler.service))
+	auth := server.Group("/auth")
+
+	auth.GET("", handler.AuthLogin)
+	auth.GET("/logout", handler.AuthLogout)
+	auth.GET("/callback", handler.AuthCallback)
+}