Merge pull request #223 from AzureAD/dev

0.2.0

Author: DarylThayil

README.md

@@ -12,7 +12,7 @@ You can find the changes for each version in the [change log](https://github.com
 
 ## Community Help and Support
 
-We leverage [Stack Overflow](http://stackoverflow.com/) to work with the community on supporting Azure Active Directory and its SDKs, including this one! We highly recommend you ask your questions on Stack Overflow (we're all on there!) Also browser existing issues to see if someone has had your question before. 
+We leverage [Stack Overflow](http://stackoverflow.com/) to work with the community on supporting Azure Active Directory and its SDKs, including this one! We highly recommend you ask your questions on Stack Overflow (we're all on there!) Also browse existing issues to see if someone has had your question before. 
 
 We recommend you use the "adal" tag so we can see it! Here is the latest Q&A on Stack Overflow for ADAL: [http://stackoverflow.com/questions/tagged/adal](http://stackoverflow.com/questions/tagged/adal)
 
@@ -31,15 +31,29 @@ All code is licensed under the Apache 2.0 license and we triage actively on GitH
 
 ### Configure the logging
 
+#### Personal Identifiable Information (PII) & Organizational Identifiable Information (OII)
+
+By default, ADAL logging does not capture or log any PII or OII. The library allows app developers to turn this on by configuring the `loggingWithPII` flag in the logging options. By turning on PII or OII, the app takes responsibility for safely handling highly-sensitive data and complying with any regulatory requirements.
+
 ```javascript
 var logging = require('adal-node').Logging;
 
+//PII or OII logging disabled. Default Logger does not capture any PII or OII.
 logging.setLoggingOptions({
   log: function(level, message, error) {
     // provide your own implementation of the log function
   },
   level: logging.LOGGING_LEVEL.VERBOSE, // provide the logging level
-  loggingWithPII: false  // Determine if you want to log personal identitification information. The default value is false.
+  loggingWithPII: false  // Determine if you want to log personal identification information. The default value is false.
+});
+
+//PII or OII logging enabled.
+logging.setLoggingOptions({
+  log: function(level, message, error) {
+    // provide your own implementation of the log function
+  },
+  level: logging.LOGGING_LEVEL.VERBOSE,
+  loggingWithPII: true
 });
 ```
 

lib/authentication-context.js

@@ -86,10 +86,11 @@ var globalCache = new MemoryCache();
  *                                       construction of other AuthenticationContexts.
  *
  */
-function AuthenticationContext(authority, validateAuthority, cache) {
+function AuthenticationContext(authority, validateAuthority, cache, aadApiVersion) {
   var validate = (validateAuthority === undefined || validateAuthority === null || validateAuthority);
 
   this._authority = new Authority(authority, validate);
+  this._authority.aadApiVersion = aadApiVersion;
   this._oauth2client = null;
   this._correlationId = null;
   this._callContext = { options : globalADALOptions };

lib/oauth2client.js

@@ -70,6 +70,7 @@ DEVICE_CODE_RESPONSE_MAP[DeviceCodeResponseParameters.ERROR_DESCRIPTION] = UserC
  * @param {string|url} authority  An url that points to an authority.
  */
 function OAuth2Client(callContext, authority) {
+  this._aadApiVersion = authority.aadApiVersion === undefined? '1.0' : authority.aadApiVersion;
   this._tokenEndpoint = authority.tokenEndpoint;
   this._deviceCodeEndpoint = authority.deviceCodeEndpoint;
 
@@ -87,7 +88,7 @@ OAuth2Client.prototype._createTokenUrl = function () {
   var tokenUrl = url.parse(this._tokenEndpoint);
 
   var parameters = {};
-  parameters[OAuth2Parameters.AAD_API_VERSION] = '1.0';
+  parameters[OAuth2Parameters.AAD_API_VERSION] = this._aadApiVersion;
 
   tokenUrl.search = querystring.stringify(parameters);
   return tokenUrl;
@@ -102,7 +103,7 @@ OAuth2Client.prototype._createDeviceCodeUrl = function () {
    var deviceCodeUrl = url.parse(this._deviceCodeEndpoint);
 
    var parameters = {};
-   parameters[OAuth2Parameters.AAD_API_VERSION] = '1.0';
+   parameters[OAuth2Parameters.AAD_API_VERSION] = this._aadApiVersion;
 
    deviceCodeUrl.search = querystring.stringify(parameters);
 

lib/token-request.js

@@ -584,9 +584,10 @@ TokenRequest.prototype.getTokenWithDeviceCode = function(userCodeInfo, callback)
 
    var interval = userCodeInfo[DeviceCodeResponseParameters.INTERVAL];
    var expires_in = userCodeInfo[DeviceCodeResponseParameters.EXPIRES_IN];
-
+   
    if (interval <= 0) {
      callback(new Error('invalid refresh interval'));
+     return;
    }
 
    this._oauthGetTokenByPolling(oauthParameters, interval, expires_in, function(err, tokenResponse) {