Merge pull request #33 from screwdriver-cd/bitbucketscm

fix: Fixed input format for requests

Author: d2lam

index.js

@@ -126,9 +126,10 @@ class BitbucketScm extends Scm {
     _findWebhook(config) {
         return this.breaker.runCommand({
             json: true,
-            login_type: 'oauth2',
             method: 'GET',
-            oauth_access_token: config.token,
+            auth: {
+                bearer: config.token
+            },
             url: `${API_URL_V2}/repositories/${config.repoId}/hooks?pagelen=30&page=${config.page}`
         }).then((response) => {
             checkResponseError(response);
@@ -178,9 +179,10 @@ class BitbucketScm extends Scm {
                 ]
             },
             json: true,
-            login_type: 'oauth2',
             method: 'POST',
-            oauth_access_token: config.token,
+            auth: {
+                bearer: config.token
+            },
             url: `${API_URL_V2}/repositories/${config.repoId}/hooks`
         };
 
@@ -654,14 +656,15 @@ class BitbucketScm extends Scm {
     * @return {Promise}
     */
     _getOpenedPRs(config) {
-        const repoId = getScmUriParts(config.scmUri)[1];
+        const repoId = getScmUriParts(config.scmUri).repoId;
 
         return this.breaker.runCommand({
-            json: true,
-            login_type: 'oauth2',
+            url: `${API_URL_V2}/repositories/${repoId}/pullrequests`,
             method: 'GET',
-            oauth_access_token: config.token,
-            url: `${API_URL_V2}/repositories/${repoId}/pullrequests`
+            json: true,
+            auth: {
+                bearer: config.token
+            }
         }).then((response) => {
             checkResponseError(response);
 

test/index.test.js

@@ -1151,9 +1151,10 @@ describe('index', function () {
             .then(() => {
                 assert.calledWith(requestMock, {
                     json: true,
-                    login_type: 'oauth2',
                     method: 'GET',
-                    oauth_access_token: 'oauthToken',
+                    auth: {
+                        bearer: oauthToken
+                    },
                     url: `${API_URL_V2}/repositories/repoId/hooks?pagelen=30&page=1`
                 });
                 assert.calledWith(requestMock, {
@@ -1170,9 +1171,10 @@ describe('index', function () {
                         ]
                     },
                     json: true,
-                    login_type: 'oauth2',
                     method: 'POST',
-                    oauth_access_token: 'oauthToken',
+                    auth: {
+                        bearer: oauthToken
+                    },
                     url: `${API_URL_V2}/repositories/repoId/hooks`
                 });
             });
@@ -1203,9 +1205,10 @@ describe('index', function () {
             }).then(() => {
                 assert.calledWith(requestMock, {
                     json: true,
-                    login_type: 'oauth2',
                     method: 'GET',
-                    oauth_access_token: 'oauthToken',
+                    auth: {
+                        bearer: oauthToken
+                    },
                     url: `${API_URL_V2}/repositories/repoId/hooks?pagelen=30&page=1`
                 });
                 assert.calledWith(requestMock, {
@@ -1222,9 +1225,10 @@ describe('index', function () {
                         ]
                     },
                     json: true,
-                    login_type: 'oauth2',
                     method: 'PUT',
-                    oauth_access_token: oauthToken,
+                    auth: {
+                        bearer: oauthToken
+                    },
                     url: `${API_URL_V2}/repositories/repoId/hooks/${uuid}`
                 });
             });
@@ -1269,9 +1273,10 @@ describe('index', function () {
             }).then(() => {
                 assert.calledWith(requestMock, {
                     json: true,
-                    login_type: 'oauth2',
                     method: 'GET',
-                    oauth_access_token: 'oauthToken',
+                    auth: {
+                        bearer: oauthToken
+                    },
                     url: `${API_URL_V2}/repositories/repoId/hooks?pagelen=30&page=2`
                 });
                 assert.calledWith(requestMock, {
@@ -1288,9 +1293,10 @@ describe('index', function () {
                         ]
                     },
                     json: true,
-                    login_type: 'oauth2',
                     method: 'PUT',
-                    oauth_access_token: oauthToken,
+                    auth: {
+                        bearer: oauthToken
+                    },
                     url: `${API_URL_V2}/repositories/repoId/hooks/${uuid}`
                 });
             });
@@ -1462,6 +1468,14 @@ describe('index', function () {
     describe('_getOpenedPRs', () => {
         const oauthToken = 'oauthToken';
         const scmUri = 'hostName:repoId:branchName';
+        const expectedOptions = {
+            url: `${API_URL_V2}/repositories/repoId/pullrequests`,
+            method: 'GET',
+            json: true,
+            auth: {
+                bearer: oauthToken
+            }
+        };
 
         it('returns response of expected format from Bitbucket', () => {
             requestMock.yieldsAsync(null, {
@@ -1483,11 +1497,13 @@ describe('index', function () {
                 scmUri,
                 token: oauthToken
             })
-            .then(response =>
+            .then((response) => {
+                assert.calledWith(requestMock, expectedOptions);
                 assert.deepEqual(response, [{
                     name: 'PR-1',
                     ref: 'testbranch'
-                }])
+                }]);
+            }
             );
         });
     });