Skip to content

Remove legacy MSC2965 advertisment for Native-OIDC/MAS#898

Merged
benbz merged 1 commit into
mainfrom
bbz/remove-unstable-msc2965-marker-from-well-knowns
Mar 9, 2026
Merged

Remove legacy MSC2965 advertisment for Native-OIDC/MAS#898
benbz merged 1 commit into
mainfrom
bbz/remove-unstable-msc2965-marker-from-well-knowns

Conversation

@benbz

@benbz benbz commented Nov 26, 2025

Copy link
Copy Markdown
Member

Draft as legacy Element Android and legacy Element iOS appear to still rely on this and don't check for /auth_metadata as spec'ed

@github-actions

Copy link
Copy Markdown

dyff of changes in rendered templates of CI manifests

Full contents of manifests and dyffs are available in https://github.com/element-hq/ess-helm/actions/runs/19701631461/artifacts/4684936118

example-default-enabled-components-checkov-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
  {
    "m.homeserver": {
      "base_url": "https://synapse.ess.localhost"
    },
-   "org.matrix.msc2965.authentication": {
-     "account": "https://mas.ess.localhost/account",
-     "issuer": "https://mas.ess.localhost/"
-   },
    "org.matrix.msc4143.rtc_foci": [
      {
        "livekit_service_url": "https://mrtc.ess.localhost",
        "type": "livekit"
      }
    ]
  }

example-default-enabled-components-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
  {
    "m.homeserver": {
      "base_url": "https://synapse.ess.localhost"
    },
-   "org.matrix.msc2965.authentication": {
-     "account": "https://mas.ess.localhost/account",
-     "issuer": "https://mas.ess.localhost/"
-   },
    "org.matrix.msc4143.rtc_foci": [
      {
        "livekit_service_url": "https://mrtc.ess.localhost",
        "type": "livekit"
      }
    ]
  }

quick-setup-certificates-pg-external-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
  {
    "m.homeserver": {
      "base_url": "https://matrix.your.tld"
    },
-   "org.matrix.msc2965.authentication": {
-     "account": "https://account.your.tld/account",
-     "issuer": "https://account.your.tld/"
-   },
    "org.matrix.msc4143.rtc_foci": [
      {
        "livekit_service_url": "https://mrtc.your.tld",
        "type": "livekit"
      }
    ]
  }

quick-setup-certificates-pg-with-helm-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
  {
    "m.homeserver": {
      "base_url": "https://matrix.your.tld"
    },
-   "org.matrix.msc2965.authentication": {
-     "account": "https://account.your.tld/account",
-     "issuer": "https://account.your.tld/"
-   },
    "org.matrix.msc4143.rtc_foci": [
      {
        "livekit_service_url": "https://mrtc.your.tld",
        "type": "livekit"
      }
    ]
  }

quick-setup-external-cert-pg-external-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
  {
    "m.homeserver": {
      "base_url": "https://matrix.your.tld"
    },
-   "org.matrix.msc2965.authentication": {
-     "account": "https://account.your.tld/account",
-     "issuer": "https://account.your.tld/"
-   },
    "org.matrix.msc4143.rtc_foci": [
      {
        "livekit_service_url": "https://mrtc.your.tld",
        "type": "livekit"
      }
    ]
  }

quick-setup-external-cert-pg-with-helm-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
  {
    "m.homeserver": {
      "base_url": "https://matrix.your.tld"
    },
-   "org.matrix.msc2965.authentication": {
-     "account": "https://account.your.tld/account",
-     "issuer": "https://account.your.tld/"
-   },
    "org.matrix.msc4143.rtc_foci": [
      {
        "livekit_service_url": "https://mrtc.your.tld",
        "type": "livekit"
      }
    ]
  }

quick-setup-letsencrypt-pg-external-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
  {
    "m.homeserver": {
      "base_url": "https://matrix.your.tld"
    },
-   "org.matrix.msc2965.authentication": {
-     "account": "https://account.your.tld/account",
-     "issuer": "https://account.your.tld/"
-   },
    "org.matrix.msc4143.rtc_foci": [
      {
        "livekit_service_url": "https://mrtc.your.tld",
        "type": "livekit"
      }
    ]
  }

quick-setup-letsencrypt-pg-with-helm-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
  {
    "m.homeserver": {
      "base_url": "https://matrix.your.tld"
    },
-   "org.matrix.msc2965.authentication": {
-     "account": "https://account.your.tld/account",
-     "issuer": "https://account.your.tld/"
-   },
    "org.matrix.msc4143.rtc_foci": [
      {
        "livekit_service_url": "https://mrtc.your.tld",
        "type": "livekit"
      }
    ]
  }

quick-setup-wildcard-cert-pg-external-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
  {
    "m.homeserver": {
      "base_url": "https://matrix.your.tld"
    },
-   "org.matrix.msc2965.authentication": {
-     "account": "https://account.your.tld/account",
-     "issuer": "https://account.your.tld/"
-   },
    "org.matrix.msc4143.rtc_foci": [
      {
        "livekit_service_url": "https://mrtc.your.tld",
        "type": "livekit"
      }
    ]
  }

quick-setup-wildcard-cert-pg-with-helm-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
  {
    "m.homeserver": {
      "base_url": "https://matrix.your.tld"
    },
-   "org.matrix.msc2965.authentication": {
-     "account": "https://account.your.tld/account",
-     "issuer": "https://account.your.tld/"
-   },
    "org.matrix.msc4143.rtc_foci": [
      {
        "livekit_service_url": "https://mrtc.your.tld",
        "type": "livekit"
      }
    ]
  }

well-known-mas-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
- {
-   "org.matrix.msc2965.authentication": {
-     "account": "https://mas.ess.localhost/account",
-     "issuer": "https://mas.ess.localhost/"
-   }
- }
+ {}

well-known-synapse-mas-values.yaml
@@ ConfigMap/ess-ci/release-name-well-known-haproxy - data.client @@
  {
    "m.homeserver": {
      "base_url": "https://synapse.ess.localhost"
-   },
-   "org.matrix.msc2965.authentication": {
-     "account": "https://mas.ess.localhost/account",
-     "issuer": "https://mas.ess.localhost/"
    }
  }

@richvdh

richvdh commented Nov 26, 2025

Copy link
Copy Markdown
Member

Related issue for matrix.org: element-hq/synapse#19227

@hughns

hughns commented Jan 7, 2026

Copy link
Copy Markdown
Member

The updates to Element Classic Android and iOS can be tracked at:

@hughns

hughns commented Feb 11, 2026

Copy link
Copy Markdown
Member

The above PRs were released in these versions:

As such it may be safe for this PR to now progress.

@benbz benbz force-pushed the bbz/remove-unstable-msc2965-marker-from-well-knowns branch from 7bff0f2 to 0427b28 Compare March 9, 2026 10:52
@benbz benbz marked this pull request as ready for review March 9, 2026 10:52
@benbz benbz requested a review from a team as a code owner March 9, 2026 10:52
@benbz

benbz commented Mar 9, 2026

Copy link
Copy Markdown
Member Author

From discussion internally 80-90% of Element iOS Classic sessions appear to be on a compatible version. Progressing this

@benbz benbz force-pushed the bbz/remove-unstable-msc2965-marker-from-well-knowns branch from 0427b28 to 9d50d6b Compare March 9, 2026 10:55
@benbz benbz merged commit 5c5ba24 into main Mar 9, 2026
199 of 204 checks passed
@benbz benbz deleted the bbz/remove-unstable-msc2965-marker-from-well-knowns branch March 9, 2026 11:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants