Fix failing cli tests (#351)

SalesforceCommerceCloud · Jan 31, 2023 · c038444 · c038444
1 parent 40376ff
commit c038444
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/bin/test-cli.sh b/bin/test-cli.sh
@@ -191,9 +191,9 @@ else
 	exit 1
 fi
 
-# we have to re-authenticate with API key and user first
-echo "Running ´sfcc-ci client:auth <api_key> <secret> <user> <pwd>´:"
-node ./cli.js client:auth "$ARG_CLIENT_ID" "$ARG_CLIENT_SECRET" "$ARG_USER" "$ARG_USER_PW"
+# Acquire new access token beforehand
+echo "Acquire new access token using ´sfcc-ci client:auth <api_key>´:"
+node ./cli.js client:auth "$ARG_CLIENT_ID" "$ARG_CLIENT_SECRET"
 if [ $? -eq 0 ]; then
     echo -e "\t> OK"
 else
@@ -215,7 +215,7 @@ else
 fi
 
 echo "Testing command ´sfcc-ci client:create --configuration <configuration>´ --noprompt:"
-TEST_NEW_CLIENT_RESULT=`node ./cli.js client:create --configuration '{"name": "My new client", "password": "%2secret(Sauce7?!"}' --json`
+TEST_NEW_CLIENT_RESULT=`node ./cli.js client:create --configuration '{"name": "Temp test client", "password": "%2secret(Sauce7?!"}' --noprompt --json`
 if [ $? -eq 0 ]; then
     echo -e "\t> OK"
 else
@@ -292,7 +292,7 @@ else
 fi
 
 echo "Testing command ´sfcc-ci client:rotate --clientid <client_id> --noprompt´:"
-TEST_ROTATION_RESULT=`node ./cli.js client:rotate --clientid $TEST_NEW_CLIENT_ID --noprompt`
+TEST_ROTATION_RESULT=`node ./cli.js client:rotate --clientid $TEST_NEW_CLIENT_ID --noprompt --json`
 if [ $? -eq 0 ]; then
     echo -e "\t> OK"
 else

diff --git a/lib/auth.js b/lib/auth.js
@@ -624,8 +624,10 @@ async function getAuthenticatedUser() {
         request(options, function (err, res, body) {
             if ( err ) {
                 reject(new Error(`Lookup of authenticated user failed: ${err}`));
+                return;
             } else if ( res.statusCode >= 400 ) {
                 reject(new Error(`Lookup of authenticated user failed: ${res.statusCode}`));
+                return;
             }
             resolve(body);
         });
@@ -665,8 +667,10 @@ async function getAuthenticatedClient() {
         }, function (err, res, body) {
             if ( err ) {
                 reject(new Error(`Lookup of authenticated client failed: ${err}`));
+                return;
             } else if ( res.statusCode >= 400 ) {
                 reject(new Error(`Lookup of authenticated client failed: ${res.statusCode}`));
+                return;
             }
             resolve(body);
         });

diff --git a/lib/client.js b/lib/client.js
@@ -87,8 +87,10 @@ async function getClient(id) {
             var error = captureCommonErrors(err, res);
             if ( res.statusCode === 404 ) {
                 reject(new Error(`Oauth client not found`));
+                return;
             } else if ( error ) {
-                reject(error)
+                reject(error);
+                return;
             }
             resolve(toExternal(body));
         });
@@ -112,8 +114,10 @@ async function listClients(page, size) {
             var error = captureCommonErrors(err, res);
             if ( res.statusCode === 404 ) {
                 reject(new Error(`No Oauth clients found`));
+                return;
             } else if ( error ) {
-                reject(error)
+                reject(error);
+                return;
             }
             resolve(body.content);
         });
@@ -147,6 +151,7 @@ async function updateClient(client, changes) {
             var error = captureCommonErrors(err, res);
             if ( error ) {
                 reject(error);
+                return;
             }
             resolve(toExternal(body));
         });
@@ -172,6 +177,7 @@ async function createClient(client) {
             var error = captureCommonErrors(err, res);
             if ( error ) {
                 reject(error);
+                return;
             }
             resolve(toExternal(body));
         });
@@ -249,6 +255,7 @@ async function rotateCredentials(client) {
             var error = captureCommonErrors(err, res);
             if ( error ) {
                 reject(error);
+                return;
             }
             resolve([body, newSecret]);
         });
@@ -271,6 +278,7 @@ async function deleteClient(client) {
             var error = captureCommonErrors(err, res);
             if ( error ) {
                 reject(error);
+                return;
             }
             resolve();
         });
@@ -325,6 +333,7 @@ module.exports.cli = {
             // finally check, if we have an org
             if (!clientDefinition.organizations || clientDefinition.organizations.length == 0) {
                 reject(new Error(`No organization specified`));
+                return;
             }
             resolve(clientDefinition);
         })).then(clientDefinition => {

diff --git a/lib/org.js b/lib/org.js
@@ -188,6 +188,7 @@ async function getOrgById(orgId) {
             var error = captureCommonErrors(err, res);
             if ( error ) {
                 reject(error);
+                return;
             }
             resolve(body);
         });