Merge branch 'dev'

Author: Kanishk Panwar

changelog.txt

@@ -1,3 +1,8 @@
+Version 0.1.22
+--------------
+Release Date: 1 Aug 2016
+    * Fix Issue #132 - Trim developer provided authority to construct endpoints
+
 Version 0.1.21
 --------------
 Release Date: 23 Jun 2016

lib/authority.js

@@ -227,11 +227,11 @@ Authority.prototype._getOAuthEndpoints = function(tenantDiscoveryEndpoint, callb
   } else {
     // fallback to the well known token endpoint path.
     if (!this._tokenEndpoint){
-       this._tokenEndpoint = url.format(this._url) + AADConstants.TOKEN_ENDPOINT_PATH;
+       this._tokenEndpoint = url.format('https://' + this._url.host + '/' + this._tenant) + AADConstants.TOKEN_ENDPOINT_PATH;
     }
 
     if (!this._deviceCodeEndpoint){
-       this._deviceCodeEndpoint = url.format(this._url) + AADConstants.DEVICE_ENDPOINT_PATH;
+       this._deviceCodeEndpoint = url.format('https://' + this._url.host + '/' + this._tenant) + AADConstants.DEVICE_ENDPOINT_PATH;
     }
 
     callback();

package.json

@@ -15,7 +15,7 @@
     "type": "git",
     "url": "https://github.com/AzureAD/azure-activedirectory-library-for-nodejs.git"
   },
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "Windows Azure Active Directory Client Library for node",
   "keywords": [ "node", "azure", "AAD", "adal", "adfs", "oauth" ],
   "main": "./lib/adal.js",

test/authority.js

@@ -252,6 +252,9 @@ suite('Authority', function() {
       if (err) {
         assert(!err, 'Received unexpected error: ' + err.stack);
       }
+
+      assert(authority.tokenEndpoint === (nonHardCodedAuthority + cp.tokenPath), "oauth2 token endpoint should be after tenant in the url");
+      assert(authority.deviceCodeEndpoint === (nonHardCodedAuthority + cp.deviceCodePath), "oauth2 device endpoint should be after tenant in the url");
       instanceDiscoveryRequest.done();
       done();
     });