Metadata tags

src/ParseFile.js

@@ -418,39 +418,45 @@ const DefaultController = {
     if (source.format !== 'file') {
       throw new Error('saveFile can only be used with File-type sources.');
     }
-    // To directly upload a File, we use a REST-style AJAX request
-    const headers = {
-      'X-Parse-Application-ID': CoreManager.get('APPLICATION_ID'),
-      'Content-Type': source.type || (source.file ? source.file.type : null)
-    };
-    const jsKey = CoreManager.get('JAVASCRIPT_KEY');
-    if (jsKey) {
-      headers['X-Parse-JavaScript-Key'] = jsKey;
-    }
-    let sessionToken = options.sessionToken;
-    const userController = CoreManager.getUserController();
-    if (!sessionToken && userController) {
-      const currentUser = await userController.currentUserAsync();
-      sessionToken =  currentUser ? currentUser.getSessionToken() : undefined;
-    }
-    if (sessionToken) {
-      headers['X-Parse-Session-Token'] = sessionToken;
-    }
-    let url = CoreManager.get('SERVER_URL');
-    if (url[url.length - 1] !== '/') {
-      url += '/';
+    if (source.base64) {
+      // If base64 data has already been created, go ahead and save it.
+      source.format = 'base64';
+      return await DefaultController.saveBase64(name, source, options);
     }
-    url += 'files/' + name;
-    return CoreManager.getRESTController().ajax('POST', url, source.file, headers, options).then(res=>res.response)
+    const base64Data = await new Promise((res, rej) => {
+      // eslint-disable-next-line no-undef
+      const reader = new FileReader();
+      reader.readAsDataURL(source.file);
+      reader.onload = () => res(reader.result);
+      reader.onerror = error => rej(error);
+    });
+    // we only want the data after the comma
+    // For example: "data:application/pdf;base64,JVBERi0xLjQKJ..." we would only want "JVBERi0xLjQKJ..."
+    const [first, second] = base64Data.split(',');
+    // in the event there is no 'data:application/pdf;base64,' at the beginning of the base64 string
+    // use the entire string instead
+    const data = second ? second : first;
+    const newSource = {
+      format: 'base64',
+      base64: data,
+      type: source.type || (source.file ? source.file.type : null),
+    };
+    return await DefaultController.saveBase64(name, newSource, options);
   },
 
   saveBase64: function(name: string, source: FileSource, options?: FullOptions) {
     if (source.format !== 'base64') {
       throw new Error('saveBase64 can only be used with Base64-type sources.');
     }
-    const data: { base64: any; _ContentType?: any } = {
-      base64: source.base64
+    const data: { base64: any; _ContentType?: any, fileData: Object } = {
+      base64: source.base64,
+      fileData: {
+        metadata: { ...options.metadata },
+        tags: { ...options.tags },
+      },
     };
+    delete options.metadata;
+    delete options.tags;
     if (source.type) {
       data._ContentType = source.type;
     }

src/__tests__/ParseFile-test.js

@@ -378,8 +378,8 @@ describe('FileController', () => {
 
     return file.save().then(function(f) {
       expect(f).toBe(file);
-      expect(f.name()).toBe('/api.parse.com/1/files/parse.txt');
-      expect(f.url()).toBe('https://files.parsetfss.com/a//api.parse.com/1/files/parse.txt');
+      expect(f.name()).toBe('parse.txt');
+      expect(f.url()).toBe('https://files.parsetfss.com/a/parse.txt');
     });
   });
 
@@ -652,8 +652,8 @@ describe('FileController', () => {
 
     return file.save({ sessionToken: 'testing_sessionToken' }).then(function(f) {
       expect(f).toBe(file);
-      expect(f.name()).toBe('/api.parse.com/1/files/parse.txt');
-      expect(f.url()).toBe('https://files.parsetfss.com/a//api.parse.com/1/files/parse.txt');
+      expect(f.name()).toBe('parse.txt');
+      expect(f.url()).toBe('https://files.parsetfss.com/a/parse.txt');
     });
   });
 
@@ -690,9 +690,63 @@ describe('FileController', () => {
 
     return file.save().then(function(f) {
       expect(f).toBe(file);
-      expect(f.name()).toBe('/api.parse.com/1/files/parse.txt');
-      expect(f.url()).toBe('https://files.parsetfss.com/a//api.parse.com/1/files/parse.txt');
+      expect(f.name()).toBe('parse.txt');
+      expect(f.url()).toBe('https://files.parsetfss.com/a/parse.txt');
+    });
+  });
+
+  it('should save file using saveFile with metadata and tags', async () => {
+    CoreManager.set('UserController', {
+      currentUserAsync() {
+        return Promise.resolve({
+          getSessionToken() {
+            return 'currentUserToken';
+          }
+        });
+      }
+    });
+    const request = jest.fn((method, path) => {
+      const name = path.substr(path.indexOf('/') + 1);
+      return Promise.resolve({
+        name: name,
+        url: 'https://files.parsetfss.com/a/' + name
+      });
     });
+    const ajax = function(method, path, data, headers) {
+      expect(headers['X-Parse-Session-Token']).toBe('currentUserToken')
+      const name = path.substr(path.indexOf('/') + 1);
+      return Promise.resolve({
+        response: {
+          name: name,
+          url: 'https://files.parsetfss.com/a/' + name
+        }
+      });
+    };
+    CoreManager.setRESTController({ request, ajax });
+    const file = new ParseFile('parse.txt', [61, 170, 236, 120]);
+    file._source.format = 'file';
+    file.addMetadata('foo', 'bar');
+    file.addTag('bar', 'foo');
+    const f = await file.save();
+    expect(f).toBe(file);
+    expect(f.name()).toBe('parse.txt');
+    expect(f.url()).toBe('https://files.parsetfss.com/a/parse.txt');
+    expect(request).toHaveBeenCalledWith(
+      'POST',
+      'files/parse.txt',
+      {
+        base64: 'ParseA==',
+        fileData: {
+          metadata: {
+            foo: 'bar',
+          },
+          tags: {
+            bar: 'foo',
+          },
+        },
+      },
+      { requestTask: expect.any(Function) },
+    );
   });
 
   it('saves files via object saveAll options', async () => {