Addressing comments

Author: emihai-dev

api/api.go

@@ -6,8 +6,8 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-func Router(steamWebAPIKey string) chi.Router {
+func Router() chi.Router {
 	r := chi.NewRouter()
-	r.Mount("/v1", v1.Router(steamWebAPIKey))
+	r.Mount("/v1", v1.Router())
 	return r
 }

api/v1/steam/resolve.go

@@ -0,0 +1,44 @@
+package steam
+
+import (
+	"net/http"
+	"strings"
+
+	"reverse-watch/domain/models"
+	"reverse-watch/errors"
+	"reverse-watch/middleware"
+	"reverse-watch/render"
+)
+
+type resolveSteamIDResponse struct {
+	SteamID models.SteamID `json:"steam_id"`
+}
+
+func resolveSteamID() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		svc, ok := middleware.SteamServiceFromContext(r.Context())
+		if !ok || svc == nil {
+			render.Errorf(w, r, errors.InternalServerError, "steam service not configured")
+			return
+		}
+
+		raw := strings.TrimSpace(r.URL.Query().Get("input"))
+		if raw == "" {
+			// Backwards-compatible alias in case the caller uses a different name.
+			raw = strings.TrimSpace(r.URL.Query().Get("steam"))
+		}
+		if raw == "" {
+			render.Errorf(w, r, errors.BadRequest, "missing input")
+			return
+		}
+
+		id, err := svc.ResolveSteamID(r.Context(), raw)
+		if err != nil {
+			render.Errorf(w, r, errors.BadRequest, "could not resolve steam id")
+			return
+		}
+
+		render.JSON(w, r, &resolveSteamIDResponse{SteamID: *id})
+	}
+}
+

api/v1/steam/router.go

@@ -0,0 +1,16 @@
+package steam
+
+import (
+	"time"
+
+	"reverse-watch/ratelimit"
+
+	"github.com/go-chi/chi/v5"
+)
+
+func Router() chi.Router {
+	r := chi.NewRouter()
+	r.With(ratelimit.ThrottleByIP(time.Minute, 100)).Get("/resolve", resolveSteamID())
+	return r
+}
+

api/v1/users/router.go

@@ -8,8 +8,8 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-func Router(steamWebAPIKey string) chi.Router {
+func Router() chi.Router {
 	r := chi.NewRouter()
-	r.With(ratelimit.ThrottleByIP(time.Minute, 100)).Get("/{steamId}", fetchUserStatus(steamWebAPIKey))
+	r.With(ratelimit.ThrottleByIP(time.Minute, 100)).Get("/{steamId}", fetchUserStatus())
 	return r
 }

api/v1/users/users.go

@@ -1,10 +1,7 @@
 package users
 
 import (
-	"context"
 	"net/http"
-	"strings"
-	"time"
 
 	"reverse-watch/domain/dto"
 	"reverse-watch/domain/models"
@@ -22,25 +19,12 @@ type fetchUserStatusResponse struct {
 	LastReversalTimestamp *uint64        `json:"last_reversal_timestamp,omitempty"`
 }
 
-func fetchUserStatus(steamWebAPIKey string) http.HandlerFunc {
+func fetchUserStatus() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		factory := r.Context().Value(middleware.FactoryContextKey).(repository.Factory)
 
 		steamIdStr := chi.URLParam(r, "steamId")
-		client := &http.Client{Timeout: 15 * time.Second}
-		ctx, cancel := context.WithTimeout(r.Context(), 15*time.Second)
-		defer cancel()
-
-		var steamId *models.SteamID
-		var err error
-		if strings.TrimSpace(steamWebAPIKey) != "" {
-			steamId, err = models.ParseSteamUserInputWithOpts(ctx, client, steamIdStr, &models.SteamUserInputOpts{
-				UseWebAPIForVanity: true,
-				SteamWebAPIKey:     steamWebAPIKey,
-			})
-		} else {
-			steamId, err = models.ParseSteamUserInput(ctx, client, steamIdStr)
-		}
+		steamId, err := models.ToSteamID(steamIdStr)
 		if err != nil {
 			render.Errorf(w, r, errors.BadRequest, "invalid steam id")
 			return

api/v1/v1.go

@@ -5,17 +5,19 @@ import (
 	"reverse-watch/api/v1/health"
 	"reverse-watch/api/v1/marketplace"
 	"reverse-watch/api/v1/reversals"
+	"reverse-watch/api/v1/steam"
 	"reverse-watch/api/v1/users"
 
 	"github.com/go-chi/chi/v5"
 )
 
-func Router(steamWebAPIKey string) chi.Router {
+func Router() chi.Router {
 	r := chi.NewRouter()
 	r.Mount("/health", health.Router())
 	r.Mount("/marketplace", marketplace.Router())
 	r.Mount("/reversals", reversals.Router())
-	r.Mount("/users", users.Router(steamWebAPIKey))
+	r.Mount("/users", users.Router())
+	r.Mount("/steam", steam.Router())
 	r.Mount("/admin", admin.Router())
 	return r
 }

config.example.json

@@ -13,6 +13,6 @@
     },
     "Environment": "development",
     "Steam": {
-        "WebAPIKey": ""
+        "WebAPIKey": [""]
     }
 }

config/config.go

@@ -41,10 +41,10 @@ type Config struct {
 		}
 	}
 
-	// Steam.WebAPIKey is optional. If set, /api/v1/users resolves /id/{vanity} via the Web API
-	// instead of the default ?xml=1 request to the community site.
+	// Steam.WebAPIKey is optional. If set, /api/v1/steam/resolve can use the Steam Web API
+	// (keys are rotated) instead of the default ?xml=1 request to the community site.
 	Steam struct {
-		WebAPIKey string
+		WebAPIKey []string
 	}
 }