Merge pull request #602 from StephenMcConnel/BL-15618-RevertPreloginMessage

Revert "Notify user that scary permissions message for login is okay (BL-15618)"

Author: andrew-polk

src/components/User/LoginDialog.tsx

@@ -4,79 +4,34 @@ import { DialogTitle } from "@material-ui/core";
 import Dialog from "@material-ui/core/Dialog";
 import { FormattedMessage } from "react-intl";
 import { StyledFirebaseAuthCodeSplit } from "../../authentication/firebase/StyledFirebaseAuthCodeSplit";
-import { PreLoginMessageDialog } from "./PreLoginMessageDialog";
 
 let staticShowLoginDialog: (doOpen: boolean) => void = () => {};
 export { staticShowLoginDialog as ShowLoginDialog };
 
-const messageSeenCookieName = "BloomPreLoginMessageSeen";
-function setMessageSeenCookie(): void {
-    // The expiration date is actually limited to about 400 days in the future by current browser implementations,
-    // but setting it to 9999 makes it effectively permanent for our purposes.
-    document.cookie = `${messageSeenCookieName}=true; Path=/; Expires=Fri, 31 Dec 9999 23:59:59 GMT;`;
-}
-function getMessageSeenCookie(): string | null {
-    const nameEQ = `${messageSeenCookieName}=`;
-    const cookies = document.cookie.split(";");
-    for (let i = 0; i < cookies.length; i++) {
-        const c = cookies[i].trim();
-        if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);
-    }
-    return null;
-}
-
 export const LoginDialog: React.FunctionComponent<{}> = (props) => {
     const [isOpen, setIsOpen] = useState(false);
-    const [showMessageDialog, setShowMessageDialog] = useState(false);
-
-    const warningSeen = getMessageSeenCookie();
-
-    staticShowLoginDialog = (doOpen: boolean) => {
-        if (warningSeen) {
-            setShowMessageDialog(false);
-            setIsOpen(doOpen);
-        } else if (doOpen) {
-            setShowMessageDialog(true);
-        } else {
-            setIsOpen(false);
-            setShowMessageDialog(false);
-        }
-        setMessageSeenCookie();
-    };
-
-    const handleContinue = () => {
-        setShowMessageDialog(false);
-        setIsOpen(true);
-    };
 
+    staticShowLoginDialog = (doOpen: boolean) => setIsOpen(doOpen);
     return (
-        <>
-            <PreLoginMessageDialog
-                open={showMessageDialog}
-                onClose={handleContinue}
-                onContinue={handleContinue}
-            />
-
-            <Dialog
-                className="loginDialog"
-                open={isOpen}
-                onClose={() => setIsOpen(false)}
-                aria-labelledby="title"
-            >
-                <DialogTitle id="title">
-                    <FormattedMessage
-                        id="usermenu.signIn"
-                        defaultMessage="Sign In / Sign Up"
+        <Dialog
+            className="loginDialog"
+            open={isOpen}
+            onClose={() => setIsOpen(false)}
+            aria-labelledby="title"
+        >
+            <DialogTitle id="title">
+                <FormattedMessage
+                    id="usermenu.signIn"
+                    defaultMessage="Sign In / Sign Up"
+                />
+            </DialogTitle>
+            {isOpen && (
+                <div>
+                    <StyledFirebaseAuthCodeSplit
+                        loginComplete={() => staticShowLoginDialog(false)}
                     />
-                </DialogTitle>
-                {isOpen && (
-                    <div>
-                        <StyledFirebaseAuthCodeSplit
-                            loginComplete={() => staticShowLoginDialog(false)}
-                        />
-                    </div>
-                )}
-            </Dialog>
-        </>
+                </div>
+            )}
+        </Dialog>
     );
 };

src/components/User/LoginForEditor.tsx

@@ -65,17 +65,6 @@ export const LoginForEditor: React.FunctionComponent<{}> = observer(() => {
             </CloseableDialog>
         );
     } else {
-        const l10n = useIntl();
-        const successMsg = l10n.formatMessage({
-            id: "login.succeeded",
-            defaultMessage:
-                "You successfully logged in! You can now return to Bloom and upload your book.",
-        });
-        const failureMsg = l10n.formatMessage({
-            id: "login.failed",
-            defaultMessage:
-                "Login for Bloom Desktop App failed. Make sure that your browser's site settings for BloomLibrary.org allow 'Network Access' which is a scary way of saying that we can send a message to your Bloom Desktop app",
-        });
         switch (result) {
             case IInformEditorResult.Success:
             case IInformEditorResult.Failure:
@@ -86,8 +75,8 @@ export const LoginForEditor: React.FunctionComponent<{}> = observer(() => {
                         }}
                     >
                         {result === IInformEditorResult.Success
-                            ? successMsg
-                            : failureMsg}
+                            ? "You successfully logged in! You can now return to Bloom and upload your book."
+                            : "Log in failed. Please try again."}
                     </CloseableDialog>
                 );
             default:

src/components/User/PreLoginMessageDialog.tsx

@@ -471,22 +471,6 @@
         "description": "",
         "message": "Close"
     },
-    "common.continue": {
-        "description": "",
-        "message": "Continue"
-    },
-    "login.beforeLoginMessage": {
-        "description": "Priority - Low",
-        "message": "Are you trying to log into your account from the Bloom desktop application? Your browser may ask you for some scary permissions, but really, we're simply trying to connect to your Bloom desktop app."
-    },
-    "login.succeeded": {
-        "description": "Priority - Low",
-        "message": "You successfully logged in! You can now return to Bloom and upload your book."
-    },
-    "login.failed": {
-        "description": "Priority - Low",
-        "message": "Login for Bloom Desktop App failed. Make sure that your browser's site settings for BloomLibrary.org allow 'Network Access' which is a scary way of saying that we can send a message to your Bloom Desktop app"
-    },
     "book.concerns": {
         "description": "",
         "message": "What concerns do you have about this book?"