From d6d0bf1b4c18004a1ab239465f7d2330f853f6a0 Mon Sep 17 00:00:00 2001
From: Angel Beltran <beltranbeaverdam@gmail.com>
Date: Sat, 24 Jan 2026 12:47:54 -0700
Subject: [PATCH] cleaned up webhooks package

---
 internal/server/api/webhooks/etsy/webhooks.go   |  6 +++---
 internal/server/api/webhooks/tiktok/webhooks.go |  2 +-
 internal/server/api/webhooks/webhooks.go        |  8 ++++----
 internal/server/api/webhooks/wix/webhooks.go    |  2 +-
 internal/server/server.go                       | 10 ++++------
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/internal/server/api/webhooks/etsy/webhooks.go b/internal/server/api/webhooks/etsy/webhooks.go
index ea2406a..912c7ba 100644
--- a/internal/server/api/webhooks/etsy/webhooks.go
+++ b/internal/server/api/webhooks/etsy/webhooks.go
@@ -20,7 +20,7 @@ type (
 	}
 )
 
-func Webhooks(
+func Routes(
 	r *gin.RouterGroup,
 	logger *logging.Logger,
 	db *raw_events.Store,
@@ -38,7 +38,7 @@ func Webhooks(
 
 	r.GET(h.cfg.OAuthRedirectURIWithAcctIDParam, response.Handler(h.redirectURI))
 
-	r.GET("/{acctID}/new-account-link", response.Handler(h.newAccountLink))
+	r.GET("/:acctID/new-account-link", response.Handler(h.newAccountLink))
 }
 
 type (
@@ -134,7 +134,7 @@ func (h webhooks) redirectURI(c *gin.Context) (response.Response, error) {
 	return response.SeeOther(fmt.Sprintf("/accounts/%d", acctID)), nil
 }
 
-// GET /{acctID}/new-account-link
+// GET /:acctID/new-account-link
 func (h webhooks) newAccountLink(c *gin.Context) (response.Response, error) {
 	r := c.Request
 	acctIDStr := c.Param("acctID")
diff --git a/internal/server/api/webhooks/tiktok/webhooks.go b/internal/server/api/webhooks/tiktok/webhooks.go
index 6b98982..112223f 100644
--- a/internal/server/api/webhooks/tiktok/webhooks.go
+++ b/internal/server/api/webhooks/tiktok/webhooks.go
@@ -12,7 +12,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Webhooks(
+func Routes(
 	r *gin.RouterGroup,
 	logger *logging.Logger,
 	db *raw_events.Store,
diff --git a/internal/server/api/webhooks/webhooks.go b/internal/server/api/webhooks/webhooks.go
index 6d7ffae..b165fae 100644
--- a/internal/server/api/webhooks/webhooks.go
+++ b/internal/server/api/webhooks/webhooks.go
@@ -15,26 +15,26 @@ type Config struct {
 	Etsy etsy.Config
 }
 
-func Webhooks(
+func Routes(
 	r *gin.RouterGroup,
 	logger *logging.Logger,
 	eventsDB *raw_events.Store,
 	etsyPlatform *etsy_platform.Platform,
 	cfg Config,
 ) {
-	etsy.Webhooks(
+	etsy.Routes(
 		r.Group("/etsy"),
 		logger.WithGroup("etsy"),
 		eventsDB,
 		etsyPlatform,
 		cfg.Etsy,
 	)
-	tiktok.Webhooks(
+	tiktok.Routes(
 		r.Group("/tiktok"),
 		logger.WithGroup("tiktok"),
 		eventsDB,
 	)
-	wix.Webhooks(
+	wix.Routes(
 		r.Group("/wix"),
 		logger.WithGroup("wix"),
 		eventsDB,
diff --git a/internal/server/api/webhooks/wix/webhooks.go b/internal/server/api/webhooks/wix/webhooks.go
index f432b6f..64225e9 100644
--- a/internal/server/api/webhooks/wix/webhooks.go
+++ b/internal/server/api/webhooks/wix/webhooks.go
@@ -12,7 +12,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Webhooks(
+func Routes(
 	r *gin.RouterGroup,
 	logger *logging.Logger,
 	db *raw_events.Store,
diff --git a/internal/server/server.go b/internal/server/server.go
index 71950de..d435638 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -94,6 +94,7 @@ func NewRouter(
 		sq,
 	).Trim("/api")
 
+	// TODO: group these into a single unifieds 'apis' object/package?
 	auth_api.Routes(
 		api.Group("/auth"),
 		apiLogger.WithGroup("/auth"),
@@ -110,17 +111,14 @@ func NewRouter(
 		accts,
 		unp.Group("/accounts"),
 	)
-
-	// api webhooks (TODO: make a router for these)
-
-	webhooks.Webhooks(
+	webhooks.Routes(
 		api.Group("/webhooks"),
-		logger.WithGroup("webhooks"),
+		apiLogger.WithGroup("/webhooks"),
 		rawEvents,
 		etsy,
 		webhooks.Config{
 			Etsy: etsy_webhooks.Config{
-				OAuthRedirectURIWithAcctIDParam: "/oauth/account/{acctID}/auth_code",
+				OAuthRedirectURIWithAcctIDParam: "/oauth/accounts/:acctID/auth_code",
 			},
 		},
 	)