Merge pull request #360 from cloudant/update-default-iam-token-server

Update the default IAM token server URL

Author: smithsz

CHANGES.md

@@ -8,6 +8,7 @@
   version.
 - [UPGRADED] Apache CouchDB Nano to a minimum of version 8 for `*AsStream`
   function fixes.
+- [FIXED] Updated the default IAM token server URL.
 
 # 3.0.2 (2019-01-07)
 - [FIXED] Remove unnecessary `@types/nano` dependancy.

README.md

@@ -391,7 +391,7 @@ var cloudant = new Cloudant({ url: myurl, maxAttempt: 5, plugins: [ 'iamauth', {
    This plugin will automatically exchange your IAM API key for a token. It will
    handle the authentication and ensure that the token is refreshed as required.
 
-   The production IAM token service at https://iam.bluemix.net/identity/token is
+   The production IAM token service at https://iam.cloud.ibm.com/identity/token is
    used by default. You can set `iamTokenUrl` in your plugin configuration to
    override this. To authenticate with the IAM token service set `iamClientId`
    and `iamClientSecret` in your plugin configuration.

plugins/iamauth.js

@@ -31,7 +31,7 @@ class IAMPlugin extends BasePlugin {
     self.iamApiKey = null;
     self.baseUrl = cfg.baseUrl || null;
     self.cookieJar = request.jar();
-    self.tokenUrl = cfg.iamTokenUrl || 'https://iam.bluemix.net/identity/token';
+    self.tokenUrl = cfg.iamTokenUrl || 'https://iam.cloud.ibm.com/identity/token';
 
     // Specifies whether IAM authentication should be applied to the request being intercepted.
     self.shouldApplyIAMAuth = true;

test/plugins/iamauth.js

@@ -27,7 +27,7 @@ const IAM_API_KEY = process.env.cloudant_iam_api_key || 'CqbrIYzdO3btWV-5t4teJLY
 const SERVER = process.env.SERVER_URL || `https://${ME}.cloudant.com`;
 const SERVER_NO_PROTOCOL = SERVER.replace(/^https?:\/\//, '');
 const SERVER_WITH_CREDS = `https://${ME}:${PASSWORD}@${SERVER_NO_PROTOCOL}`;
-const TOKEN_SERVER = 'https://iam.bluemix.net';
+const TOKEN_SERVER = 'https://iam.cloud.ibm.com';
 const DBNAME = `/nodejs-cloudant-${uuidv4()}`;
 
 // mocks