Merge branch 'master' into master

Author: Manuel Iglesias

packages/core/src/Parser.ts

@@ -35,7 +35,9 @@ export default class Parser {
             storageConfig = {
                 AWSS3: {
                     bucket: config['aws_user_files_s3_bucket'],
-                    region: config['aws_user_files_s3_bucket_region']
+                    region: config['aws_user_files_s3_bucket_region'],
+                    dangerouslyConnectToHttpEndpointForTesting:
+                    config['aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing']
                 }
             };
         } else {

packages/pubsub/__tests__/PubSub-unit-test.ts

@@ -7,16 +7,18 @@ import * as Paho from '../src/vendor/paho-mqtt';
 
 const pahoClientMockCache = {};
 
+const mockConnect = jest.fn((options) => {
+    options.onSuccess();
+});
+
 const pahoClientMock = jest.fn().mockImplementation((host, clientId) => {
     if (pahoClientMockCache[clientId]) {
         return pahoClientMockCache[clientId];
     }
 
     var client = {} as any;
 
-    client.connect = jest.fn((options) => {
-        options.onSuccess();
-    });
+    client.connect = mockConnect;
     client.send = jest.fn((topic, message) => {
         client.onMessageArrived({ destinationName: topic, payloadString: message });
     });
@@ -213,6 +215,32 @@ describe('PubSub', () => {
         });
     });
 
+    describe('MqttOverWSProvider local testing config', () => {
+        test('ssl should be disabled in the case of local testing', async () => {
+            mockConnect.mockClear();
+            const pubsub = new PubSub();
+
+            const mqttOverWSProvider = new MqttOverWSProvider({
+                aws_pubsub_region: 'region',
+                aws_appsync_dangerously_connect_to_http_endpoint_for_testing: true
+            });
+            pubsub.addPluggable(mqttOverWSProvider);
+            
+            await testPubSubAsync(pubsub, 'topicA', 'my message MqttOverWSProvider', {
+                provider: 'MqttOverWSProvider',
+            });
+            
+            expect(mqttOverWSProvider.isSSLEnabled).toBe(false);
+            expect(mockConnect).toBeCalledWith({
+                useSSL: false,
+                mqttVersion: 3,
+                onSuccess: expect.any(Function),
+                onFailure: expect.any(Function)
+            });
+
+        });
+    });
+
     describe('multiple providers', () => {
         test('subscribe and publish to specific provider', async () => {
             const pubsub = new PubSub();

packages/pubsub/src/Providers/MqttOverWSProvider.ts

@@ -78,6 +78,10 @@ export class MqttOverWSProvider extends AbstractPubSubProvider {
 
     protected get clientsQueue() { return this._clientsQueue; }
 
+    protected get isSSLEnabled() {
+        return !this.options.aws_appsync_dangerously_connect_to_http_endpoint_for_testing;
+    }
+    
     protected getTopicForValue(value) { return typeof value === 'object' && value[topicSymbol]; }
 
     getProviderName() { return 'MqttOverWSProvider'; }
@@ -99,10 +103,10 @@ export class MqttOverWSProvider extends AbstractPubSubProvider {
         client.onConnectionLost = ({ errorCode, ...args }) => {
             this.onDisconnect({ clientId, errorCode, ...args });
         };
-
+        
         await new Promise((resolve, reject) => {
             client.connect({
-                useSSL: true,
+                useSSL: this.isSSLEnabled,
                 mqttVersion: 3,
                 onSuccess: () => resolve(client),
                 onFailure: reject,

packages/pubsub/src/PubSub.ts

@@ -36,7 +36,7 @@ export default class PubSub {
      */
     private get awsAppSyncProvider() {
         if (!this._awsAppSyncProvider) {
-            this._awsAppSyncProvider = new AWSAppSyncProvider();
+            this._awsAppSyncProvider = new AWSAppSyncProvider(this._options);
         }
         return this._awsAppSyncProvider;
     }

packages/storage/__tests__/Providers/AWSS3Provider-unit-test.ts

@@ -19,7 +19,6 @@ import * as S3 from 'aws-sdk/clients/s3';
  * actually be using dispatchStorageEvent from Storage
  */
 
- 
 S3.prototype.getSignedUrl = jest.fn((key, params) => {
     return 'url';
 });
@@ -87,7 +86,7 @@ describe('StorageProvider test', () => {
     });
 
     describe('configure test', () => {
-        test('happy case', () => {
+        test('standard configuration', () => {
             const storage = new StorageProvider();
 
             const aws_options = {
@@ -102,6 +101,26 @@ describe('StorageProvider test', () => {
                 }
             });
         });
+
+        test('configuration for local testing', () => {
+            const storage = new StorageProvider();
+
+            const aws_options = {
+                aws_user_files_s3_bucket: 'bucket',
+                aws_user_files_s3_bucket_region: 'region',
+                aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing: true
+
+            }
+
+            const config = storage.configure(aws_options);
+            expect(config).toEqual({
+                AWSS3: {
+                    "bucket": "bucket",
+                    "region": "region",
+                    "dangerouslyConnectToHttpEndpointForTesting": true
+                }
+            });
+        });
     });
 
     describe('get test', async () => {

packages/storage/src/Providers/AWSS3Provider.ts

@@ -39,6 +39,8 @@ const dispatchStorageEvent = (track:boolean, event:string, attrs:any, metrics:an
     }
 };
 
+const localTestingStorageEndpoint = 'http://localhost:20005';
+
 /**
  * Provide storage methods to use AWS S3
  */
@@ -403,14 +405,29 @@ export default class AWSS3Provider implements StorageProvider{
      * @private
      */
     private _createS3(config) {
-        const { bucket, region, credentials } = config;
+        const {
+            bucket,
+            region,
+            credentials,
+            dangerouslyConnectToHttpEndpointForTesting
+        } = config;
+        let localTestingConfig = {};
+        
+        if(dangerouslyConnectToHttpEndpointForTesting) {
+            localTestingConfig = {
+                endpoint: localTestingStorageEndpoint,
+                s3BucketEndpoint: true,
+                s3ForcePathStyle : true
+            };
+        }
 
         return new S3({
             apiVersion: '2006-03-01',
             params: { Bucket: bucket },
             signatureVersion: 'v4',
             region,
-            credentials
+            credentials,
+            ...localTestingConfig
         });
     }
 }