From 76f02928626217518709ec06b379e8f3ad2a964d Mon Sep 17 00:00:00 2001 From: abias <abias1122@gmail.com> Date: Sun, 14 May 2023 15:28:38 -0400 Subject: [PATCH] Redirect to login and remove duplicated code --- src/server/index.tsx | 2 +- src/shared/components/common/auth-guard.tsx | 2 +- src/shared/components/community/create-community.tsx | 3 --- src/shared/components/person/inbox.tsx | 5 ----- src/shared/components/person/registration-applications.tsx | 5 ----- src/shared/components/person/reports.tsx | 5 ----- src/shared/components/post/create-post.tsx | 4 +--- .../components/private_message/create-private-message.tsx | 7 +------ 8 files changed, 4 insertions(+), 29 deletions(-) diff --git a/src/server/index.tsx b/src/server/index.tsx index e724fbd..dab5341 100644 --- a/src/server/index.tsx +++ b/src/server/index.tsx @@ -141,7 +141,7 @@ server.get("/*", async (req, res) => { } if (!auth && isAuthPath(path)) { - res.redirect("/"); + res.redirect("/login"); return; } diff --git a/src/shared/components/common/auth-guard.tsx b/src/shared/components/common/auth-guard.tsx index ea7510a..bdddec7 100644 --- a/src/shared/components/common/auth-guard.tsx +++ b/src/shared/components/common/auth-guard.tsx @@ -4,7 +4,7 @@ import { UserService } from "../../services"; function AuthGuard(props: { children?: InfernoNode }) { if (!UserService.Instance.myUserInfo) { - return <Redirect to="/" />; + return <Redirect to="/login" />; } else { return <>{props.children}</>; } diff --git a/src/shared/components/community/create-community.tsx b/src/shared/components/community/create-community.tsx index 81c6253..3650356 100644 --- a/src/shared/components/community/create-community.tsx +++ b/src/shared/components/community/create-community.tsx @@ -1,9 +1,7 @@ import { Component } from "inferno"; -import { Redirect } from "inferno-router"; import { CommunityView, GetSiteResponse } from "lemmy-js-client"; import { Subscription } from "rxjs"; import { i18n } from "../../i18next"; -import { UserService } from "../../services/UserService"; import { enableNsfw, isBrowser, @@ -50,7 +48,6 @@ export class CreateCommunity extends Component<any, CreateCommunityState> { render() { return ( <div className="container-lg"> - {!UserService.Instance.myUserInfo && <Redirect to="/login" />} <HtmlTags title={this.documentTitle} path={this.context.router.route.match.url} diff --git a/src/shared/components/person/inbox.tsx b/src/shared/components/person/inbox.tsx index 10af488..3c3e948 100644 --- a/src/shared/components/person/inbox.tsx +++ b/src/shared/components/person/inbox.tsx @@ -111,11 +111,6 @@ export class Inbox extends Component<any, InboxState> { this.handleSortChange = this.handleSortChange.bind(this); this.handlePageChange = this.handlePageChange.bind(this); - if (!UserService.Instance.myUserInfo && isBrowser()) { - toast(i18n.t("not_logged_in"), "danger"); - this.context.router.history.push(`/login`); - } - this.parseMessage = this.parseMessage.bind(this); this.subscription = wsSubscribe(this.parseMessage); diff --git a/src/shared/components/person/registration-applications.tsx b/src/shared/components/person/registration-applications.tsx index cd99bcc..b25c406 100644 --- a/src/shared/components/person/registration-applications.tsx +++ b/src/shared/components/person/registration-applications.tsx @@ -59,11 +59,6 @@ export class RegistrationApplications extends Component< this.handlePageChange = this.handlePageChange.bind(this); - if (!UserService.Instance.myUserInfo && isBrowser()) { - toast(i18n.t("not_logged_in"), "danger"); - this.context.router.history.push(`/login`); - } - this.parseMessage = this.parseMessage.bind(this); this.subscription = wsSubscribe(this.parseMessage); diff --git a/src/shared/components/person/reports.tsx b/src/shared/components/person/reports.tsx index 8fc3081..f4fc5a1 100644 --- a/src/shared/components/person/reports.tsx +++ b/src/shared/components/person/reports.tsx @@ -96,11 +96,6 @@ export class Reports extends Component<any, ReportsState> { this.handlePageChange = this.handlePageChange.bind(this); - if (!UserService.Instance.myUserInfo && isBrowser()) { - toast(i18n.t("not_logged_in"), "danger"); - this.context.router.history.push(`/login`); - } - this.parseMessage = this.parseMessage.bind(this); this.subscription = wsSubscribe(this.parseMessage); diff --git a/src/shared/components/post/create-post.tsx b/src/shared/components/post/create-post.tsx index 2d0ba7e..d8a2cce 100644 --- a/src/shared/components/post/create-post.tsx +++ b/src/shared/components/post/create-post.tsx @@ -1,5 +1,4 @@ import { Component } from "inferno"; -import { Redirect } from "inferno-router"; import { RouteComponentProps } from "inferno-router/dist/Route"; import { GetCommunity, @@ -13,7 +12,7 @@ import { import { Subscription } from "rxjs"; import { InitialFetchRequest, PostFormParams } from "shared/interfaces"; import { i18n } from "../../i18next"; -import { UserService, WebSocketService } from "../../services"; +import { WebSocketService } from "../../services"; import { Choice, QueryParams, @@ -145,7 +144,6 @@ export class CreatePost extends Component< return ( <div className="container-lg"> - {!UserService.Instance.myUserInfo && <Redirect to="/login" />} <HtmlTags title={this.documentTitle} path={this.context.router.route.match.url} diff --git a/src/shared/components/private_message/create-private-message.tsx b/src/shared/components/private_message/create-private-message.tsx index 33bac43..327386c 100644 --- a/src/shared/components/private_message/create-private-message.tsx +++ b/src/shared/components/private_message/create-private-message.tsx @@ -10,7 +10,7 @@ import { import { Subscription } from "rxjs"; import { i18n } from "../../i18next"; import { InitialFetchRequest } from "../../interfaces"; -import { UserService, WebSocketService } from "../../services"; +import { WebSocketService } from "../../services"; import { getRecipientIdFromProps, isBrowser, @@ -51,11 +51,6 @@ export class CreatePrivateMessage extends Component< this.parseMessage = this.parseMessage.bind(this); this.subscription = wsSubscribe(this.parseMessage); - if (!UserService.Instance.myUserInfo && isBrowser()) { - toast(i18n.t("not_logged_in"), "danger"); - this.context.router.history.push(`/login`); - } - // Only fetch the data if coming from another route if (this.isoData.path == this.context.router.route.match.url) { this.state = { -- 2.44.1