session is optional and may be omitted if not provided

Signed-off-by: timedout <git@nexy7574.co.uk>

Author: timedoutuk

client/auth.go

@@ -118,15 +118,15 @@ func (c *CSAPI) RegisterUser(t ct.TestLike, localpart, password string) (userID,
 		ct.Fatalf(t, "unable to read response body: %v", err)
 	}
 	session := GetJSONFieldStr(t, body, "session")
-	if session == "" {
-		ct.Fatalf(t, "uia challenge did not include a session")
-	}
 
 	// Now actually register the user
 	reqBody["auth"] = map[string]any{
 		"session": session,
 		"type":    "m.login.dummy",
 	}
+	if session == "" {
+		delete(reqBody["auth"].(map[string]any), "session")
+	}
 	res = c.MustDo(t, "POST", []string{"_matrix", "client", "v3", "register"}, WithJSONBody(t, reqBody))
 	body, err = io.ReadAll(res.Body)
 	if err != nil {

tests/csapi/apidoc_register_test.go

@@ -344,9 +344,9 @@ func startUIASession(t *testing.T, c *client.CSAPI, user, pass string, extra map
 		t.Fatal(err)
 	}
 	session := client.GetJSONFieldStr(t, body, "session")
+	reqBody["auth"] = map[string]string{"session": session, "type": "m.login.dummy"}
 	if session == "" {
-		t.Fatal("expected non-empty `session` in uia challenge")
+		delete(reqBody["auth"].(map[string]any), "session")
 	}
-	reqBody["auth"] = map[string]string{"session": session, "type": "m.login.dummy"}
 	return reqBody, session
 }