@cocreate/file-server 1.16.0 → 1.16.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.16.1](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.16.0...v1.16.1) (2024-01-11)
+
+
+### Bug Fixes
+
+* wildcard without ext should defualt to */index.html ([7779170](https://github.com/CoCreate-app/CoCreate-file-server/commit/77791709688373f51db672937f3b64c1f1fae5a3))
+
 # [1.16.0](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.15.2...v1.16.0) (2024-01-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file-server",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "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

@@ -41,25 +41,18 @@ class CoCreateFileSystem {
             res.setHeader('Access-Control-Allow-Methods', '');
             res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization');
 
+            let active = crud.wsManager.organizations.get(organization_id)
+            if (active === false) {
+                let balanceFalse = await getDefaultFile('/balanceFalse.html')
+                return sendResponse(balanceFalse.object[0].src, 403, { 'Content-Type': 'text/html', 'Account-Balance': 'false', 'storage': organization.storage })
+            }
+
             let parameters = valideUrl.searchParams;
             if (parameters.size) {
                 console.log('parameters', parameters)
             }
 
             let pathname = valideUrl.pathname;
-            if (pathname.endsWith('/')) {
-                pathname += "index.html";
-            } else if (!pathname.startsWith('/.well-known/acme-challenge')) {
-                let directory = pathname.split("/").slice(-1)[0];
-                if (!directory.includes('.'))
-                    pathname += "/index.html";
-            }
-
-            let active = crud.wsManager.organizations.get(organization_id)
-            if (active === false) {
-                let balanceFalse = await getDefaultFile('/balanceFalse.html')
-                return sendResponse(balanceFalse.object[0].src, 403, { 'Content-Type': 'text/html', 'Account-Balance': 'false', 'storage': organization.storage })
-            }
 
             let lastIndex = pathname.lastIndexOf('/');
             let wildcardPath = pathname.substring(0, lastIndex + 1);
@@ -70,7 +63,15 @@ class CoCreateFileSystem {
                 let fileExtension = wildcard.substring(fileLastIndex); // Get extension
                 wildcard = wildcardPath + '*' + fileExtension; // Create wildcard for file name
             } else {
-                wildcard = wildcardPath + '*'; // Append '*' if it's just a path or folder
+                wildcard = wildcardPath + '*/index.html'; // Append '*' if it's just a path or folder
+            }
+
+            if (pathname.endsWith('/')) {
+                pathname += "index.html";
+            } else if (!pathname.startsWith('/.well-known/acme-challenge')) {
+                let directory = pathname.split("/").slice(-1)[0];
+                if (!directory.includes('.'))
+                    pathname += "/index.html";
             }
 
             // console.log("Wildcard: ", wildcard);