@cocreate/file-server 1.2.0 → 1.3.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [1.3.0](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.2.1...v1.3.0) (2023-05-11)
+
+
+### Bug Fixes
+
+* apikey renamed to key ([3cd1648](https://github.com/CoCreate-app/CoCreate-file-server/commit/3cd16488b21b0110ec242b1c02dffe02328153c9))
+* replace key ([fa78c05](https://github.com/CoCreate-app/CoCreate-file-server/commit/fa78c0557c380e149336b4eefbe8e797b86b3409))
+
+
+### Features
+
+* redirect to /superadmin ([9094337](https://github.com/CoCreate-app/CoCreate-file-server/commit/909433742d08dadb1bc9f61b45850dd6eec8e1c2))
+
+## [1.2.1](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.2.0...v1.2.1) (2023-05-10)
+
+
+### Bug Fixes
+
+* handeling of superadmin signup ([06a5b96](https://github.com/CoCreate-app/CoCreate-file-server/commit/06a5b963bd8f552d02baa3ac9f749071a8387653))
+
 # [1.2.0](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.1.3...v1.2.0) (2023-05-05)
 
 

package/CoCreate.config.js

@@ -1,6 +1,6 @@
 module.exports = {
     "config": {
-        "apiKey": "2061acef-0451-4545-f754-60cf8160",
+        "key": "2061acef-0451-4545-f754-60cf8160",
         "organization_id": "5ff747727005da1c272740ab",
         "host": "general.cocreate.app"
     },

package/docs/index.html

@@ -92,7 +92,7 @@
         </div>
         <script>
             var CoCreateConfig = {
-                apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
+                key: '2061acef-0451-4545-f754-60cf8160',
                 organization_id: '5ff747727005da1c272740ab'
             }
         </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file-server",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "A simple file-server component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "file-server",

package/src/index.js

@@ -27,7 +27,7 @@ class CoCreateFileSystem {
             return file.document[0].src
         }
 
-        let default403, default404, hostNotFound
+        let default403, default404, hostNotFound, signup
         defaultFiles('/403.html').then((file) => {
             default403 = file
         })
@@ -37,12 +37,15 @@ class CoCreateFileSystem {
         defaultFiles('/hostNotFound.html').then((file) => {
             hostNotFound = file
         })
+        defaultFiles('/superadmin/signup.html').then((file) => {
+            signup = file
+        })
 
         this.router = router.get('/*', async(req, res) => {
             let hostname = req.hostname;
-            let organization_id = organizations.get(hostname);
-            if (!organization_id) {
-                let organization = await crud.readDocument({ 
+            let organization = organizations.get(hostname);
+            if (!organization) {
+                let org = await crud.readDocument({ 
                     collection: 'organizations',
                     filter: {
                         query: [
@@ -52,15 +55,18 @@ class CoCreateFileSystem {
                     organization_id: process.env.organization_id
                 })
 
-                if (!organization || !organization.document || !organization.document[0]) {
+                if (!org || !org.document || !org.document[0]) {
                     hostNotFound = hostNotFound || 'Organization cannot be found using the host: ' + hostname + ' in platformDB: ' + process.env.organization_id 
-                    return res.send(hostNotFound);
+                    organization = {_id: process.env.organization_id, key: process.env.key}
+                    if (!req.url.startsWith('/superadmin')) 
+                        return res.redirect(301, 'https://' + hostname + '/superadmin/signup.html')                    
+                } else {
+                    organization = {_id: org.document[0]._id, key: org.document[0].key}
+                    organizations.set(hostname, organization)
                 }
-
-                organization_id = organization.document[0]._id
-                organizations.set(hostname, organization_id)
             }
 
+            let organization_id = organization._id
             let [url, parameters] = req.url.split("?");
             if (parameters){}
             if (url.endsWith('/')) {
@@ -153,10 +159,9 @@ 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')
+            if (process.env.organization_id !== organization_id && url.startsWith('/superadmin') && contentType === 'text/html' && !url.includes('/signup.html')) {
+                src = src.replace(process.env.organization_id, organization_id)
+                src = src.replace(process.env.key, organization.key)
             }
 
             return res.type(contentType).send(src);