Fixing #4 and Minor error handlings

Author: NimperX

package-lock.json

@@ -51,6 +51,7 @@
         "@types/aws-sdk": "^2.7.0",
         "@types/crypto-js": "^4.0.2",
         "aws-sdk": "^2.993.0",
+        "buffer": "^6.0.3",
         "crypto-js": "^4.1.1",
         "short-uuid": "^4.2.0"
     },

package.json

@@ -1,5 +1,6 @@
 import { dateISOString, dateYMD, xAmzDate } from './Date';
 import { IConfig, Policy as PolicyType } from './types';
+import { Buffer } from 'buffer';
 
 export default class Policy {
   public static getPolicy(config: IConfig): string {
@@ -23,7 +24,6 @@ export default class Policy {
       };
     };
     // Returns a base64 policy;
-    // tslint:disable-next-line: deprecation
-    return new Buffer(JSON.stringify(policy())).toString('base64').replace(/\n|\r/, '');
+    return Buffer.from(JSON.stringify(policy())).toString('base64').replace(/\n|\r/, '');
   }
 }

src/Policy.ts

@@ -14,17 +14,17 @@ class ReactS3Client {
   }
   public async uploadFile(file: File, newFileName?: string): Promise<UploadResponse> {
     throwUploadError(this.config, file);
-    let fileExtension: string;
+    let fileExtension: string = '';
     const fd = new FormData();
 
-    if (file.type == null) {
-      fileExtension = '';
-    } else {
-      fileExtension = file.type.split('/')[1];
+    if (file.type != null) {
+      fileExtension = file.type.split('/').pop() || '';
     }
 
-    const fileName = `${newFileName || shortId.generate()}.${fileExtension}`;
-    const key = `${this.config.dirName ? this.config.dirName + '/' : ''}${fileName}`;
+    const fileName = `${newFileName || shortId.generate()}${fileExtension && ('.' + fileExtension)}`;
+    // remove duplicate forward slashes
+    const dirName = (this.config.dirName ? this.config.dirName + '/' : '').replace(/([^:]\/)\/+/g, '$1')
+    const key = `${dirName}${fileName}`;
     const url: string = GetUrl(this.config);
     fd.append('key', key);
     fd.append('acl', 'public-read');
@@ -43,8 +43,8 @@ class ReactS3Client {
     if (!data.ok) return Promise.reject(data);
     return Promise.resolve({
       bucket: this.config.bucketName,
-      key: `${this.config.dirName ? this.config.dirName + '/' : ''}${fileName}`,
-      location: `${url}/${this.config.dirName ? this.config.dirName + '/' : ''}${fileName}`,
+      key,
+      location: `${url}/${key}`,
       status: data.status,
     });
   }