From f11a7083aeb719b52ec43d8c89911125bd995972 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 1 Jun 2021 11:01:09 +0100
Subject: [PATCH 1/2] Switch to stable endpoint/fields for MSC2858

---
 src/Login.ts                                    | 3 ++-
 src/components/structures/auth/Registration.tsx | 2 +-
 src/components/views/elements/SSOButtons.tsx    | 2 +-
 test/components/structures/auth/Login-test.js   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Login.ts b/src/Login.ts
index d584df7dfee..89f7eb4b82c 100644
--- a/src/Login.ts
+++ b/src/Login.ts
@@ -48,7 +48,8 @@ export interface IIdentityProvider {
 
 export interface ISSOFlow {
     type: "m.login.sso" | "m.login.cas";
-    "org.matrix.msc2858.identity_providers": IIdentityProvider[]; // Unstable prefix for MSC2858
+    // eslint-disable-next-line camelcase
+    identity_providers: IIdentityProvider[];
 }
 
 export type LoginFlow = ISSOFlow | IPasswordFlow;
diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
index 96fb9bdc82b..d905db9d44a 100644
--- a/src/components/structures/auth/Registration.tsx
+++ b/src/components/structures/auth/Registration.tsx
@@ -467,7 +467,7 @@ export default class Registration extends React.Component<IProps, IState> {
             let ssoSection;
             if (this.state.ssoFlow) {
                 let continueWithSection;
-                const providers = this.state.ssoFlow["org.matrix.msc2858.identity_providers"] || [];
+                const providers = this.state.ssoFlow.identity_providers || [];
                 // when there is only a single (or 0) providers we show a wide button with `Continue with X` text
                 if (providers.length > 1) {
                     // i18n: ssoButtons is a placeholder to help translators understand context
diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx
index a9eb04d4ecc..a531abdf83c 100644
--- a/src/components/views/elements/SSOButtons.tsx
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -112,7 +112,7 @@ interface IProps {
 const MAX_PER_ROW = 6;
 
 const SSOButtons: React.FC<IProps> = ({matrixClient, flow, loginType, fragmentAfterLogin, primary}) => {
-    const providers = flow["org.matrix.msc2858.identity_providers"] || [];
+    const providers = flow.identity_providers || [];
     if (providers.length < 2) {
         return <div className="mx_SSOButtons">
             <SSOButton
diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
index 9b73137936e..f39802464fa 100644
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@@ -133,7 +133,7 @@ describe('Login', function() {
         root.setState({
             flows: [{
                 "type": "m.login.sso",
-                "org.matrix.msc2858.identity_providers": [{
+                "identity_providers": [{
                     id: "a",
                     name: "Provider 1",
                 }, {

From 4526998332f627e0c0afaab4a3105f737cf3425a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 1 Jun 2021 11:04:45 +0100
Subject: [PATCH 2/2] Remove brand prefix too

---
 src/Login.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Login.ts b/src/Login.ts
index 89f7eb4b82c..7caab22d880 100644
--- a/src/Login.ts
+++ b/src/Login.ts
@@ -31,12 +31,12 @@ interface IPasswordFlow {
 }
 
 export enum IdentityProviderBrand {
-    Gitlab = "org.matrix.gitlab",
-    Github = "org.matrix.github",
-    Apple = "org.matrix.apple",
-    Google = "org.matrix.google",
-    Facebook = "org.matrix.facebook",
-    Twitter = "org.matrix.twitter",
+    Gitlab = "gitlab",
+    Github = "github",
+    Apple = "apple",
+    Google = "google",
+    Facebook = "facebook",
+    Twitter = "twitter",
 }
 
 export interface IIdentityProvider {