Fix AS registration tests

src/github.com/matrix-org/dendrite/clientapi/routing/register.go

@@ -369,7 +369,6 @@ func UsernameMatchesExclusiveNamespaces(
 // two requirements are met, no error will be returned.
 func validateApplicationService(
 	cfg *config.Dendrite,
-	req *http.Request,
 	username string,
 	accessToken string,
 ) (string, *util.JSONResponse) {
@@ -558,7 +557,7 @@ func handleRegistrationFlow(
 			// Check application service register user request is valid.
 			// The application service's ID is returned if so.
 			appserviceID, err := validateApplicationService(
-				cfg, req, r.Username, accessToken,
+				cfg, r.Username, accessToken,
 			)
 			if err != nil {
 				return *err

src/github.com/matrix-org/dendrite/clientapi/routing/register_test.go

@@ -15,8 +15,6 @@
 package routing
 
 import (
-	"net/http"
-	"net/url"
 	"regexp"
 	"testing"
 
@@ -186,47 +184,26 @@ func TestValidationOfApplicationServices(t *testing.T) {
 	fakeConfig.Derived.ApplicationServices = []config.ApplicationService{fakeApplicationService}
 
 	// Access token is correct, user_id omitted so we are acting as SenderLocalpart
-	URL, _ := url.Parse("http://localhost/register?access_token=1234")
+	asID, resp := validateApplicationService(&fakeConfig, fakeSenderLocalpart, "1234")
-	fakeHTTPRequest := http.Request{
-		Method: "POST",
-		URL:    URL,
-	}
-	asID, resp := validateApplicationService(&fakeConfig, &fakeHTTPRequest, fakeSenderLocalpart)
 	if resp != nil || asID != fakeID {
 		t.Errorf("appservice should have validated and returned correct ID: %s", resp.JSON)
 	}
 
 	// Access token is incorrect, user_id omitted so we are acting as SenderLocalpart
-	URL, _ = url.Parse("http://localhost/register?access_token=xxxx")
+	asID, resp = validateApplicationService(&fakeConfig, fakeSenderLocalpart, "xxxx")
-	fakeHTTPRequest = http.Request{
-		Method: "POST",
-		URL:    URL,
-	}
-	asID, resp = validateApplicationService(&fakeConfig, &fakeHTTPRequest, fakeSenderLocalpart)
 	if resp == nil || asID == fakeID {
 		t.Errorf("access_token should have been marked as invalid")
 	}
 
 	// Access token is correct, acting as valid user_id
-	URL, _ = url.Parse("http://localhost/register?access_token=1234&user_id=@_appservice_bob:localhost")
+	asID, resp = validateApplicationService(&fakeConfig, "_appservice_bob", "1234")
-	fakeHTTPRequest = http.Request{
-		Method: "POST",
-		URL:    URL,
-	}
-	asID, resp = validateApplicationService(&fakeConfig, &fakeHTTPRequest, "_appservice_bob")
 	if resp != nil || asID != fakeID {
 		t.Errorf("access_token and user_id should've been valid: %s", resp.JSON)
 	}
 
 	// Access token is correct, acting as invalid user_id
-	URL, _ = url.Parse("http://localhost/register?access_token=1234&user_id=@_something_else:localhost")
+	asID, resp = validateApplicationService(&fakeConfig, "_something_else", "1234")
-	fakeHTTPRequest = http.Request{
-		Method: "POST",
-		URL:    URL,
-	}
-	asID, resp = validateApplicationService(&fakeConfig, &fakeHTTPRequest, "_something_else")
 	if resp == nil || asID == fakeID {
-		t.Errorf("user_id should not have been valid: %s",
+		t.Errorf("user_id should not have been valid: @_something_else:localhost")
-			fakeHTTPRequest.URL.Query().Get("user_id"))
 	}
 }