From 40b247350b9518da2ccda1fbc8b98be350a80293 Mon Sep 17 00:00:00 2001
From: Nick Funk <nick.funk@outlook.com>
Date: Wed, 13 Nov 2019 09:50:56 -0700
Subject: [PATCH] [CORL-766] Update copy on SSO key regeneration and account
 deletion (#2707)

* Update acknowledgment copy for downloading user comment data

CORL-766

* Update copy for 30 day leniency on SSO tokens

CORL-766
---
 .../admin/routes/Configure/sections/Auth/SSOKeyField.tsx    | 4 ++--
 .../admin/test/configure/__snapshots__/auth.spec.tsx.snap   | 6 ++----
 .../tabs/Profile/Settings/DownloadCommentsContainer.tsx     | 3 ++-
 src/locales/en-US/admin.ftl                                 | 3 +--
 src/locales/en-US/stream.ftl                                | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/core/client/admin/routes/Configure/sections/Auth/SSOKeyField.tsx b/src/core/client/admin/routes/Configure/sections/Auth/SSOKeyField.tsx
index 738d23cfa..ed0539d4b 100644
--- a/src/core/client/admin/routes/Configure/sections/Auth/SSOKeyField.tsx
+++ b/src/core/client/admin/routes/Configure/sections/Auth/SSOKeyField.tsx
@@ -49,8 +49,8 @@ const SSOKeyField: FunctionComponent<Props> = ({
         <Icon className={styles.warnIcon}>warning</Icon>
         <Localized id="configure-auth-sso-regenerateWarning">
           <Typography className={styles.warn} variant="bodyShort">
-            Regenerating a key will invalidate any existing user sessions, and
-            all signed-in users will be signed out
+            When regenerating a key, tokens signed with the previous key will be
+            honored for 30 days.
           </Typography>
         </Localized>
       </Flex>
diff --git a/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap b/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap
index b2abcf37d..3eff5535c 100644
--- a/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap
+++ b/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap
@@ -1925,8 +1925,7 @@ exports[`regenerate sso key 1`] = `
       <p
         className="Box-root Typography-root Typography-bodyShort Typography-colorTextPrimary SSOKeyField-warn"
       >
-        Regenerating a key will invalidate any existing user sessions,
-and all signed-in users will be signed out.
+        When regenerating a key, tokens signed with the previous key will be honored for 30 days.
       </p>
     </div>
   </div>
@@ -3177,8 +3176,7 @@ Invalid Date
                           <p
                             className="Box-root Typography-root Typography-bodyShort Typography-colorTextPrimary SSOKeyField-warn"
                           >
-                            Regenerating a key will invalidate any existing user sessions,
-and all signed-in users will be signed out.
+                            When regenerating a key, tokens signed with the previous key will be honored for 30 days.
                           </p>
                         </div>
                       </div>
diff --git a/src/core/client/stream/tabs/Profile/Settings/DownloadCommentsContainer.tsx b/src/core/client/stream/tabs/Profile/Settings/DownloadCommentsContainer.tsx
index 3ccf3a7ad..302151e84 100644
--- a/src/core/client/stream/tabs/Profile/Settings/DownloadCommentsContainer.tsx
+++ b/src/core/client/stream/tabs/Profile/Settings/DownloadCommentsContainer.tsx
@@ -123,7 +123,8 @@ const DownloadCommentsContainer: FunctionComponent<Props> = ({ viewer }) => {
             $unit={unit}
           >
             <span>
-              You can submit another request in {scaled} {unit}
+              Request submitted. You can submit another request in {scaled}{" "}
+              {unit}
             </span>
           </Localized>
         </CallOut>
diff --git a/src/locales/en-US/admin.ftl b/src/locales/en-US/admin.ftl
index 5be68f0be..f044f4d05 100644
--- a/src/locales/en-US/admin.ftl
+++ b/src/locales/en-US/admin.ftl
@@ -223,8 +223,7 @@ configure-auth-sso-regenerate = Regenerate
 configure-auth-sso-regenerateAt = KEY GENERATED AT:
   { DATETIME($date, year: "numeric", month: "numeric", day: "numeric", hour: "numeric", minute: "numeric") }
 configure-auth-sso-regenerateWarning =
-  Regenerating a key will invalidate any existing user sessions,
-  and all signed-in users will be signed out.
+  When regenerating a key, tokens signed with the previous key will be honored for 30 days.
 
 configure-auth-local-loginWith = Login with email authentication
 configure-auth-local-useLoginOn = Use email authentication login on
diff --git a/src/locales/en-US/stream.ftl b/src/locales/en-US/stream.ftl
index 02db24d20..f54e9731e 100644
--- a/src/locales/en-US/stream.ftl
+++ b/src/locales/en-US/stream.ftl
@@ -240,7 +240,7 @@ profile-account-download-comments-request-icon =
 profile-account-download-comments-recentRequest =
   Your most recent request: { $timeStamp }
 profile-account-download-comments-timeOut =
-  You can submit another request in { framework-timeago-time }
+  Request submitted. You can submit another request in { framework-timeago-time }
 profile-account-download-comments-request-button = Request
 
 ## Delete Account