Fine-tuning the error thrown for expired and invalid cloud API keys

Author: anu3990

lib/requester.js

@@ -70,6 +70,9 @@ function getAccessToken(operation){
 
   const req = https.request(options, (res) => {
     res.on('data', (d) => {
+      if(res.statusCode === 400){
+        throw new Error(d.toString());
+      }
       const responseValue = JSON.parse(d.toString());
       operation.accessToken = responseValue.access_token;
       operation.expiration = new Date(responseValue[".expires"]);

test-basic/cloud_authentication-test.js

@@ -18,6 +18,7 @@ const marklogic = require('../');
 let assert = require('assert');
 const testconfig = require("../etc/test-config");
 const mlutil = require("../lib/mlutil");
+const expect = require('chai').expect;
 
 describe('cloud-authentication tests', function() {
     it('should throw error without apiKey.', function(done){
@@ -46,4 +47,21 @@ describe('cloud-authentication tests', function() {
             done(error);
         }
     });
+
+    it('should throw error with invalid apiKey.', function (done) {
+        let db = marklogic.createDatabaseClient({
+            host: 'support.beta.marklogic.cloud',
+            authType: 'cloud',
+            apiKey: 'invalid'
+        });
+        let writeObject = {uri: '/test.json', content: '{"key":"value"}'};
+
+        try {
+            // Also verified that it throws 'Error: User's API Key is expired.' when API key has expired a few seconds ago.
+            expect(()=>db.documents.write(writeObject).throws(Error('API Key is not valid.')));
+            done();
+        } catch (error) {
+            done(error);
+        }
+    });
 });