@cocreate/file-server 1.1.2 → 1.2.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.2.0](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.1.3...v1.2.0) (2023-05-05)
+
+
+### Features
+
+* /superadmin to aacess a default admin console ([04a6f15](https://github.com/CoCreate-app/CoCreate-file-server/commit/04a6f15ce0fe441d1aedda20b74d66f5d63abef0))
+* 404.html and 403.html fetched from orgs files, with default fallbacks handeled by platform ([c69faab](https://github.com/CoCreate-app/CoCreate-file-server/commit/c69faab0af96752ca6f6e4b0a2faa3c0584f6f92))
+
+## [1.1.3](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.1.2...v1.1.3) (2023-04-24)
+
+
+### Bug Fixes
+
+* removed dev dependencies ([acb0bea](https://github.com/CoCreate-app/CoCreate-file-server/commit/acb0bea51612f1be47a4f2781e917a9eac45312a))
+
 ## [1.1.2](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.1.1...v1.1.2) (2023-04-24)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file-server",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "A simple file-server component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "file-server",
@@ -45,19 +45,6 @@
     "url": "https://github.com/sponsors/CoCreate-app"
   },
   "main": "./src/index.js",
-  "devDependencies": {
-    "@babel/core": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
-    "babel-loader": "^8.1.0",
-    "clean-webpack-plugin": "^3.0.0",
-    "file-loader": "^6.2.0",
-    "mini-css-extract-plugin": "^1.5.0",
-    "style-loader": "^3.3.1",
-    "terser-webpack-plugin": "^5.1.1",
-    "webpack": "^5.24.4",
-    "webpack-cli": "^4.5.0",
-    "webpack-log": "^3.0.1"
-  },
   "dependencies": {
     "@cocreate/docs": "^1.5.13",
     "@cocreate/hosting": "^1.7.13",

package/src/index.js

@@ -11,25 +11,36 @@ const organizations = new Map();
 
 class CoCreateFileSystem {
     constructor(crud, render) {
+        
+        async function defaultFiles(fileName) {
+            let file = await crud.readDocument({ 
+                collection: 'files',
+                filter: {
+                    query: [
+                        {name: "path", value: fileName, operator: "$eq"}
+                    ]
+                },
+                organization_id: process.env.organization_id
+            })
+            if (!file || !file.document || !file.document[0])
+                return ''
+            return file.document[0].src
+        }
+
+        let default403, default404, hostNotFound
+        defaultFiles('/403.html').then((file) => {
+            default403 = file
+        })
+        defaultFiles('/404.html').then((file) => {
+            default404 = file
+        })
+        defaultFiles('/hostNotFound.html').then((file) => {
+            hostNotFound = file
+        })
+
         this.router = router.get('/*', async(req, res) => {
             let hostname = req.hostname;
-
             let organization_id = organizations.get(hostname);
-            // console.log(req.protocol, req.secure)
-            // let ddns = await certManager.checkDns(hostname)
-            // let hasCert = await certManager.checkCert(hostname)
-            // console.log(hostname, 'crt==', hasCert)
-            // ToDo: check if secured domain by running command 
-            // sudo certbot certificates using spawn
-            // console.dir(req.headers.host)
-            // dns.resolve(hostname, 'TXT', (err, records) => {
-            //     if (records)
-            //         organization_id = records[0][0];
-            //     if (err)
-            //         console.log(hostname, err);
-            // });
-               
-    
             if (!organization_id) {
                 let organization = await crud.readDocument({ 
                     collection: 'organizations',
@@ -40,8 +51,11 @@ class CoCreateFileSystem {
                     },
                     organization_id: process.env.organization_id
                 })
-                if (!organization || !organization.document || !organization.document[0])
-                    return res.send('Organization cannot be found using the host---: ' + hostname + ' in platformDB: ' + process.env.organization_id);
+
+                if (!organization || !organization.document || !organization.document[0]) {
+                    hostNotFound = hostNotFound || 'Organization cannot be found using the host: ' + hostname + ' in platformDB: ' + process.env.organization_id 
+                    return res.send(hostNotFound);
+                }
 
                 organization_id = organization.document[0]._id
                 organizations.set(hostname, organization_id)
@@ -51,17 +65,14 @@ class CoCreateFileSystem {
             if (parameters){}
             if (url.endsWith('/')) {
                 url += "index.html";
-            }
-            else {
+            } else {
                 let directory = url.split("/").slice(-1)[0];
                 if (!directory.includes('.')){
                     url += "/index.html";
                 }
             }
-        
-            url = url.startsWith('/ws') ? url.substring(3) : url; // dev
-            
-            let file = await crud.readDocument({
+                    
+            let data = {
                 collection: 'files',
                 filter: {
                     query: [
@@ -70,14 +81,40 @@ class CoCreateFileSystem {
                     ]
                 },
                 organization_id
-            });
+            }
+
+            if (url.startsWith('/superadmin')) 
+                data.organization_id = process.env.organization_id
+
+            let file = await crud.readDocument(data);
         
-            if (!file || !file.document || !file.document[0])
-                return res.status(404).send(`${url} could not be found for ${organization_id}`);
-            
+            if (!file || !file.document || !file.document[0]) {
+                data.filter.query[1].value = '/404.html'
+                if (data.organization_id !== organization_id)
+                    data.organization_id = organization_id
+
+                let pageNotFound = await crud.readDocument(data); 
+                if (!pageNotFound || !pageNotFound.document || !pageNotFound.document[0])
+                    pageNotFound = default404 || `${url} could not be found for ${organization_id}`
+                else 
+                    pageNotFound = pageNotFound.document[0].src
+                return res.status(404).send(pageNotFound);
+            }
+
             file = file.document[0]
-            if (!file['public'] || file['public'] === "false")
-                return res.status(404).send(`access not allowed`);
+            if (!file['public'] || file['public'] === "false") {
+                data.filter.query[1].value = '/403.html'
+                if (data.organization_id !== organization_id)
+                    data.organization_id = organization_id
+
+                let pageForbidden = await crud.readDocument(data); 
+                if (!pageForbidden || !pageForbidden.document || !pageForbidden.document[0])
+                    pageForbidden = default403 || `${url} access not allowed for ${organization_id}`
+                else 
+                    pageForbidden = pageForbidden.document[0].src
+
+                return res.status(403).send(pageForbidden);
+            }
             
             let src;
             if (file['src'])
@@ -93,8 +130,16 @@ class CoCreateFileSystem {
                 src = fileSrc[file['name']];
             }
         
-            if (!src)
-                return res.status(404).send(`src could not be found`);
+            if (!src) {
+                data.filter.query[1].value = '/404.html'
+                if (data.organization_id !== organization_id)
+                    data.organization_id = organization_id
+
+                let pageNotFound = await crud.readDocument(data); 
+                if (!pageNotFound || !pageNotFound.document || !pageNotFound.document[0])
+                    pageNotFound = `${url} could not be found for ${organization_id}` 
+                return res.status(404).send(pageNotFound);
+            }
         
             let contentType = file['content-type'] || mime.lookup(url) || 'text/html';
 
@@ -108,6 +153,11 @@ class CoCreateFileSystem {
                     console.warn('server-render: ' + err.message)
                 }
             } 
+            if (url.startsWith('/superadmin')) {
+                let apikey = "e968b3a6-435e-4d79-a251-b41d7d08"
+                src = src.replace('5ff747727005da1c272740ab', organization_id).replace('2061acef-0451-4545-f754-60cf8160', apikey)
+                console.log('getapikey superadmin')
+            }
 
             return res.type(contentType).send(src);