Remove legacy MSC2965 advertisment for Native-OIDC/MAS

charts/matrix-stack/templates/well-known/_helpers.tpl

@@ -51,14 +51,6 @@ k8s.element.io/target-instance: {{ $root.Release.Name }}-haproxy
 {{- $_ := set $config "m.homeserver" $mHomeserver -}}
 {{- end -}}
 {{- end -}}
-{{- if include "element-io.matrix-authentication-service.readyToHandleAuth" (dict "root" $root) }}
-{{- with required "WellKnownDelegation requires matrixAuthenticationService.ingress.host set" $root.Values.matrixAuthenticationService.ingress.host -}}
-{{- $msc2965 := dict "issuer" (printf "https://%s/" .)
-                     "account" (printf "https://%s/account" .)
--}}
-{{- $_ := set $config "org.matrix.msc2965.authentication" $msc2965 -}}
-{{- end -}}
-{{- end -}}
 {{- if $root.Values.matrixRTC.enabled -}}
 {{- $_ := set $config "org.matrix.msc4143.rtc_foci" (list (dict "type" "livekit" "livekit_service_url" (printf "https://%s" $root.Values.matrixRTC.ingress.host))) -}}
 {{- end -}}

newsfragments/898.changed.md

@@ -0,0 +1,3 @@
+Remove unstable MSC2965 details from Well Known Files.
+
+Native OIDC (Matrix Authentication Service) support is advertised through `/auth_metadata` availability.

tests/manifests/test_well_known_delegation.py

@@ -11,12 +11,6 @@
 from . import DeployableDetails, PropertyType
 from .utils import iterate_deployables_ingress_parts
 
-msc_2965_authentication = {
-    "org.matrix.msc2965.authentication": {
-        "issuer": "https://mas.ess.localhost/",
-        "account": "https://mas.ess.localhost/account",
-    }
-}
 synapse_federation = {"m.server": "synapse.ess.localhost:443"}
 synapse_base_url = {"m.homeserver": {"base_url": "https://synapse.ess.localhost"}}
 
@@ -78,50 +72,6 @@ async def test_synapse_injected_in_server_and_client_well_known(release_name, va
     )
 
 
-@pytest.mark.parametrize("values_file", ["well-known-mas-values.yaml"])
-@pytest.mark.asyncio_cooperative
-async def test_mas_injected_in_client_well_known(release_name, values, make_templates):
-    await assert_well_known_files(release_name, values, make_templates, expected_client=msc_2965_authentication)
-
-    await assert_well_known_files(
-        release_name,
-        values,
-        make_templates,
-        expected_client=msc_2965_authentication,
-        client_config={
-            "org.matrix.msc2965.authentication": {
-                "issuer": "should-not-override",
-                "account": "https://mas.ess.localhost/account",
-            }
-        },
-    )
-
-
-@pytest.mark.parametrize("values_file", ["well-known-synapse-mas-values.yaml"])
-@pytest.mark.asyncio_cooperative
-async def test_synapse_and_mas_injected_in_client_and_server_well_known(release_name, values, make_templates):
-    await assert_well_known_files(
-        release_name,
-        values,
-        make_templates,
-        expected_client=(msc_2965_authentication | synapse_base_url),
-        expected_server=synapse_federation,
-    )
-    await assert_well_known_files(
-        release_name,
-        values,
-        make_templates,
-        expected_client=(msc_2965_authentication | synapse_base_url),
-        expected_server=synapse_federation,
-        client_config={
-            "org.matrix.msc2965.authentication": {
-                "issuer": "should-not-override",
-                "account": "https://mas.ess.localhost/account",
-            }
-        },
-    )
-
-
 @pytest.mark.parametrize("values_file", ["well-known-element-web-values.yaml"])
 @pytest.mark.asyncio_cooperative
 async def test_has_redirect_to_element_web(release_name, values, make_templates):