fix URL paths when simulating client-side streaming endpoints

Author: eli-darkly

ldservices/streaming_service.go

@@ -20,10 +20,8 @@ const (
 	// MobileSDKStreamingBasePath is the expected request path for mobile SDK stream requests that
 	// use the REPORT method, or the base path (not including ClientSideOrMobileUserSubpath) for requests that
 	// use the GET method.
-	MobileSDKStreamingBasePath = "/meval"
-	// ClientSideOrMobileUserSubpath is a subpath added to client-side/mobile GET requests. The base64-encoded
-	// user data follows this.
-	ClientSideOrMobileUserSubpath = "/user/"
+	MobileSDKStreamingBasePath  = "/meval"
+	arbitraryPathComponentRegex = "/[^/]*"
 )
 
 // StreamingServiceHandler creates an HTTP handler that provides an SSE stream.
@@ -93,17 +91,17 @@ func ClientSideStreamingServiceHandler(
 	eventsCh <-chan eventsource.Event,
 ) (http.Handler, io.Closer) {
 	handler, closer := StreamingServiceHandler(initialEvent, eventsCh)
-	return httphelpers.HandlerForPath(
-		ClientSideSDKStreamingBasePath,
+	return httphelpers.HandlerForPathRegex(
+		"^"+ClientSideSDKStreamingBasePath+arbitraryPathComponentRegex+"$",
 		httphelpers.HandlerForMethod("REPORT", handler, nil),
 		httphelpers.HandlerForPathRegex(
-			"^"+ClientSideSDKStreamingBasePath+ClientSideOrMobileUserSubpath+".*",
+			"^"+ClientSideSDKStreamingBasePath+arbitraryPathComponentRegex+arbitraryPathComponentRegex+"$",
 			httphelpers.HandlerForMethod("GET", handler, nil),
 			httphelpers.HandlerForPath(
 				MobileSDKStreamingBasePath,
 				httphelpers.HandlerForMethod("REPORT", handler, nil),
 				httphelpers.HandlerForPathRegex(
-					"^"+MobileSDKStreamingBasePath+ClientSideOrMobileUserSubpath+".*",
+					"^"+MobileSDKStreamingBasePath+arbitraryPathComponentRegex+"$",
 					httphelpers.HandlerForMethod("GET", handler, nil),
 					nil,
 				),

ldservices/streaming_service_test.go

@@ -139,7 +139,7 @@ func TestClientSideStreamingEndpoint(t *testing.T) {
 	defer closer.Close()
 
 	httphelpers.WithServer(handler, func(server *httptest.Server) {
-		stream1, err := eventsource.SubscribeWithURL(server.URL + ClientSideSDKStreamingBasePath + "/user/00000")
+		stream1, err := eventsource.SubscribeWithURL(server.URL + ClientSideSDKStreamingBasePath + "/envxxx/userxxx")
 		require.NoError(t, err)
 		defer stream1.Close()
 
@@ -155,11 +155,11 @@ func TestClientSideStreamingEndpoint(t *testing.T) {
 		assert.Equal(t, event2.Event(), event3.Event())
 		assert.Equal(t, event2.Data(), event3.Data())
 
-		stream2, err := eventsource.SubscribeWithURL(server.URL + MobileSDKStreamingBasePath + "/user/00000")
+		stream2, err := eventsource.SubscribeWithURL(server.URL + MobileSDKStreamingBasePath + "/userxxx")
 		require.NoError(t, err)
 		stream2.Close()
 
-		req3, _ := http.NewRequest("REPORT", server.URL+ClientSideSDKStreamingBasePath, bytes.NewReader([]byte("{}")))
+		req3, _ := http.NewRequest("REPORT", server.URL+ClientSideSDKStreamingBasePath+"/envxxx", bytes.NewReader([]byte("{}")))
 		stream3, err := eventsource.SubscribeWithRequestAndOptions(req3)
 		require.NoError(t, err)
 		stream3.Close()