From d307843dd431de86e6d4c4f3e6fe8eaf946354d4 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Tue, 23 Nov 2021 17:39:37 -0800
Subject: SL-16388 Viewer MFA Implementation

We now present MFA errors to the user during login and prompt them for
an authentication token.
---
 indra/newview/skins/default/xui/en/floater_mfa.xml | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_mfa.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_mfa.xml b/indra/newview/skins/default/xui/en/floater_mfa.xml
new file mode 100644
index 0000000000..acdfbc82c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_mfa.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="87"
+ layout="topleft"
+ name="mfa_challenge"
+ help_topic="mfa_challenge"
+ width="480">
+    <text
+     type="string"
+     length="1"
+     bottom="20"
+     follows="top|left"
+     height="15"
+     layout="topleft"
+     left="10"
+     name="token_prompt"
+     top="20">
+        token prompt
+    </text>
+    <text_box
+     allow_text_entry="true"
+     follows="left|top|right"
+     height="19"
+     layout="topleft"
+     left_delta="70"
+     max_chars="16"
+     name="token_entry"
+     top_delta="-4"
+     width="16" />
+    <button
+     follows="top|left"
+     height="20"
+     label="Continue"
+     layout="topleft"
+     left="10"
+     name="Continue"
+     top="50"
+     width="64" />
+    <button
+     follows="top|left"
+     height="20"
+     label="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="Cancel"
+     top_delta="0"
+     width="64" />
+</floater>
-- 
cgit v1.2.3


From 30cd108c7e4a524c9f17060d5b2f7b4ff193b4b8 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Mon, 6 Dec 2021 16:17:55 -0800
Subject: SL-16388 Viewer MFA Implementation Improvements

token input is now handled and message formatting is improved.
Added beginnings of support for saving slmfa_hash value client side.
---
 indra/newview/skins/default/xui/en/floater_mfa.xml | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_mfa.xml b/indra/newview/skins/default/xui/en/floater_mfa.xml
index acdfbc82c0..361641d313 100644
--- a/indra/newview/skins/default/xui/en/floater_mfa.xml
+++ b/indra/newview/skins/default/xui/en/floater_mfa.xml
@@ -1,42 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ title="MFA Token Requred"
  legacy_header_height="18"
  can_minimize="false"
- height="87"
+ can_close="false"
+ height="110"
  layout="topleft"
  name="mfa_challenge"
  help_topic="mfa_challenge"
  width="480">
     <text
      type="string"
+     word_wrap="true"
      length="1"
-     bottom="20"
      follows="top|left"
      height="15"
      layout="topleft"
      left="10"
-     name="token_prompt"
+     name="token_prompt_text"
      top="20">
         token prompt
     </text>
-    <text_box
+    <line_editor
      allow_text_entry="true"
      follows="left|top|right"
      height="19"
      layout="topleft"
-     left_delta="70"
+     bottom_delta="40"
      max_chars="16"
-     name="token_entry"
-     top_delta="-4"
-     width="16" />
+     name="token_edit"
+     width="100" />
     <button
      follows="top|left"
      height="20"
      label="Continue"
      layout="topleft"
      left="10"
-     name="Continue"
-     top="50"
+     name="continue_btn"
+     bottom_delta="30"
      width="64" />
     <button
      follows="top|left"
@@ -44,7 +45,7 @@
      label="Cancel"
      layout="topleft"
      left_pad="5"
-     name="Cancel"
-     top_delta="0"
+     name="cancel_btn"
+     bottom_delta="0"
      width="64" />
 </floater>
-- 
cgit v1.2.3


From b74dc0e27a09fef55d12e5ea0e22a13ec9ca24e8 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Tue, 14 Dec 2021 09:07:09 -0800
Subject: SL-16388 Viewer MFA fix Duplicate Listener crash when first token
 challenge failed

also cleaned up some xui warnings
---
 indra/newview/skins/default/xui/en/floater_mfa.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_mfa.xml b/indra/newview/skins/default/xui/en/floater_mfa.xml
index 361641d313..7fd31cd9e2 100644
--- a/indra/newview/skins/default/xui/en/floater_mfa.xml
+++ b/indra/newview/skins/default/xui/en/floater_mfa.xml
@@ -22,12 +22,10 @@
         token prompt
     </text>
     <line_editor
-     allow_text_entry="true"
      follows="left|top|right"
      height="19"
      layout="topleft"
      bottom_delta="40"
-     max_chars="16"
      name="token_edit"
      width="100" />
     <button
-- 
cgit v1.2.3


From ea2ae3769f7edf42d8c3816d9b4bd039f80e4b03 Mon Sep 17 00:00:00 2001
From: "Brad Kittenbrink (Brad Linden)" <brad@lindenlab.com>
Date: Tue, 14 Dec 2021 12:50:33 -0800
Subject: SL-16388 floater_mfa line wrapping fix when the server message is
 very long

---
 indra/newview/skins/default/xui/en/floater_mfa.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_mfa.xml b/indra/newview/skins/default/xui/en/floater_mfa.xml
index 7fd31cd9e2..a649cc6d47 100644
--- a/indra/newview/skins/default/xui/en/floater_mfa.xml
+++ b/indra/newview/skins/default/xui/en/floater_mfa.xml
@@ -8,7 +8,7 @@
  layout="topleft"
  name="mfa_challenge"
  help_topic="mfa_challenge"
- width="480">
+ width="550">
     <text
      type="string"
      word_wrap="true"
-- 
cgit v1.2.3


From 990bee7ee227c947cc5e133ff0818c347b404e9d Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Fri, 14 Jan 2022 22:38:45 -0800
Subject: SL-16654 simplify MFA token prompt UI to use notifications instead of
 new custom floater.

---
 .../newview/skins/default/xui/en/notifications.xml  | 21 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml      |  9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d4f71fb370..b3c8f5f477 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11778,4 +11778,25 @@ Unable to load the track from [TRACK1] into [TRACK2].
   <tag>fail</tag>
   </notification>
   
+  <notification
+   icon="alertmodal.tga"
+   label="Prompt for MFA Token"
+   name="PromptMFAToken"
+   type="alertmodal">
+    [MESSAGE]
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="token" type="text" width="400" />
+      <button
+       default="true"
+       index="0"
+       name="continue"
+       text="Continue"/>
+      <button
+       index="1"
+       name="cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
 </notifications>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f26ee06e6b..0f045bd19c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -192,7 +192,14 @@ Please try logging in again in a minute.</string>
 Please try logging in again in a minute.</string>
 	<string name="LoginFailedLoggingOutSession">The system has begun logging out your last session.
 Please try logging in again in a minute.</string>
-
+        <string name="LoginFailedAuthenticationMFARequired">To continue logging in, enter a new token from your multifactor authentication app.
+If you feel this is an error, please contact support@secondlife.com</string>
+	<string name="LoginFailedAuthenticationFailedMFA">Sorry! We couldn't log you in.
+Please check to make sure you entered the right
+    * Username (like bobsmith12 or steller.sunshine)
+    * Password
+    * Token
+Also, please make sure your Caps Lock key is off.</string>
 
 	<!-- Disconnection -->
 	<string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
-- 
cgit v1.2.3


From d7a15a63ff3961937cc6152d8fb22d767bb6a1a6 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Fri, 18 Feb 2022 14:30:57 -0800
Subject: SL-16869 Removed unused LoginFailedAuthenticationFailedMFA message
 id.

---
 indra/newview/skins/default/xui/en/strings.xml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0f045bd19c..c62b57c585 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -194,12 +194,6 @@ Please try logging in again in a minute.</string>
 Please try logging in again in a minute.</string>
         <string name="LoginFailedAuthenticationMFARequired">To continue logging in, enter a new token from your multifactor authentication app.
 If you feel this is an error, please contact support@secondlife.com</string>
-	<string name="LoginFailedAuthenticationFailedMFA">Sorry! We couldn't log you in.
-Please check to make sure you entered the right
-    * Username (like bobsmith12 or steller.sunshine)
-    * Password
-    * Token
-Also, please make sure your Caps Lock key is off.</string>
 
 	<!-- Disconnection -->
 	<string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
-- 
cgit v1.2.3


From 65a19a690c1fcc7d6e7c7449439eb2d93df3bf18 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Mon, 7 Mar 2022 00:10:00 -0800
Subject: Match error message updated on server side for SL-16869

---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c62b57c585..866196a760 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -133,6 +133,7 @@ http://secondlife.com/viewer-access-faq</string>
 Please check to make sure you entered the right
     * Username (like bobsmith12 or steller.sunshine)
     * Password
+    * Second Factor Token (if enabled)
 Also, please make sure your Caps Lock key is off.</string>
 	<string name="LoginFailedPasswordChanged">As a security precaution your password has been changed.
 Please go to your account page at http://secondlife.com/password
-- 
cgit v1.2.3