LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-22 12:21:13 +00:00
Code Issues Projects Releases Wiki Activity

Redirect to login and remove duplicated code

Browse source
This commit is contained in:
abias 2023-05-14 15:28:38 -04:00
parent 8f2d964062
commit 76f0292862
8 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server/index.tsx
View file

@ -141,7 +141,7 @@ server.get("/*", async (req, res) => {
}
if (!auth && isAuthPath(path)) {
res.redirect("/");
res.redirect("/login");
return;
}

2
src/shared/components/common/auth-guard.tsx
View file

@ -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}</>;
}

3
src/shared/components/community/create-community.tsx
View file

@ -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}

5
src/shared/components/person/inbox.tsx
View file

@ -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);

5
src/shared/components/person/registration-applications.tsx
View file

@ -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);

5
src/shared/components/person/reports.tsx
View file

@ -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);

4
src/shared/components/post/create-post.tsx
View file

@ -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}

7
src/shared/components/private_message/create-private-message.tsx
View file

@ -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 = {