@silexlabs/silex 3.0.0-alpha.66 → 3.0.0-alpha.67

package/dist/client/js/main.js

@@ -97,7 +97,7 @@ var silex;(()=>{var t={357:function(t){var e;"undefined"!=typeof globalThis?glob
                 ><span>${e.text}</span></div>
               `))}
           </header>
-        `,r),document.body.appendChild(r),t.on("load",(()=>{n.view.el.appendChild(r)}))),t.Commands.add(e.command,{run(){e.link&&window.open(e.link),e.attributes.containerClassName&&(n.set("visible",!0),r.classList.remove("gjs-hidden"),t.Canvas.getFrameEl().classList.add("silex-squeeze-left"))},stop(){e.attributes.containerClassName&&(n.set("visible",!1),r.classList.add("gjs-hidden"),t.Canvas.getFrameEl().classList.remove("silex-squeeze-left"))}})})),t.on("load device:select page",(()=>{!function(){const e=n.view.el,r=t.Canvas.getFrameEl();r.classList.remove("enable-squeeze"),setTimeout((()=>{const t=r.getClientRects()[0]?.left,n=e.getClientRects()[0]?.right;t<n||!n?r.classList.add("enable-squeeze"):r.classList.remove("enable-squeeze")}),400),n.get("visible")?r.classList.add("silex-squeeze-left"):r.classList.remove("silex-squeeze-left")}()}))},Nn=document.createElement("div");let In;const Dn="open-settings";let $n="v3";const Rn=nt.plugins.add("settings-dialog",((t,e)=>{try{$n="3.0.0-alpha.66"}catch(t){}console.info("Silex version:",$n),t.Commands.add(Dn,{run:(e,n,{page:r})=>{In=t.Modal.open({title:r?"Page settings":"Site Settings",content:"",attributes:{class:"settings-dialog"}}).onceClose((()=>{n.set("active",0),t.stopCommand(Dn)})),function(t,e,n=t.getModel()){const r=n.get("settings")||{};n.set("settings",r),we(ne`
+        `,r),document.body.appendChild(r),t.on("load",(()=>{n.view.el.appendChild(r)}))),t.Commands.add(e.command,{run(){e.link&&window.open(e.link),e.attributes.containerClassName&&(n.set("visible",!0),r.classList.remove("gjs-hidden"),t.Canvas.getFrameEl().classList.add("silex-squeeze-left"))},stop(){e.attributes.containerClassName&&(n.set("visible",!1),r.classList.add("gjs-hidden"),t.Canvas.getFrameEl().classList.remove("silex-squeeze-left"))}})})),t.on("load device:select page",(()=>{!function(){const e=n.view.el,r=t.Canvas.getFrameEl();r.classList.remove("enable-squeeze"),setTimeout((()=>{const t=r.getClientRects()[0]?.left,n=e.getClientRects()[0]?.right;t<n||!n?r.classList.add("enable-squeeze"):r.classList.remove("enable-squeeze")}),400),n.get("visible")?r.classList.add("silex-squeeze-left"):r.classList.remove("silex-squeeze-left")}()}))},Nn=document.createElement("div");let In;const Dn="open-settings";let $n="v3";const Rn=nt.plugins.add("settings-dialog",((t,e)=>{try{$n="3.0.0-alpha.67"}catch(t){}console.info("Silex version:",$n),t.Commands.add(Dn,{run:(e,n,{page:r})=>{In=t.Modal.open({title:r?"Page settings":"Site Settings",content:"",attributes:{class:"settings-dialog"}}).onceClose((()=>{n.set("active",0),t.stopCommand(Dn)})),function(t,e,n=t.getModel()){const r=n.get("settings")||{};n.set("settings",r),we(ne`
     <p>The page settings will override site settings, <a href="https://github.com/silexlabs/Silex/wiki/Settings" target="_blank">more info about settings here</a>.</p>
     <form class="silex-form">
       <h2>General settings</h2>

package/dist/server/server/api/connectorApi.js

@@ -15,6 +15,13 @@ function default_1(config) {
     return router;
 }
 exports.default = default_1;
+function validateStatus(status, _defautl = 500) {
+    status = parseInt(status.toString());
+    if (status >= 100 && status < 600)
+        return status;
+    console.warn(`Invalid status code ${status}, returning default ${_defautl}}`);
+    return _defautl;
+}
 async function routeUser(req, res) {
     try {
         const config = (0, validation_1.requiredParam)(req.app.get('config'), 'Config object on express js APP');
@@ -45,7 +52,7 @@ async function routeUser(req, res) {
     }
     catch (error) {
         console.error('Error in the login status request', error);
-        res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
+        res.status(validateStatus(error?.code ?? error?.httpStatusCode, 500)).json({
             error: true,
             message: error.message,
         });
@@ -64,7 +71,7 @@ async function routeListConnectors(req, res) {
         }
         catch (error) {
             console.error('Error while listing connectors', error);
-            res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
+            res.status(validateStatus(error?.code ?? error?.httpStatusCode, 500)).json({
                 error: true,
                 message: 'Error while listing connectors: ' + error.message,
             });
@@ -72,7 +79,7 @@ async function routeListConnectors(req, res) {
     }
     catch (error) {
         console.error('Error in the list connectors request', error);
-        res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
+        res.status(validateStatus(error?.code ?? error?.httpStatusCode, 400)).json({
             error: true,
             message: 'Error in the list connectors request: ' + error.message,
         });
@@ -105,7 +112,7 @@ async function routeLogin(req, res) {
     }
     catch (error) {
         console.error('Error in the login request', error);
-        res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
+        res.status(validateStatus(error?.code ?? error?.httpStatusCode, 400)).json({
             error: true,
             message: 'Error in the login request: ' + error.message,
         });
@@ -137,7 +144,7 @@ async function routeLoginSuccess(req, res) {
     }
     catch (error) {
         res
-            .status(error?.code ?? error?.httpStatusCode ?? 500)
+            .status(validateStatus(error?.code ?? error?.httpStatusCode, 500))
             .send(getEndAuthHtml(error.message, true));
     }
 }
@@ -160,7 +167,7 @@ async function routeLogout(req, res) {
         }
         catch (error) {
             console.error('Error while logging out', error);
-            res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
+            res.status(validateStatus(error?.code ?? error?.httpStatusCode, 500)).json({
                 error: true,
                 message: 'Error while logging out: ' + error.message,
             });
@@ -169,7 +176,7 @@ async function routeLogout(req, res) {
     }
     catch (error) {
         console.error('Error in the logout request', error);
-        res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
+        res.status(validateStatus(error?.code ?? error?.httpStatusCode, 400)).json({
             error: true,
             message: 'Error in the logout request: ' + error.message,
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@silexlabs/silex",
   "description": "Free and easy website builder for everyone.",
-  "version": "3.0.0-alpha.66",
+  "version": "3.0.0-alpha.67",
   "version:backwardcompat": "3.0.0",
   "author": {
     "name": "Alex Hoyau",

package/src/ts/server/api/connectorApi.ts

@@ -45,6 +45,20 @@ export default function(config: ServerConfig) {
   return router
 }
 
+/**
+ * Method to validate HTTP status codes
+ * Returns a suitable error code if it is not valid
+ */
+function validateStatus(status: number, _defautl = 500): number {
+  // Make sure it is a string
+  status = parseInt(status.toString())
+  // Check the status code
+  if (status >= 100 && status < 600) return status
+  // Invalid status code
+  console.warn(`Invalid status code ${status}, returning default ${_defautl}}`)
+  return _defautl
+}
+
 /**
  * Express route to check if the user is logged in
  * Returns user data and connector data
@@ -79,7 +93,7 @@ async function routeUser(req: Request, res: Response) {
     res.json(user as ApiConnectorUserResponse)
   } catch (error) {
     console.error('Error in the login status request', error)
-    res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
+    res.status(validateStatus(error?.code ?? error?.httpStatusCode, 500)).json({
       error: true,
       message: error.message,
     } as ApiResponseError)
@@ -101,14 +115,14 @@ async function routeListConnectors(req: Request, res: Response) {
       res.json(list as ApiConnectorListResponse)
     } catch (error) {
       console.error('Error while listing connectors', error)
-      res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
+      res.status(validateStatus(error?.code ?? error?.httpStatusCode, 500)).json({
         error: true,
         message: 'Error while listing connectors: ' + error.message,
       } as ApiResponseError)
     }
   } catch (error) {
     console.error('Error in the list connectors request', error)
-    res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
+    res.status(validateStatus(error?.code ?? error?.httpStatusCode, 400)).json({
       error: true,
       message: 'Error in the list connectors request: ' + error.message,
     } as ApiResponseError)
@@ -148,7 +162,7 @@ async function routeLogin(req: Request, res: Response) {
     }
   } catch (error) {
     console.error('Error in the login request', error)
-    res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
+    res.status(validateStatus(error?.code ?? error?.httpStatusCode, 400)).json({
       error: true,
       message: 'Error in the login request: ' + error.message,
     } as ApiResponseError)
@@ -248,7 +262,7 @@ async function routeLoginSuccess(req: Request, res: Response) {
     res.send(getEndAuthHtml('Logged in', false, connectorId, connector.getOptions(body)))
   } catch (error) {
     res
-      .status(error?.code ?? error?.httpStatusCode ?? 500)
+      .status(validateStatus(error?.code ?? error?.httpStatusCode, 500))
       .send(getEndAuthHtml(error.message, true))
   }
 }
@@ -276,7 +290,7 @@ async function routeLogout(req: Request, res: Response) {
       } as ApiResponseError)
     } catch (error) {
       console.error('Error while logging out', error)
-      res.status(error?.code ?? error?.httpStatusCode ?? 500).json({
+      res.status(validateStatus(error?.code ?? error?.httpStatusCode, 500)).json({
         error: true,
         message: 'Error while logging out: ' + error.message,
       } as ApiResponseError)
@@ -284,7 +298,7 @@ async function routeLogout(req: Request, res: Response) {
     }
   } catch (error) {
     console.error('Error in the logout request', error)
-    res.status(error?.code ?? error?.httpStatusCode ?? 400).json({
+    res.status(validateStatus(error?.code ?? error?.httpStatusCode, 400)).json({
       error: true,
       message: 'Error in the logout request: ' + error.message,
     } as ApiResponseError)