First pass at v2_api

[lemmy-ui.git] / src / server / index.tsx

diff --git a/src/server/index.tsx b/src/server/index.tsx
index cc8c3b0bc48a6511c1ba85543aa9e3e9ac46a3d6..a2bcd4abe9c0918497d524809404b7a801dc77c2 100644 (file)
--- a/src/server/index.tsx
+++ b/src/server/index.tsx
@@ -8,8 +8,7 @@ import { App } from '../shared/components/app';
 import { InitialFetchRequest, IsoData } from '../shared/interfaces';
 import { routes } from '../shared/routes';
 import IsomorphicCookie from 'isomorphic-cookie';
-import { setAuth } from '../shared/utils';
-import { GetSiteForm, LemmyHttp } from 'lemmy-js-client';
+import { GetSite, LemmyHttp } from 'lemmy-js-client';
 import process from 'process';
 import { Helmet } from 'inferno-helmet';
 import { initializeSite } from '../shared/initialize';
@@ -30,8 +29,7 @@ server.get('/*', async (req, res) => {
   const context = {} as any;
   let auth: string = IsomorphicCookie.load('jwt', req);
 
-  let getSiteForm: GetSiteForm = {};
-  setAuth(getSiteForm, auth);
+  let getSiteForm: GetSite = { auth };
 
   let promises: Promise<any>[] = [];
 
@@ -70,14 +68,14 @@ server.get('/*', async (req, res) => {
 
   let isoData: IsoData = {
     path: req.path,
-    site,
+    site_res: site,
     routeData,
     lang,
   };
 
   const wrapper = (
     <StaticRouter location={req.url} context={isoData}>
-      <App site={isoData.site} />
+      <App siteRes={isoData.site_res} />
     </StaticRouter>
   );
   if (context.url) {