fix(getfile): fix get file for b64 encoded string

filestack · Mar 31, 2021 · dbc65b7 · dbc65b7
1 parent 30f0b27
commit dbc65b7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/lib/api/upload/file_tools.node.ts b/src/lib/api/upload/file_tools.node.ts
@@ -100,7 +100,12 @@ export const getFile = (input: InputFile, sanitizeOptions?: SanitizeOptions): Pr
 
   if (isFileBase(input)) {
     const matches = input.match(base64Regexp);
-    input = Buffer.from(matches[2], 'base64');
+    console.log(matches, input);
+    if (matches && matches.length === 2) {
+      input = Buffer.from(matches[2], 'base64');
+    } else {
+      input = Buffer.from(input, 'base64');
+    }
   }
 
   if (isFileBuffer(input)) {

diff --git a/src/lib/api/upload/file_tools.spec.node.ts b/src/lib/api/upload/file_tools.spec.node.ts
@@ -22,6 +22,7 @@ jest.mock('fs');
 
 const mockedTestFile = Buffer.from('text text');
 const base64Svg = 'PHN2ZyBoZWlnaHQ9IjEwMCIgd2lkdGg9IjEwMCI+CiAgPGNpcmNsZSBjeD0iNTAiIGN5PSI1MCIgcj0iNDAiIHN0cm9rZT0iYmxhY2siIHN0cm9rZS13aWR0aD0iMyIgZmlsbD0icmVkIiAvPgogIFNvcnJ5LCB5b3VyIGJyb3dzZXIgZG9lcyBub3Qgc3VwcG9ydCBpbmxpbmUgU1ZHLiAgCjwvc3ZnPiA=';
+const base64SvgWithHeader = 'data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMCIgd2lkdGg9IjEwMCI+CiAgPGNpcmNsZSBjeD0iNTAiIGN5PSI1MCIgcj0iNDAiIHN0cm9rZT0iYmxhY2siIHN0cm9rZS13aWR0aD0iMyIgZmlsbD0icmVkIiAvPgogIFNvcnJ5LCB5b3VyIGJyb3dzZXIgZG9lcyBub3Qgc3VwcG9ydCBpbmxpbmUgU1ZHLiAgCjwvc3ZnPiA=';
 
 describe('Api/Upload/FileTools', () => {
   describe('getFileNode', () => {
@@ -75,6 +76,15 @@ describe('Api/Upload/FileTools', () => {
       expect(file.mimetype).toEqual('image/svg+xml');
     });
 
+    it('Should handle base64 encoded string with Header', async () => {
+      const file = await getFile({
+        name: 'test.svg',
+        file: base64SvgWithHeader,
+      });
+
+      expect(file.mimetype).toEqual('image/svg+xml');
+    });
+
     it('Should detect text/plain mimetype', async () => {
       const file = await getFile({
         name: 'test.undefined',