modified handler to call options.JSessionID for /info endpoint

igm · May 24, 2020 · 24280f9 · 24280f9
1 parent ca7b4da
commit 24280f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/v3/sockjs/handler.go b/v3/sockjs/handler.go
@@ -38,7 +38,7 @@ func NewHandler(prefix string, opts Options, handlerFunc func(Session)) *Handler
 	h.mappings = []*mapping{
 		newMapping("GET", "^[/]?$", welcomeHandler),
 		newMapping("OPTIONS", "^/info$", opts.cookie, xhrCors, cacheFor, opts.info),
-		newMapping("GET", "^/info$", xhrCors, noCache, opts.info),
+		newMapping("GET", "^/info$", opts.cookie, xhrCors, noCache, opts.info),
 		// XHR
 		newMapping("POST", sessionPrefix+"/xhr_send$", opts.cookie, xhrCors, noCache, h.xhrSend),
 		newMapping("OPTIONS", sessionPrefix+"/xhr_send$", opts.cookie, xhrCors, cacheFor, xhrOptions),

diff --git a/v3/sockjs/handler_test.go b/v3/sockjs/handler_test.go
@@ -45,7 +45,12 @@ func TestHandler_Create(t *testing.T) {
 }
 
 func TestHandler_RootPrefixInfoHandler(t *testing.T) {
-	handler := NewHandler("", testOptions, nil)
+	infoOptions := testOptions
+	jSessionCalled := false
+	infoOptions.JSessionID = func(writer http.ResponseWriter, request *http.Request) {
+		jSessionCalled = true
+	}
+	handler := NewHandler("", infoOptions, nil)
 	if handler.Prefix() != "" {
 		t.Errorf("Prefix not properly set, got '%s' expected '%s'", handler.Prefix(), "")
 	}
@@ -66,6 +71,7 @@ func TestHandler_RootPrefixInfoHandler(t *testing.T) {
 		t.Errorf("Unexpected status code receiver, got '%d' expected '%d'", resp.StatusCode, http.StatusOK)
 		t.FailNow()
 	}
+	assert.True(t, jSessionCalled)
 	infoData, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		t.Errorf("Error reading body: '%v'", err)