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,38 @@
+package steam
+
+import (
+	"net/http"
+	"strings"
+
+	"reverse-watch/domain/models"
+	"reverse-watch/errors"
+	"reverse-watch/middleware"
+	"reverse-watch/render"
+	steamservice "reverse-watch/service/steam"
+)
+
+type resolveSteamIDResponse struct {
+	SteamID models.SteamID `json:"steam_id"`
+}
+
+func resolveSteamID(w http.ResponseWriter, r *http.Request) {
+	steamSvc, ok := r.Context().Value(middleware.SteamServiceContextKey).(*steamservice.Service)
+	if !ok || steamSvc == nil {
+		render.Errorf(w, r, errors.InternalServerError, "steam service not configured")
+		return
+	}
+
+	raw := strings.TrimSpace(r.URL.Query().Get("vanityUrl"))
+	if raw == "" {
+		render.Errorf(w, r, errors.BadRequest, "missing vanityUrl")
+		return
+	}
+
+	id, err := steamSvc.ResolveSteamID(r.Context(), raw)
+	if err != nil {
+		render.Error(w, r, err)
+		return
+	}
+
+	render.JSON(w, r, &resolveSteamIDResponse{SteamID: *id})
+}

api/v1/steam/router.go

@@ -0,0 +1,15 @@
+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-vanity", 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,54 +19,39 @@ type fetchUserStatusResponse struct {
 	LastReversalTimestamp *uint64        `json:"last_reversal_timestamp,omitempty"`
 }
 
-func fetchUserStatus(steamWebAPIKey string) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		factory := r.Context().Value(middleware.FactoryContextKey).(repository.Factory)
+func fetchUserStatus(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)
-		}
-		if err != nil {
-			render.Errorf(w, r, errors.BadRequest, "invalid steam id")
-			return
-		}
+	steamIdStr := chi.URLParam(r, "steamId")
+	steamId, err := models.ToSteamID(steamIdStr)
+	if err != nil {
+		render.Errorf(w, r, errors.BadRequest, "invalid steam id")
+		return
+	}
 
-		reversals, err := factory.Reversal().List(&dto.ReversalListOptions{
-			SteamID:    steamId,
-			OrderParam: &dto.OrderParam{Column: "id", Direction: dto.DESC},
-		})
-		if err != nil {
-			render.Errorf(w, r, errors.InternalServerError, "failed to list reversals for steam id %q", steamId)
-			return
-		}
+	reversals, err := factory.Reversal().List(&dto.ReversalListOptions{
+		SteamID:    steamId,
+		OrderParam: &dto.OrderParam{Column: "id", Direction: dto.DESC},
+	})
+	if err != nil {
+		render.Errorf(w, r, errors.InternalServerError, "failed to list reversals for steam id %q", steamId)
+		return
+	}
 
-		data := &fetchUserStatusResponse{
-			SteamID: *steamId,
-		}
+	data := &fetchUserStatusResponse{
+		SteamID: *steamId,
+	}
 
-		var lastReversalTime uint64
-		for _, reversal := range reversals {
-			lastReversalTime = max(lastReversalTime, reversal.ReversedAt)
-			if reversal.ExpungedAt == nil {
-				data.HasReversed = true
-				break
-			}
+	var lastReversalTime uint64
+	for _, reversal := range reversals {
+		lastReversalTime = max(lastReversalTime, reversal.ReversedAt)
+		if reversal.ExpungedAt == nil {
+			data.HasReversed = true
+			break
 		}
-		if data.HasReversed {
-			data.LastReversalTimestamp = &lastReversalTime
-		}
-		render.JSON(w, r, data)
 	}
+	if data.HasReversed {
+		data.LastReversalTimestamp = &lastReversalTime
+	}
+	render.JSON(w, r, data)
 }

api/v1/users/users_test.go

@@ -444,7 +444,7 @@ func TestFetchUserStatus(t *testing.T) {
 			}
 
 			factoryMiddleware := middleware.FactoryMiddleware(f)
-			handler := fetchUserStatus("")
+			handler := http.HandlerFunc(fetchUserStatus)
 
 			finalHandler := factoryMiddleware(handler)
 

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": ""
+        "WebAPIKeys": ["api-key-1", "api-key-2"]
     }
 }

config/config.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"reverse-watch/domain/models/constants"
+	"reverse-watch/util"
 
 	"github.com/go-viper/mapstructure/v2"
 	"github.com/spf13/viper"
@@ -41,10 +42,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.WebAPIKeys is optional. If set, /api/v1/steam/resolve-vanity can use the Steam Web API
+	// (keys are rotated) instead of any fallback resolution.
 	Steam struct {
-		WebAPIKey string
+		WebAPIKeys *util.Ring[string]
 	}
 }
 
@@ -69,6 +70,34 @@ func load() Config {
 				return nil, fmt.Errorf("invalid environment")
 			}
 		},
+		func(from reflect.Value, to reflect.Value) (interface{}, error) {
+			ringType := reflect.TypeOf(&util.Ring[string]{})
+			if to.Type() != ringType {
+				return from.Interface(), nil
+			}
+
+			keys := make([]string, 0)
+			switch from.Kind() {
+			case reflect.String:
+				for _, part := range strings.Split(from.String(), ",") {
+					part = strings.TrimSpace(part)
+					if part != "" {
+						keys = append(keys, part)
+					}
+				}
+			case reflect.Slice, reflect.Array:
+				for i := 0; i < from.Len(); i++ {
+					val := strings.TrimSpace(fmt.Sprint(from.Index(i).Interface()))
+					if val != "" {
+						keys = append(keys, val)
+					}
+				}
+			default:
+				return util.NewRing[string](nil), nil
+			}
+
+			return util.NewRing(keys), nil
+		},
 	))
 
 	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
@@ -91,7 +120,7 @@ func load() Config {
 	// Need to register environment variables if defaults aren't set
 	v.BindEnv("HTTP.AllowedOrigins")
 	v.BindEnv("Ingestors.CSFloat.SecretKey")
-	v.BindEnv("Steam.WebAPIKey")
+	v.BindEnv("Steam.WebAPIKeys")
 
 	// Try to find the root directory, but don't panic if it fails since go.mod doesn't exist in production
 	dir, err := GetProjectRootDir()