Merge pull request #133 from powerful23/s3_image_fix

S3 image fix
aws-amplify · Jan 17, 2018 · 635bd5a · 635bd5a
2 parents e235705 + 1cdf05a
commit 635bd5a
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 13 deletions.
diff --git a/packages/aws-amplify-react/__tests__/Storage/S3Album-test.js b/packages/aws-amplify-react/__tests__/Storage/S3Album-test.js
@@ -194,7 +194,7 @@ describe('S3Album test', () => {
 
             expect.assertions(2);
             expect(spyon).toBeCalledWith({"file": "file", "name": "name", "size": "size", "type": "type"});
-            expect(spyon2).toBeCalledWith('path', 'file', {contentType: 'type'});
+            expect(spyon2).toBeCalledWith('path', 'file', {"contentType": "type", "level": "public", "track": undefined});
 
             spyon.mockClear();
             spyon2.mockClear();
@@ -244,7 +244,7 @@ describe('S3Album test', () => {
 
             expect.assertions(3);
             expect(spyon).toBeCalledWith({"file": "file", "name": "name", "size": "size", "type": "type"});
-            expect(spyon2).toBeCalledWith('path', 'file', {contentType: 'type'});
+            expect(spyon2).toBeCalledWith('path', 'file', {"contentType": "type", "level": "public", "track": undefined});
             expect(spyon3).toBeCalledWith([{key: 'path2'}, 'data']);
 
             spyon.mockClear();
@@ -292,7 +292,7 @@ describe('S3Album test', () => {
 
             expect.assertions(2);
             expect(spyon).toBeCalledWith({"file": "file", "name": "name", "size": "size", "type": "type"});
-            expect(spyon2).toBeCalledWith('path', 'file', {contentType: 'type'});
+            expect(spyon2).toBeCalledWith('path', 'file', {"contentType": "type", "level": "public", "track": undefined});
 
             spyon.mockClear();
             spyon2.mockClear();

diff --git a/packages/aws-amplify-react/__tests__/Storage/S3Image-test.js b/packages/aws-amplify-react/__tests__/Storage/S3Image-test.js
@@ -177,7 +177,7 @@ describe('S3Image', () => {
             await s3Image.handlePick(data);
 
             expect.assertions(2);
-            expect(spyon).toBeCalledWith('imgKey', 'file', {contentType: 'type'});
+            expect(spyon).toBeCalledWith('imgKey', 'file', {"contentType": "type", "level": "level", "track": undefined});
             expect(spyon2).toBeCalled();
 
             spyon.mockClear();

diff --git a/packages/aws-amplify-react/__tests__/Storage/S3Text-test.js b/packages/aws-amplify-react/__tests__/Storage/S3Text-test.js
@@ -172,7 +172,7 @@ describe('S3Text test', () => {
             await s3Text.handlePick(data);
 
             expect.assertions(2);
-            expect(spyon).toBeCalledWith('textKey', 'file', { contentType: 'type' });
+            expect(spyon).toBeCalledWith('textKey', 'file', {"contentType": "type", "level": "level", "track": undefined});
             expect(spyon2).toBeCalled();
 
             spyon.mockClear();

diff --git a/packages/aws-amplify-react/dist/Storage/S3Album.js b/packages/aws-amplify-react/dist/Storage/S3Album.js
@@ -115,7 +115,8 @@ var S3Album = function (_Component) {
                     onPick = _props.onPick,
                     onLoad = _props.onLoad,
                     onError = _props.onError,
-                    track = _props.track;
+                    track = _props.track,
+                    level = _props.level;
 
 
                 if (onPick) {
@@ -129,7 +130,11 @@ var S3Album = function (_Component) {
                     type = data.type;
 
                 var key = path + this.getKey(data);
-                _awsAmplify.Storage.put(key, file, { contentType: type, track: track }).then(function (data) {
+                _awsAmplify.Storage.put(key, file, {
+                    level: level ? level : 'public',
+                    contentType: type,
+                    track: track
+                }).then(function (data) {
                     logger.debug('handle pick data', data);
                     var items = _this2.state.items;
 

diff --git a/packages/aws-amplify-react/dist/Storage/S3Image.js b/packages/aws-amplify-react/dist/Storage/S3Image.js
@@ -163,7 +163,11 @@ var S3Image = function (_Component) {
                     type = data.type;
 
                 var key = imgKey || path + (0, _Common.calcKey)(data, fileToKey);
-                _awsAmplify.Storage.put(key, file, { contentType: type, track: track }).then(function (data) {
+                _awsAmplify.Storage.put(key, file, {
+                    level: level ? level : 'public',
+                    contentType: type,
+                    track: track
+                }).then(function (data) {
                     logger.debug('handle pick data', data);
                     that.getImageSource(key, level, track);
                 })['catch'](function (err) {

diff --git a/packages/aws-amplify-react/dist/Storage/S3Text.js b/packages/aws-amplify-react/dist/Storage/S3Text.js
@@ -167,7 +167,11 @@ var S3Text = function (_Component) {
                     type = data.type;
 
                 var key = textKey || path + (0, _Common.calcKey)(data, fileToKey);
-                _awsAmplify.Storage.put(key, file, { contentType: type, track: track }).then(function (data) {
+                _awsAmplify.Storage.put(key, file, {
+                    level: level ? level : 'public',
+                    contentType: type,
+                    track: track
+                }).then(function (data) {
                     logger.debug('handle pick data', data);
                     that.getText(key, level, track);
                 })['catch'](function (err) {

diff --git a/packages/aws-amplify-react/src/Storage/S3Album.js b/packages/aws-amplify-react/src/Storage/S3Album.js
@@ -72,14 +72,18 @@ export default class S3Album extends Component {
 
     handlePick(data) {
         const that = this;
-        const { onPick, onLoad, onError, track } = this.props;
+        const { onPick, onLoad, onError, track, level } = this.props;
 
         if (onPick) { onPick(data); }
 
         const path = this.props.path || '';
         const { file, name, size, type } = data;
         const key = path + this.getKey(data);
-        Storage.put(key, file, { contentType: type, track })
+        Storage.put(key, file, {
+            level: level? level: 'public',
+            contentType: type,
+            track
+        })
             .then(data => {
                 logger.debug('handle pick data', data);
                 const { items } = this.state;

diff --git a/packages/aws-amplify-react/src/Storage/S3Image.js b/packages/aws-amplify-react/src/Storage/S3Image.js
@@ -90,7 +90,11 @@ export default class S3Image extends Component {
         const { imgKey, level, fileToKey, track } = this.props;
         const { file, name, size, type } = data;
         const key = imgKey || (path + calcKey(data, fileToKey));
-        Storage.put(key, file, { contentType: type, track })
+        Storage.put(key, file, { 
+            level: level? level: 'public',
+            contentType: type, 
+            track 
+        })
             .then(data => {
                 logger.debug('handle pick data', data);
                 that.getImageSource(key, level, track);

diff --git a/packages/aws-amplify-react/src/Storage/S3Text.js b/packages/aws-amplify-react/src/Storage/S3Text.js
@@ -95,7 +95,11 @@ export default class S3Text extends Component {
         const { textKey, level, fileToKey, track } = this.props;
         const { file, name, size, type } = data;
         const key = textKey || (path + calcKey(data, fileToKey));
-        Storage.put(key, file, { contentType: type, track })
+        Storage.put(key, file, {
+            level: level? level: 'public',
+            contentType: type,
+            track
+        })
             .then(data => {
                 logger.debug('handle pick data', data);
                 that.getText(key, level, track);