Handle error when site not returned

diff --git a/src/server/index.tsx b/src/server/index.tsx
index e406e6fe8c58d12c127a9039a23ffddc469d932d..26f5cf90a7281c025a6b98c313c6f8d6d830e289 100644 (file)
--- a/src/server/index.tsx
+++ b/src/server/index.tsx
@@ -16,7 +16,7 @@ import { getHttpBase, getHttpBaseInternal } from "../shared/env";
 import {
   ILemmyConfig,
   InitialFetchRequest,
-  IsoData,
+  IsoDataOptionalSite,
 } from "../shared/interfaces";
 import { routes } from "../shared/routes";
 import {
@@ -78,6 +78,7 @@ server.get("/css/themes/:name", async (req, res) => {
   res.contentType("text/css");
   const theme = req.params.name;
   if (!theme.endsWith(".css")) {
+    res.statusCode = 400;
     res.send("Theme must be a css file");
   }
 
@@ -121,8 +122,6 @@ server.get("/*", async (req, res) => {
 
     const getSiteForm: GetSite = { auth };
 
-    const promises: Promise<any>[] = [];
-
     const headers = setForwardedHeaders(req.headers);
     const client = new LemmyHttp(getHttpBaseInternal(), headers);
 
@@ -131,39 +130,46 @@ server.get("/*", async (req, res) => {
     // Get site data first
     // This bypasses errors, so that the client can hit the error on its own,
     // in order to remove the jwt on the browser. Necessary for wrong jwts
-    let try_site: any = await client.getSite(getSiteForm);
-    if (try_site.error == "not_logged_in") {
-      console.error(
-        "Incorrect JWT token, skipping auth so frontend can remove jwt cookie"
-      );
-      getSiteForm.auth = undefined;
-      auth = undefined;
-      try_site = await client.getSite(getSiteForm);
-    }
+    let site: GetSiteResponse | undefined = undefined;
+    let routeData: any[] = [];
+    try {
+      let try_site: any = await client.getSite(getSiteForm);
+      if (try_site.error == "not_logged_in") {
+        console.error(
+          "Incorrect JWT token, skipping auth so frontend can remove jwt cookie"
+        );
+        getSiteForm.auth = undefined;
+        auth = undefined;
+        try_site = await client.getSite(getSiteForm);
+      }
 
-    if (!auth && isAuthPath(path)) {
-      res.redirect("/login");
-      return;
-    }
+      if (!auth && isAuthPath(path)) {
+        res.redirect("/login");
+        return;
+      }
 
-    const site: GetSiteResponse = try_site;
-    initializeSite(site);
+      site = try_site;
+      initializeSite(site);
 
-    const initialFetchReq: InitialFetchRequest = {
-      client,
-      auth,
-      path,
-      query,
-      site,
-    };
+      if (site) {
+        const initialFetchReq: InitialFetchRequest = {
+          client,
+          auth,
+          path,
+          query,
+          site,
+        };
 
-    if (activeRoute?.fetchInitialData) {
-      promises.push(...activeRoute.fetchInitialData(initialFetchReq));
+        if (activeRoute?.fetchInitialData) {
+          routeData = await Promise.all([
+            ...activeRoute.fetchInitialData(initialFetchReq),
+          ]);
+        }
+      }
+    } catch (error) {
+      routeData = [getErrorRouteData(error)];
     }
 
-    let routeData = await Promise.all(promises);
-    // let routeData = [{ error: "I am an error, hear me roar!" } as any];
-
     // Redirect to the 404 if there's an API error
     if (routeData[0] && routeData[0].error) {
       const error = routeData[0].error;
@@ -171,28 +177,14 @@ server.get("/*", async (req, res) => {
       if (error === "instance_is_private") {
         return res.redirect(`/signup`);
       } else {
-        const errorPageData: ErrorPageData = { type: "error" };
-
-        // Exact error should only be seen in a development environment. Users
-        // in production will get a more generic message.
-        if (NODE_ENV === "development") {
-          errorPageData.error = error;
-        }
-
-        const adminMatrixIds = site.admins
-          .map(({ person: { matrix_user_id } }) => matrix_user_id)
-          .filter(id => id) as string[];
-        if (adminMatrixIds.length > 0) {
-          errorPageData.adminMatrixIds = adminMatrixIds;
-        }
-
-        routeData = [errorPageData];
+        routeData = [getErrorRouteData(error, site)];
       }
     }
 
+    console.log("Route Data");
     console.log(routeData);
 
-    const isoData: IsoData = {
+    const isoData: IsoDataOptionalSite = {
       path,
       site_res: site,
       routeData,
@@ -204,91 +196,11 @@ server.get("/*", async (req, res) => {
       </StaticRouter>
     );
 
-    const eruda = (
-      <>
-        <script src="//cdn.jsdelivr.net/npm/eruda"></script>
-        <script>eruda.init();</script>
-      </>
-    );
-
-    const erudaStr = process.env["LEMMY_UI_DEBUG"] ? renderToString(eruda) : "";
     const root = renderToString(wrapper);
-    const helmet = Helmet.renderStatic();
-
-    const config: ILemmyConfig = { wsHost: process.env.LEMMY_UI_LEMMY_WS_HOST };
-
-    const appleTouchIcon = site.site_view.site.icon
-      ? `data:image/png;base64,${sharp(
-          await fetchIconPng(site.site_view.site.icon)
-        )
-          .resize(180, 180)
-          .extend({
-            bottom: 20,
-            top: 20,
-            left: 20,
-            right: 20,
-            background: "#222222",
-          })
-          .png()
-          .toBuffer()
-          .then(buf => buf.toString("base64"))}`
-      : favIconPngUrl;
-
-    res.send(`
-           <!DOCTYPE html>
-           <html ${helmet.htmlAttributes.toString()} lang="en">
-           <head>
-           <script>window.isoData = ${JSON.stringify(isoData)}</script>
-           <script>window.lemmyConfig = ${serialize(config)}</script>
-
-           <!-- A remote debugging utility for mobile -->
-           ${erudaStr}
-
-           <!-- Custom injected script -->
-           ${customHtmlHeader}
-
-           ${helmet.title.toString()}
-           ${helmet.meta.toString()}
-
-           <!-- Required meta tags -->
-           <meta name="Description" content="Lemmy">
-           <meta charset="utf-8">
-           <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-           <link
-              id="favicon"
-              rel="shortcut icon"
-              type="image/x-icon"
-              href=${site.site_view.site.icon ?? favIconUrl}
-            />
-
-           <!-- Web app manifest -->
-           <link rel="manifest" href="data:application/manifest+json;base64,${await generateManifestBase64(
-             site.site_view.site
-           )}">
-           <link rel="apple-touch-icon" href=${appleTouchIcon} />
-           <link rel="apple-touch-startup-image" href=${appleTouchIcon} />
-
-           <!-- Styles -->
-           <link rel="stylesheet" type="text/css" href="/static/styles/styles.css" />
-
-           <!-- Current theme and more -->
-           ${helmet.link.toString()}
-           
-           </head>
-
-           <body ${helmet.bodyAttributes.toString()}>
-             <noscript>
-               <div class="alert alert-danger rounded-0" role="alert">
-                 <b>Javascript is disabled. Actions will not work.</b>
-               </div>
-             </noscript>
-
-             <div id='root'>${root}</div>
-             <script defer src='/static/js/client.js'></script>
-           </body>
-         </html>
-`);
+
+    res.send(await createSsrHtml(root, isoData));
   } catch (err) {
+    // If an error is caught here, the error page couldn't even be rendered
     console.error(err);
     res.statusCode = 500;
     return res.send(NODE_ENV === "development" ? err.message : "Server error");
@@ -382,3 +294,116 @@ async function fetchIconPng(iconUrl: string) {
     .then(res => res.blob())
     .then(blob => blob.arrayBuffer());
 }
+
+function getErrorRouteData(error: string, site?: GetSiteResponse) {
+  const errorPageData: ErrorPageData = { type: "error" };
+
+  // Exact error should only be seen in a development environment. Users
+  // in production will get a more generic message.
+  if (NODE_ENV === "development") {
+    errorPageData.error = error;
+  }
+
+  const adminMatrixIds = site?.admins
+    .map(({ person: { matrix_user_id } }) => matrix_user_id)
+    .filter(id => id) as string[] | undefined;
+  if (adminMatrixIds && adminMatrixIds.length > 0) {
+    errorPageData.adminMatrixIds = adminMatrixIds;
+  }
+
+  return [errorPageData];
+}
+
+async function createSsrHtml(root: string, isoData: IsoDataOptionalSite) {
+  const site = isoData.site_res;
+  const appleTouchIcon = site?.site_view.site.icon
+    ? `data:image/png;base64,${sharp(
+        await fetchIconPng(site.site_view.site.icon)
+      )
+        .resize(180, 180)
+        .extend({
+          bottom: 20,
+          top: 20,
+          left: 20,
+          right: 20,
+          background: "#222222",
+        })
+        .png()
+        .toBuffer()
+        .then(buf => buf.toString("base64"))}`
+    : favIconPngUrl;
+
+  const eruda = (
+    <>
+      <script src="//cdn.jsdelivr.net/npm/eruda"></script>
+      <script>eruda.init();</script>
+    </>
+  );
+
+  const erudaStr = process.env["LEMMY_UI_DEBUG"] ? renderToString(eruda) : "";
+
+  const helmet = Helmet.renderStatic();
+
+  const config: ILemmyConfig = { wsHost: process.env.LEMMY_UI_LEMMY_WS_HOST };
+
+  return `
+  <!DOCTYPE html>
+  <html ${helmet.htmlAttributes.toString()} lang="en">
+  <head>
+  <script>window.isoData = ${JSON.stringify(isoData)}</script>
+  <script>window.lemmyConfig = ${serialize(config)}</script>
+
+  <!-- A remote debugging utility for mobile -->
+  ${erudaStr}
+
+  <!-- Custom injected script -->
+  ${customHtmlHeader}
+
+  ${helmet.title.toString()}
+  ${helmet.meta.toString()}
+
+  <!-- Required meta tags -->
+  <meta name="Description" content="Lemmy">
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link
+     id="favicon"
+     rel="shortcut icon"
+     type="image/x-icon"
+     href=${site?.site_view.site.icon ?? favIconUrl}
+   />
+
+  <!-- Web app manifest -->
+  ${
+    site &&
+    `<link
+        rel="manifest"
+        href={${`data:application/manifest+json;base64,${await generateManifestBase64(
+          site.site_view.site
+        )}`}}
+      />`
+  }
+  <link rel="apple-touch-icon" href=${appleTouchIcon} />
+  <link rel="apple-touch-startup-image" href=${appleTouchIcon} />
+
+  <!-- Styles -->
+  <link rel="stylesheet" type="text/css" href="/static/styles/styles.css" />
+
+  <!-- Current theme and more -->
+  ${helmet.link.toString()}
+  
+  </head>
+
+  <body ${helmet.bodyAttributes.toString()}>
+    <noscript>
+      <div class="alert alert-danger rounded-0" role="alert">
+        <b>Javascript is disabled. Actions will not work.</b>
+      </div>
+    </noscript>
+
+    <div id='root'>${root}</div>
+    <script defer src='/static/js/client.js'></script>
+  </body>
+</html>
+`;
+}

diff --git a/src/shared/components/app/app.tsx b/src/shared/components/app/app.tsx
index 1251a5e46fdea1a9becac9a04d5790a027dcc348..e7e51bef26af707ef727610d5d752eb85bff9754 100644 (file)
--- a/src/shared/components/app/app.tsx
+++ b/src/shared/components/app/app.tsx
@@ -1,6 +1,7 @@
 import { Component } from "inferno";
 import { Provider } from "inferno-i18next-dess";
 import { Route, Switch } from "inferno-router";
+import { IsoDataOptionalSite } from "shared/interfaces";
 import { i18n } from "../../i18next";
 import { routes } from "../../routes";
 import { isAuthPath, setIsoData } from "../../utils";
@@ -13,19 +14,22 @@ import "./styles.scss";
 import { Theme } from "./theme";
 
 export class App extends Component<any, any> {
-  private isoData = setIsoData(this.context);
+  private isoData: IsoDataOptionalSite = setIsoData(this.context);
   constructor(props: any, context: any) {
     super(props, context);
   }
   render() {
     const siteRes = this.isoData.site_res;
-    const siteView = siteRes.site_view;
+    const siteView = siteRes?.site_view;
+    console.log(`Path: ${this.isoData.path}`);
 
     return (
       <>
         <Provider i18next={i18n}>
           <div id="app">
-            <Theme defaultTheme={siteView.local_site.default_theme} />
+            {siteView && (
+              <Theme defaultTheme={siteView.local_site.default_theme} />
+            )}
             <Navbar siteRes={siteRes} />
             <div className="mt-4 p-0 fl-1">
               <Switch>

diff --git a/src/shared/components/app/error-page.tsx b/src/shared/components/app/error-page.tsx
index 5c08dd524442df1c57f2cb9e98c394ebb527c6a2..e093463bc8d2cf1c3e525c972cdb488b0a34bb49 100644 (file)
--- a/src/shared/components/app/error-page.tsx
+++ b/src/shared/components/app/error-page.tsx
@@ -1,9 +1,10 @@
 import { Component } from "inferno";
 import { Link } from "inferno-router";
+import { IsoDataOptionalSite } from "shared/interfaces";
 import { ErrorPageData, setIsoData } from "../../utils";
 
 export class ErrorPage extends Component<any, any> {
-  private isoData = setIsoData(this.context);
+  private isoData: IsoDataOptionalSite = setIsoData(this.context);
 
   constructor(props: any, context: any) {
     super(props, context);
@@ -28,8 +29,8 @@ export class ErrorPage extends Component<any, any> {
             <div>
               <div>
                 If you would like to reach out to one of{" "}
-                {this.isoData.site_res.site_view.site.name}&apos;s admins for
-                support, try the following Matrix addresses:
+                {this.isoData.site_res?.site_view.site.name ?? "this instance"}
+                &apos;s admins for support, try the following Matrix addresses:
               </div>
               <ul>
                 {errorPageData.adminMatrixIds.map(matrixId => (

diff --git a/src/shared/components/app/footer.tsx b/src/shared/components/app/footer.tsx
index bbe499820a42e2d0e71571c6304056d732b669a9..bd66165e13761fd0389410a89b7f7273a0105f9e 100644 (file)
--- a/src/shared/components/app/footer.tsx
+++ b/src/shared/components/app/footer.tsx
@@ -6,7 +6,7 @@ import { docsUrl, joinLemmyUrl, repoUrl } from "../../utils";
 import { VERSION } from "../../version";
 
 interface FooterProps {
-  site: GetSiteResponse;
+  site?: GetSiteResponse;
 }
 
 export class Footer extends Component<FooterProps, any> {
@@ -19,27 +19,27 @@ export class Footer extends Component<FooterProps, any> {
       <nav className="container-lg navbar navbar-expand-md navbar-light navbar-bg p-3">
         <div className="navbar-collapse">
           <ul className="navbar-nav ml-auto">
-            {this.props.site.version !== VERSION && (
+            {this.props.site?.version !== VERSION && (
               <li className="nav-item">
                 <span className="nav-link">UI: {VERSION}</span>
               </li>
             )}
             <li className="nav-item">
-              <span className="nav-link">BE: {this.props.site.version}</span>
+              <span className="nav-link">BE: {this.props.site?.version}</span>
             </li>
             <li className="nav-item">
               <NavLink className="nav-link" to="/modlog">
                 {i18n.t("modlog")}
               </NavLink>
             </li>
-            {this.props.site.site_view.local_site.legal_information && (
+            {this.props.site?.site_view.local_site.legal_information && (
               <li className="nav-item">
                 <NavLink className="nav-link" to="/legal">
                   {i18n.t("legal_information")}
                 </NavLink>
               </li>
             )}
-            {this.props.site.site_view.local_site.federation_enabled && (
+            {this.props.site?.site_view.local_site.federation_enabled && (
               <li className="nav-item">
                 <NavLink className="nav-link" to="/instances">
                   {i18n.t("instances")}

diff --git a/src/shared/components/app/navbar.tsx b/src/shared/components/app/navbar.tsx
index 448e92cbb05cd9f5dee8949a1637efb43c48f0d8..981d6413429f89d4c5c408c331673dd9aceb6cb9 100644 (file)
--- a/src/shared/components/app/navbar.tsx
+++ b/src/shared/components/app/navbar.tsx
@@ -35,7 +35,7 @@ import { Icon } from "../common/icon";
 import { PictrsImage } from "../common/pictrs-image";
 
 interface NavbarProps {
-  siteRes: GetSiteResponse;
+  siteRes?: GetSiteResponse;
 }
 
 interface NavbarState {
@@ -119,7 +119,7 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
 
   // TODO class active corresponding to current page
   navbar() {
-    let siteView = this.props.siteRes.site_view;
+    let siteView = this.props.siteRes?.site_view;
     let person = UserService.Instance.myUserInfo?.local_user_view.person;
     return (
       <nav className="navbar navbar-expand-md navbar-light shadow-sm p-0 px-3">
@@ -127,13 +127,13 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
           <NavLink
             to="/"
             onMouseUp={linkEvent(this, this.handleHideExpandNavbar)}
-            title={siteView.site.description ?? siteView.site.name}
+            title={siteView?.site.description ?? siteView?.site.name ?? "Lemmy"}
             className="d-flex align-items-center navbar-brand mr-md-3"
           >
-            {siteView.site.icon && showAvatars() && (
+            {siteView?.site.icon && showAvatars() && (
               <PictrsImage src={siteView.site.icon} icon />
             )}
-            {siteView.site.name}
+            {siteView?.site.name ?? "Lemmy"}
           </NavLink>
           {UserService.Instance.myUserInfo && (
             <>
@@ -245,7 +245,7 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
                   {i18n.t("create_post")}
                 </NavLink>
               </li>
-              {canCreateCommunity(this.props.siteRes) && (
+              {this.props.siteRes && canCreateCommunity(this.props.siteRes) && (
                 <li className="nav-item">
                   <NavLink
                     to="/create_community"

diff --git a/src/shared/components/common/error-guard.tsx b/src/shared/components/common/error-guard.tsx
index 791fe47e438493c2bca851293ebbb97e58de56ff..db7f5785c86a221df9c18770dbbb20a784d1f0a8 100644 (file)
--- a/src/shared/components/common/error-guard.tsx
+++ b/src/shared/components/common/error-guard.tsx
@@ -13,8 +13,9 @@ class ErrorGuard extends Component<any, any> {
     const errorPageData = this.isoData.routeData[0] as
       | ErrorPageData
       | undefined;
+    const siteRes = this.isoData.site_res;
 
-    if (errorPageData?.type === "error") {
+    if (errorPageData?.type === "error" || !siteRes) {
       return <ErrorPage />;
     } else {
       return this.props.children;

diff --git a/src/shared/components/person/settings.tsx b/src/shared/components/person/settings.tsx
index 95b25901afb97a778dfd0ebd41e74ef7535e868d..477cd6d85133a544c4d912d6a5205eb8c0141c5f 100644 (file)
--- a/src/shared/components/person/settings.tsx
+++ b/src/shared/components/person/settings.tsx
@@ -1231,9 +1231,6 @@ export class Settings extends Component<any, SettingsState> {
       toast(i18n.t(msg.error), "danger");
       return;
     } else if (op == UserOperation.SaveUserSettings) {
-      let data = wsJsonToRes<LoginResponse>(msg);
-      UserService.Instance.login(data);
-      location.reload();
       this.setState({ saveUserSettingsLoading: false });
       toast(i18n.t("saved"));
       window.scrollTo(0, 0);

diff --git a/src/shared/interfaces.ts b/src/shared/interfaces.ts
index 30422afba673992b34b164518eb64658ae2b9df0..fe8a79d4a8517d717c125d65b8c891be2e5dd480 100644 (file)
--- a/src/shared/interfaces.ts
+++ b/src/shared/interfaces.ts
@@ -10,6 +10,9 @@ export interface IsoData {
   site_res: GetSiteResponse;
 }
 
+export type IsoDataOptionalSite = Partial<IsoData> &
+  Pick<IsoData, Exclude<keyof IsoData, "site_res">>;
+
 export interface ILemmyConfig {
   wsHost?: string;
 }

diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index 70faddfae317f585294361b8d5f8e435fc250484..5a39b94c5b8a4e29beb8e9130181fab98e794005 100644 (file)
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -1399,10 +1399,12 @@ export function personSelectName({
   return local ? pName : `${hostname(actor_id)}/${pName}`;
 }
 
-export function initializeSite(site: GetSiteResponse) {
-  UserService.Instance.myUserInfo = site.my_user;
+export function initializeSite(site?: GetSiteResponse) {
+  UserService.Instance.myUserInfo = site?.my_user;
   i18n.changeLanguage(getLanguages()[0]);
-  setupEmojiDataModel(site.custom_emojis);
+  if (site) {
+    setupEmojiDataModel(site.custom_emojis);
+  }
   setupMarkdown();
 }