pass accountID

proxy/internal/proxy/context.go

@@ -28,6 +28,13 @@ func (c *CapturedData) SetServiceId(serviceId string) {
 	c.ServiceId = serviceId
 }
 
+// GetServiceId safely gets the service ID
+func (c *CapturedData) GetServiceId() string {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+	return c.ServiceId
+}
+
 // SetAccountId safely sets the account ID
 func (c *CapturedData) SetAccountId(accountId string) {
 	c.mu.Lock()
@@ -35,6 +42,13 @@ func (c *CapturedData) SetAccountId(accountId string) {
 	c.AccountId = accountId
 }
 
+// GetAccountId safely gets the account ID
+func (c *CapturedData) GetAccountId() string {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+	return c.AccountId
+}
+
 // WithCapturedData adds a CapturedData struct to the context
 func WithCapturedData(ctx context.Context, data *CapturedData) context.Context {
 	return context.WithValue(ctx, capturedDataKey, data)

proxy/internal/proxy/reverseproxy.go

@@ -39,6 +39,14 @@ func (p *ReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// Set the accountId in the context for later retrieval.
 	ctx = withAccountId(ctx, accountID)
 
+	// Also populate captured data if it exists (allows middleware to read after handler completes).
+	// This solves the problem of passing data UP the middleware chain: we put a mutable struct
+	// pointer in the context, and mutate the struct here so outer middleware can read it.
+	if capturedData := CapturedDataFromContext(ctx); capturedData != nil {
+		capturedData.SetServiceId(serviceId)
+		capturedData.SetAccountId(accountID)
+	}
+
 	// Set up a reverse proxy using the transport and then use it to serve the request.
 	proxy := httputil.NewSingleHostReverseProxy(target)
 	proxy.Transport = p.transport