From f1fa35564cd4e06d81277a5f8c72357447f38ba6 Mon Sep 17 00:00:00 2001
From: slaveeks <chernyshev2001@icloud.com>
Date: Thu, 7 Jul 2022 11:08:35 +0300
Subject: [PATCH] Added checking favicon before uploading function, removed
 passing locals to views

---
 src/backend/app.ts                 | 23 ++++++++++++++---------
 src/backend/routes/aliases.ts      |  1 -
 src/backend/routes/auth.ts         |  3 ---
 src/backend/routes/home.ts         |  3 +--
 src/backend/routes/pages.ts        |  3 ---
 src/backend/views/layout.twig      |  6 +++---
 src/backend/views/pages/index.twig |  2 ++
 7 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/backend/app.ts b/src/backend/app.ts
index 3a5ee87..51dd6a4 100644
--- a/src/backend/app.ts
+++ b/src/backend/app.ts
@@ -24,15 +24,20 @@ app.set('views', path.join(__dirname, './', 'views'));
 app.set('view engine', 'twig');
 require('./utils/twig');
 
-// Upload favicon by url, it's path on server is '/temp/favicon.{format}'
-downloadFavicon(favicon).then((res) => {
-  app.locals.favicon = res;
-  console.log('Favicon successfully uploaded');
-})
-  .catch( (err) => {
-    console.log(err);
-    console.log('Favicon has not uploaded');
-  });
+// Check if favicon is not empty
+if (favicon) {
+  // Upload favicon by url, it's path on server is '/temp/favicon.{format}'
+  downloadFavicon(favicon).then((res) => {
+    app.locals.favicon = res;
+    console.log('Favicon successfully uploaded');
+  })
+    .catch( (err) => {
+      console.log(err);
+      console.log('Favicon has not uploaded');
+    });
+} else {
+  console.log('Favicon is empty');
+}
 
 app.use(morgan('dev'));
 app.use(express.json());
diff --git a/src/backend/routes/aliases.ts b/src/backend/routes/aliases.ts
index b6d5eea..1dc2195 100644
--- a/src/backend/routes/aliases.ts
+++ b/src/backend/routes/aliases.ts
@@ -36,7 +36,6 @@ router.get('*', verifyToken, async (req: Request, res: Response) => {
           page,
           pageParent,
           config: req.app.locals.config,
-          favicon: req.app.locals.favicon,
         });
       }
     }
diff --git a/src/backend/routes/auth.ts b/src/backend/routes/auth.ts
index c6cb6a8..597ce78 100644
--- a/src/backend/routes/auth.ts
+++ b/src/backend/routes/auth.ts
@@ -28,7 +28,6 @@ router.post('/auth', parseForm, csrfProtection, async (req: Request, res: Respon
         title: 'Login page',
         header: 'Password not set',
         csrfToken: req.csrfToken(),
-        favicon: req.app.locals.favicon,
       });
 
       return;
@@ -39,7 +38,6 @@ router.post('/auth', parseForm, csrfProtection, async (req: Request, res: Respon
         title: 'Login page',
         header: 'Wrong password',
         csrfToken: req.csrfToken(),
-        favicon: req.app.locals.favicon,
       });
 
       return;
@@ -62,7 +60,6 @@ router.post('/auth', parseForm, csrfProtection, async (req: Request, res: Respon
       title: 'Login page',
       header: 'Password not set',
       csrfToken: req.csrfToken(),
-      favicon: req.app.locals.favicon
     });
 
     return;
diff --git a/src/backend/routes/home.ts b/src/backend/routes/home.ts
index 86d9af8..ffe0148 100644
--- a/src/backend/routes/home.ts
+++ b/src/backend/routes/home.ts
@@ -10,8 +10,7 @@ router.get('/', verifyToken, async (req: Request, res: Response) => {
   if (config.startPage) {
     return res.redirect(config.startPage);
   }
-  res.render('pages/index', { isAuthorized: res.locals.isAuthorized,
-    favicon: req.app.locals.favicon });
+  res.render('pages/index', { isAuthorized: res.locals.isAuthorized });
 });
 
 export default router;
diff --git a/src/backend/routes/pages.ts b/src/backend/routes/pages.ts
index 5937e10..e345722 100644
--- a/src/backend/routes/pages.ts
+++ b/src/backend/routes/pages.ts
@@ -45,7 +45,6 @@ router.get('/page/edit/:id', verifyToken, allowEdit, async (req: Request, res: R
       page,
       parentsChildrenOrdered,
       pagesAvailable,
-      favicon: req.app.locals.favicon,
     });
   } catch (error) {
     res.status(404);
@@ -67,8 +66,6 @@ router.get('/page/:id', verifyToken, async (req: Request, res: Response, next: N
     res.render('pages/page', {
       page,
       pageParent,
-      config: req.app.locals.config,
-      favicon: req.app.locals.favicon,
     });
   } catch (error) {
     res.status(404);
diff --git a/src/backend/views/layout.twig b/src/backend/views/layout.twig
index ea843a1..fdaf8f9 100644
--- a/src/backend/views/layout.twig
+++ b/src/backend/views/layout.twig
@@ -17,11 +17,11 @@
   <body>
     {% include "components/header.twig" with res.locals.isAuthorized %}
     <div class="docs">
-      
+
       {% include "components/sidebar.twig" %}
-      
+
       <div class="docs__content">
-        
+
         <div class="docs__content-inner">
           {% block body %}{% endblock %}
         </div>
diff --git a/src/backend/views/pages/index.twig b/src/backend/views/pages/index.twig
index 883a14f..33d0a17 100644
--- a/src/backend/views/pages/index.twig
+++ b/src/backend/views/pages/index.twig
@@ -10,6 +10,8 @@
   <meta property="og:site_name" content="{{ config.title }}" />
   <meta name="description" property="og:description" content="{{ config.description }}">
 </head>
+<script>
+</script>
 <body class="landing-body">
   {% include "components/header.twig" %}
   <div class="landing-loader" id="frame-loader">