From f4a2d216c3e1c78fa74eeed5eed50a4f58a69899 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 8 Oct 2019 19:07:39 +0100
Subject: [PATCH] Support UI auth on adding phone numbers

---
 src/AddThreepid.js          | 29 ++++++++++++++++++++++++-----
 src/i18n/strings/en_EN.json |  1 +
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/AddThreepid.js b/src/AddThreepid.js
index 307f09cd5c..8f4e3883d3 100644
--- a/src/AddThreepid.js
+++ b/src/AddThreepid.js
@@ -254,9 +254,9 @@ export default class AddThreepid {
             throw result;
         }
 
-        const identityServerDomain = MatrixClientPeg.get().idBaseUrl.split("://")[1];
         if (await MatrixClientPeg.get().doesServerSupportSeparateAddAndBind()) {
             if (this.bind) {
+                const identityServerDomain = MatrixClientPeg.get().idBaseUrl.split("://")[1];
                 await MatrixClientPeg.get().bindThreePid({
                     sid: this.sessionId,
                     client_secret: this.clientSecret,
@@ -264,12 +264,31 @@ export default class AddThreepid {
                     id_access_token: await authClient.getAccessToken(),
                 });
             } else {
-                await MatrixClientPeg.get().addThreePidOnly({
-                    sid: this.sessionId,
-                    client_secret: this.clientSecret,
-                });
+                try {
+                    await this._makeAddThreepidOnlyRequest();
+
+                    // The spec has always required this to use UI auth but synapse briefly
+                    // implemented it without, so this may just succeed and that's OK.
+                    return;
+                } catch (e) {
+                    if (e.httpStatus !== 401 || !e.data || !e.data.flows) {
+                        // doesn't look like an interactive-auth failure
+                        throw e;
+                    }
+
+                    // pop up an interactive auth dialog
+                    const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
+
+                    Modal.createTrackedDialog('Add MSISDN', '', InteractiveAuthDialog, {
+                        title: _t("Add Phone Number"),
+                        matrixClient: MatrixClientPeg.get(),
+                        authData: e.data,
+                        makeRequest: this._makeAddThreepidOnlyRequest,
+                    });
+                }
             }
         } else {
+            const identityServerDomain = MatrixClientPeg.get().idBaseUrl.split("://")[1];
             await MatrixClientPeg.get().addThreePid({
                 sid: this.sessionId,
                 client_secret: this.clientSecret,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bcd43968d6..f6ed69a201 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -3,6 +3,7 @@
     "This phone number is already in use": "This phone number is already in use",
     "Add Email Address": "Add Email Address",
     "Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email",
+    "Add Phone Number": "Add Phone Number",
     "The platform you're on": "The platform you're on",
     "The version of Riot.im": "The version of Riot.im",
     "Whether or not you're logged in (we don't record your username)": "Whether or not you're logged in (we don't record your username)",