domain is not a required parameter

Author: amarzavery

runtime/ms-rest-azure/Changelog.md

@@ -1,3 +1,6 @@
+### 2.3.3 (09/22/2017)
+- With latest changes in the service code, domain is no more a required parameter for MSITokenCredentials.
+
 ### 2.3.2 (09/21/2017)
 - Fixed bugs in index.d.ts related to MSITokenCredentials and loginWithMSI method
 - Fixed bugs in the MSITokenCredentials class

runtime/ms-rest-azure/index.d.ts

@@ -508,10 +508,9 @@ export class MSITokenCredentials {
    * This method makes a request to the authentication service hosted on the VM
    * and gets back an access token.
    * 
-   * @param {string} domain - The domain or tenant id. This is a required parameter.
    * @param {MSIOptions} [options] - Optional parameters.
    */
-  constructor(domain: string, options?: MSIOptions);
+  constructor(options?: MSIOptions);
   /**
    * Prepares and sends a POST request to a service endpoint hosted on the Azure VM, which responds with the access token.
    * @param  {function} callback  The callback in the form (err, result)
@@ -764,7 +763,6 @@ export interface MSIOptions {
  * This method makes a request to the authentication service hosted on the VM
  * and gets back an access token.
  * 
- * @param {string} domain - The domain or tenant id. This is a required parameter.
  * @param {object} [options] - Optional parameters
  * @param {string} [options.port] - port on which the MSI service is running on the host VM. Default port is 50342
  * @param {string} [options.resource] - The resource uri or token audience for which the token is needed.
@@ -782,6 +780,6 @@ export interface MSIOptions {
  *             @resolve {object} - tokenResponse.
  *             @reject {Error} - error object.
  */
-export function loginWithMSI(domain: string, callback: { (err: Error, credentials: MSITokenCredentials): void }): void;
-export function loginWithMSI(domain: string, options: MSIOptions, callback: { (err: Error, credentials: MSITokenCredentials): void }): void;
-export function loginWithMSI(domain: string, options?: MSIOptions): Promise<MSITokenCredentials>;
+export function loginWithMSI(callback: { (err: Error, credentials: MSITokenCredentials): void }): void;
+export function loginWithMSI(options: MSIOptions, callback: { (err: Error, credentials: MSITokenCredentials): void }): void;
+export function loginWithMSI(options?: MSIOptions): Promise<MSITokenCredentials>;

runtime/ms-rest-azure/lib/credentials/msiTokenCredentials.js

@@ -13,12 +13,7 @@ const request = require('request');
 const Constants = msrest.Constants;
 
 class MSITokenCredentials {
-  constructor(domain, options) {
-
-    if (!Boolean(domain) || typeof domain.valueOf() !== 'string') {
-      throw new Error('domain must be a non empty string.');
-    }
-
+  constructor(options) {
     if (!options) {
       options = {};
     }
@@ -34,11 +29,9 @@ class MSITokenCredentials {
     } else if (typeof options.resource.valueOf() !== 'string') {
       throw new Error('resource must be a uri.');
     }
-
-    this.domain = domain;
+    
     this.port = options.port;
     this.resource = options.resource;
-    this.aadEndpoint = 'https://login.microsoftonline.com';
   }
 
   /**
@@ -72,7 +65,6 @@ class MSITokenCredentials {
 
   prepareRequestOptions() {
     const resource = encodeURIComponent(this.resource);
-    const aadEndpoint = encodeURIComponent(this.aadEndpoint);
     const forwardSlash = encodeURIComponent('/');
     let reqOptions = {
       headers: {},

runtime/ms-rest-azure/lib/login.js

@@ -699,18 +699,17 @@ exports.withAuthFileWithAuthResponse = function withAuthFileWithAuthResponse(opt
 
 /**
  * private helper for MSI auth. Initializes MSITokenCredentials class and calls getToken and returns a token response.
- * 
- * @param {string} domain -- required. The tenant id.
+ *
  * @param {object} options -- Optional parameters
  * @param {string} [options.port] - port on which the MSI service is running on the host VM. Default port is 50342
  * @param {string} [options.resource] - The resource uri or token audience for which the token is needed.
  * @param {any} callback - the callback function.
  */
-function _withMSI(domain, options, callback) {
+function _withMSI(options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null or undefined.');
   }
-  const creds = new MSITokenCredentials(domain, options);
+  const creds = new MSITokenCredentials(options);
   creds.getToken(function (err) {
     if (err) return callback(err);
     return callback(null, creds);
@@ -736,7 +735,6 @@ function _withMSI(domain, options, callback) {
  * This method makes a request to the authentication service hosted on the VM
  * and gets back an access token.
  * 
- * @param {string} domain - The domain or tenant id. This is a required parameter.
  * @param {object} [options] - Optional parameters
  * @param {string} [options.port] - port on which the MSI service is running on the host VM. Default port is 50342
  * @param {string} [options.resource] - The resource uri or token audience for which the token is needed.
@@ -754,17 +752,14 @@ function _withMSI(domain, options, callback) {
  *             @resolve {object} - tokenResponse.
  *             @reject {Error} - error object.
  */
-exports.withMSI = function withMSI(domain, options, optionalCallback) {
-  if (!Boolean(domain) || typeof domain.valueOf() !== 'string') {
-    throw new Error('domain must be a non empty string.');
-  }
+exports.withMSI = function withMSI(options, optionalCallback) {
   if (!optionalCallback && typeof options === 'function') {
     optionalCallback = options;
     options = {};
   }
   if (!optionalCallback) {
     return new Promise((resolve, reject) => {
-      _withMSI(domain, options, (err, credentials) => {
+      _withMSI(options, (err, credentials) => {
         if (err) { reject(err); }
         else { resolve(credentials); }
         return;

runtime/ms-rest-azure/package-lock.json

@@ -5,7 +5,7 @@
     "email": "[email protected]",
     "url": "https://github.com/Azure/azure-sdk-for-node"
   },
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Client Runtime for Node.js Azure client libraries generated using AutoRest",
   "tags": [
     "node",

runtime/ms-rest-azure/package.json

@@ -64,13 +64,12 @@ describe('MSI Authentication', function () {
     };
 
     let requestBodyToMatch = {
-      "authority": "https://login.microsoftonline.com/5485482-38d2-4bad-bad9-b7b93a3eb7b9",
       "resource": "https://management.azure.com/"
     };
 
     setupNockResponse(null, requestBodyToMatch, response);
 
-    let msiCredsObj = new MSITokenCredential("5485482-38d2-4bad-bad9-b7b93a3eb7b9");
+    let msiCredsObj = new MSITokenCredential();
     msiCredsObj.getToken((err, response) => {
       should.not.exist(err);
       should.exist(response);
@@ -92,14 +91,13 @@ describe('MSI Authentication', function () {
     };
 
     let requestBodyToMatch = {
-      "authority": "https://login.microsoftonline.com/5485482-38d2-4bad-bad9-b7b93a3eb7b9",
       "resource": "https://management.azure.com/"
     };
 
     let customPort = 50341;
     setupNockResponse(customPort, requestBodyToMatch, response);
 
-    let msiCredsObj = new MSITokenCredential("5485482-38d2-4bad-bad9-b7b93a3eb7b9", { port: customPort });
+    let msiCredsObj = new MSITokenCredential({ port: customPort });
     msiCredsObj.getToken((err, response) => {
       should.not.exist(err);
       should.exist(response);
@@ -116,13 +114,12 @@ describe('MSI Authentication', function () {
     };
 
     let requestBodyToMatch = {
-      "authority": "https://login.microsoftonline.com/5485482-38d2-4bad-bad9-b7b93a3eb7b9",
       "resource": "badvalue"
     };
 
     setupNockResponse(null, requestBodyToMatch, null, errorResponse);
 
-    let msiCredsObj = new MSITokenCredential("5485482-38d2-4bad-bad9-b7b93a3eb7b9", { "resource": "badvalue" });
+    let msiCredsObj = new MSITokenCredential({ "resource": "badvalue" });
     msiCredsObj.getToken((err, response) => {
       should.exist(err);
       should.not.exist(response);
@@ -134,13 +131,12 @@ describe('MSI Authentication', function () {
     let errorResponse = { "error": "bad_resource_200", "error_description": "Invalid Resource" };
 
     let requestBodyToMatch = {
-      "authority": "https://login.microsoftonline.com/5485482-38d2-4bad-bad9-b7b93a3eb7b9",
       "resource": "  "
     };
 
     setupNockResponse(null, requestBodyToMatch, null, errorResponse);
 
-    let msiCredsObj = new MSITokenCredential("5485482-38d2-4bad-bad9-b7b93a3eb7b9", { "resource": "  " });
+    let msiCredsObj = new MSITokenCredential({ "resource": "  " });
     msiCredsObj.getToken((err, response) => {
       should.exist(err);
       should.equal(err.error, "bad_resource_200");