From a2473680d4ce6f7797d58b27d4f8ab14d9dc9210 Mon Sep 17 00:00:00 2001
From: SleeplessOne1917 <abias1122@gmail.com>
Date: Thu, 5 Oct 2023 19:38:10 +0000
Subject: [PATCH] fix: Prevent login screen from redirecting to signup (#2170)

---
 src/shared/components/app/app.tsx             |  7 ++++-
 .../components/common/anonymous-guard.tsx     | 31 +++++++++++++++++++
 .../components/common/subscribe-button.tsx    |  2 ++
 src/shared/components/common/totp-modal.tsx   |  1 +
 src/shared/components/home/login-reset.tsx    |  8 +----
 src/shared/components/home/login.tsx          |  7 -----
 src/shared/utils/app/index.ts                 |  2 ++
 src/shared/utils/app/is-anonymous-path.ts     |  5 +++
 8 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 src/shared/components/common/anonymous-guard.tsx
 create mode 100644 src/shared/utils/app/is-anonymous-path.ts

diff --git a/src/shared/components/app/app.tsx b/src/shared/components/app/app.tsx
index b2f0df43..323be486 100644
--- a/src/shared/components/app/app.tsx
+++ b/src/shared/components/app/app.tsx
@@ -1,4 +1,4 @@
-import { isAuthPath, setIsoData } from "@utils/app";
+import { isAnonymousPath, isAuthPath, setIsoData } from "@utils/app";
 import { dataBsTheme } from "@utils/browser";
 import { Component, RefObject, createRef, linkEvent } from "inferno";
 import { Provider } from "inferno-i18next-dess";
@@ -14,6 +14,7 @@ import { Footer } from "./footer";
 import { Navbar } from "./navbar";
 import "./styles.scss";
 import { Theme } from "./theme";
+import AnonymousGuard from "../common/anonymous-guard";
 
 interface AppProps {
   user?: MyUserInfo;
@@ -78,6 +79,10 @@ export class App extends Component<AppProps, any> {
                                   <AuthGuard {...routeProps}>
                                     <RouteComponent {...routeProps} />
                                   </AuthGuard>
+                                ) : isAnonymousPath(path ?? "") ? (
+                                  <AnonymousGuard>
+                                    <RouteComponent {...routeProps} />
+                                  </AnonymousGuard>
                                 ) : (
                                   <RouteComponent {...routeProps} />
                                 ))}
diff --git a/src/shared/components/common/anonymous-guard.tsx b/src/shared/components/common/anonymous-guard.tsx
new file mode 100644
index 00000000..70a1f7aa
--- /dev/null
+++ b/src/shared/components/common/anonymous-guard.tsx
@@ -0,0 +1,31 @@
+import { Component } from "inferno";
+import { UserService } from "../../services";
+import { Spinner } from "./icon";
+
+interface AnonymousGuardState {
+  hasRedirected: boolean;
+}
+
+class AnonymousGuard extends Component<any, AnonymousGuardState> {
+  state = {
+    hasRedirected: false,
+  } as AnonymousGuardState;
+
+  constructor(props: any, context: any) {
+    super(props, context);
+  }
+
+  componentDidMount() {
+    if (UserService.Instance.myUserInfo) {
+      this.context.router.history.replace(`/`);
+    } else {
+      this.setState({ hasRedirected: true });
+    }
+  }
+
+  render() {
+    return this.state.hasRedirected ? this.props.children : <Spinner />;
+  }
+}
+
+export default AnonymousGuard;
diff --git a/src/shared/components/common/subscribe-button.tsx b/src/shared/components/common/subscribe-button.tsx
index 9ae4426f..58195391 100644
--- a/src/shared/components/common/subscribe-button.tsx
+++ b/src/shared/components/common/subscribe-button.tsx
@@ -201,6 +201,8 @@ class RemoteFetchModal extends Component<
                 value={this.state.instanceText}
                 onInput={linkEvent(this, handleInput)}
                 required
+                enterKeyHint="go"
+                inputMode="url"
               />
             </form>
             <footer className="modal-footer">
diff --git a/src/shared/components/common/totp-modal.tsx b/src/shared/components/common/totp-modal.tsx
index 0d8dc870..76a58677 100644
--- a/src/shared/components/common/totp-modal.tsx
+++ b/src/shared/components/common/totp-modal.tsx
@@ -226,6 +226,7 @@ export default class TotpModal extends Component<
                       ref={element => {
                         this.inputRefs[i] = element;
                       }}
+                      enterKeyHint="done"
                     />
                   ))}
                 </div>
diff --git a/src/shared/components/home/login-reset.tsx b/src/shared/components/home/login-reset.tsx
index 8f926f99..131011ae 100644
--- a/src/shared/components/home/login-reset.tsx
+++ b/src/shared/components/home/login-reset.tsx
@@ -2,7 +2,7 @@ import { setIsoData } from "@utils/app";
 import { capitalizeFirstLetter, validEmail } from "@utils/helpers";
 import { Component, linkEvent } from "inferno";
 import { GetSiteResponse } from "lemmy-js-client";
-import { HttpService, I18NextService, UserService } from "../../services";
+import { HttpService, I18NextService } from "../../services";
 import { toast } from "../../toast";
 import { HtmlTags } from "../common/html-tags";
 import { Spinner } from "../common/icon";
@@ -30,12 +30,6 @@ export class LoginReset extends Component<any, State> {
     super(props, context);
   }
 
-  componentDidMount() {
-    if (UserService.Instance.myUserInfo) {
-      this.context.router.history.push("/");
-    }
-  }
-
   get documentTitle(): string {
     return `${capitalizeFirstLetter(
       I18NextService.i18n.t("forgot_password"),
diff --git a/src/shared/components/home/login.tsx b/src/shared/components/home/login.tsx
index c1b22b1a..d80de80e 100644
--- a/src/shared/components/home/login.tsx
+++ b/src/shared/components/home/login.tsx
@@ -124,13 +124,6 @@ export class Login extends Component<
     this.handleSubmitTotp = this.handleSubmitTotp.bind(this);
   }
 
-  componentDidMount() {
-    // Navigate to home if already logged in
-    if (UserService.Instance.myUserInfo) {
-      this.context.router.history.push("/");
-    }
-  }
-
   get documentTitle(): string {
     return `${I18NextService.i18n.t("login")} - ${
       this.state.siteRes.site_view.site.name
diff --git a/src/shared/utils/app/index.ts b/src/shared/utils/app/index.ts
index 23cc14e0..870fa7fb 100644
--- a/src/shared/utils/app/index.ts
+++ b/src/shared/utils/app/index.ts
@@ -54,6 +54,7 @@ import updateCommunityBlock from "./update-community-block";
 import updatePersonBlock from "./update-person-block";
 import instanceToChoice from "./instance-to-choice";
 import updateInstanceBlock from "./update-instance-block";
+import isAnonymousPath from "./is-anonymous-path";
 
 export {
   buildCommentsTree,
@@ -112,4 +113,5 @@ export {
   updatePersonBlock,
   instanceToChoice,
   updateInstanceBlock,
+  isAnonymousPath,
 };
diff --git a/src/shared/utils/app/is-anonymous-path.ts b/src/shared/utils/app/is-anonymous-path.ts
new file mode 100644
index 00000000..0274d2a8
--- /dev/null
+++ b/src/shared/utils/app/is-anonymous-path.ts
@@ -0,0 +1,5 @@
+export default function isAnonymousPath(pathname: string) {
+  return /^\/(login.*|signup|password_change.*|verify_email.*)\b/g.test(
+    pathname,
+  );
+}