Keep consistent with file id

Author: Ben Stahl

lib/handlers/HeadHandler.js

@@ -17,8 +17,8 @@ class HeadHandler extends BaseHandler {
             return super.send(res, 404);
         }
 
-        const file_name = match[1];
-        return this.store.getOffset(file_name)
+        const file_id = match[1];
+        return this.store.getOffset(file_id)
             .then((file) => {
                 // The Server MUST prevent the client and/or proxies from
                 // caching the response by adding the Cache-Control: no-store

lib/handlers/PatchHandler.js

@@ -16,7 +16,7 @@ class PatchHandler extends BaseHandler {
         if (!match) {
             return super.send(res, 404);
         }
-        const file_name = match[1];
+        const file_id = match[1];
 
         const content_type = req.headers['content-type'];
         // All PATCH requests MUST use Content-Type: application/offset+octet-stream.
@@ -33,15 +33,15 @@ class PatchHandler extends BaseHandler {
             return super.send(res, 403);
         }
 
-        return this.store.getOffset(file_name)
+        return this.store.getOffset(file_id)
             .then((stats) => {
                 if (stats.size !== offset) {
                     // If the offsets do not match, the Server MUST respond with the 409 Conflict status without modifying the upload resource.
                     console.warn(`[PatchHandler] send: Incorrect offset - ${offset} sent but file is ${stats.size}`);
                     return Promise.reject(409);
                 }
 
-                return this.store.write(req, file_name, offset);
+                return this.store.write(req, file_id, offset);
             })
             .then((new_offset) => {
                 //  It MUST include the Upload-Offset header containing the new offset.

lib/stores/GCSDataStore.js

@@ -76,14 +76,14 @@ class GCSDataStore extends DataStore {
      * https://googlecloudplatform.github.io/gcloud-node/#/docs/v0.32.0/storage/file?method=createWriteStream
      *
      * @param  {[type]} req       [description]
-     * @param  {[type]} file_name [description]
+     * @param  {[type]} file_id [description]
      * @param  {[type]} offset    [description]
      * @return {[type]}           [description]
      */
-    write(req, file_name, offset) {
+    write(req, file_id, offset) {
         return new Promise((resolve, reject) => {
-            const path = `https://storage.googleapis.com/${this.bucket.name}/${file_name}`;
-            const file = this.bucket.file(file_name);
+            const path = `https://storage.googleapis.com/${this.bucket.name}/${file_id}`;
+            const file = this.bucket.file(file_id);
             const stream = file.createWriteStream();
 
             if (!stream) {
@@ -113,14 +113,14 @@ class GCSDataStore extends DataStore {
      * Make a metadata request for a file in GCS.
      * https://googlecloudplatform.github.io/gcloud-node/#/docs/v0.32.0/storage/file?method=getMetadata
      *
-     * @param  {[type]} file_name [description]
+     * @param  {[type]} file_id [description]
      * @return {[type]}           [description]
      */
-    getOffset(file_name) {
-        super.getOffset(file_name);
+    getOffset(file_id) {
+        super.getOffset(file_id);
 
         return new Promise((resolve, reject) => {
-            const file = this.bucket.file(file_name);
+            const file = this.bucket.file(file_id);
             file.getMetadata((error, metadata, apiResponse) => {
                 if (error) {
                     console.log(error);