Merge pull request aws-amplify#118 from powerful23/api_cred_refresh

Api cred refresh
geirman · Jan 18, 2018 · aaf9e0f · aaf9e0f
2 parents be8db91 + 7396f94
commit aaf9e0f
Show file tree

Hide file tree

Showing 15 changed files with 1,553 additions and 711 deletions.
diff --git a/packages/aws-amplify/__tests__/API/API-test.ts b/packages/aws-amplify/__tests__/API/API-test.ts
diff --git a/packages/aws-amplify/__tests__/API/RestClient-unit-test.ts b/packages/aws-amplify/__tests__/API/RestClient-unit-test.ts
@@ -30,7 +30,7 @@ jest.mock('axios', () => {
         default: (signed_params) => {
             return new Promise((res, rej) => {
                 res({
-                    data: 'data';
+                    data: 'data'
                 })
             });
         }
@@ -80,7 +80,7 @@ describe('RestClient test', () => {
 
             const restClient = new RestClient(apiOptions);
 
-            expect(await restClient.ajax('url', 'method')).toEqual('data');
+            expect(await restClient.ajax('url', 'method', {})).toEqual('data');
         });
 
         test('ajax with no credentials', async () => {
@@ -101,11 +101,65 @@ describe('RestClient test', () => {
             const restClient = new RestClient(apiOptions);
 
             try {
-                await restClient.ajax('url', 'method');
+                await restClient.ajax('url', 'method', {});
             } catch (e) {
                 expect(e).toBe('credentials not set for API rest client ');
             }
         });
+
+        test('ajax with extraParams', async () => {
+            window.fetch = jest.fn().mockImplementationOnce((signed_params_url, signed_params) => {
+                return new Promise((res, rej) => {
+                    res({
+                        status: '200',
+                        json: () => {
+                            return signed_params.data;
+                        }
+                    });
+                });
+            });
+
+            const apiOptions = {
+                headers: {},
+                endpoints: {},
+                credentials: {
+                    accessKeyId: 'accessKeyId',
+                    secretAccessKey: 'secretAccessKey',
+                    sessionToken: 'sessionToken'
+                }
+            };
+
+            const restClient = new RestClient(apiOptions);
+
+            expect(await restClient.ajax('url', 'method', {body: 'body'})).toEqual('data');
+        });
+
+        test('ajax with Authorization header', async () => {
+            window.fetch = jest.fn().mockImplementationOnce((signed_params_url, signed_params) => {
+                return new Promise((res, rej) => {
+                    res({
+                        status: '200',
+                        json: () => {
+                            return signed_params.data;
+                        }
+                    });
+                });
+            });
+
+            const apiOptions = {
+                headers: {},
+                endpoints: {},
+                credentials: {
+                    accessKeyId: 'accessKeyId',
+                    secretAccessKey: 'secretAccessKey',
+                    sessionToken: 'sessionToken'
+                }
+            };
+
+            const restClient = new RestClient(apiOptions);
+
+            expect(await restClient.ajax('url', 'method', {headers: {Authorization: 'authorization'}})).toEqual('data');
+        });
     });
 
     describe('get test', () => {
@@ -136,7 +190,7 @@ describe('RestClient test', () => {
             const restClient = new RestClient(apiOptions);
 
             expect.assertions(2);
-            await restClient.get('url');
+            await restClient.get('url', {});
 
             expect(spyon.mock.calls[0][0]).toBe('url');
             expect(spyon.mock.calls[0][1]).toBe('GET');
@@ -247,7 +301,7 @@ describe('RestClient test', () => {
             const restClient = new RestClient(apiOptions);
 
             expect.assertions(2);
-            await restClient.del('url');
+            await restClient.del('url', {});
 
             expect(spyon.mock.calls[0][0]).toBe('url');
             expect(spyon.mock.calls[0][1]).toBe('DELETE');
@@ -283,7 +337,7 @@ describe('RestClient test', () => {
             const restClient = new RestClient(apiOptions);
 
             expect.assertions(2);
-            await restClient.head('url');
+            await restClient.head('url', {});
 
             expect(spyon.mock.calls[0][0]).toBe('url');
             expect(spyon.mock.calls[0][1]).toBe('HEAD');