fix Azure#2002

runtime/ms-rest-azure/Changelog.md

@@ -1,4 +1,7 @@
-### 2.3.4 (09/22/2017)
+### 2.3.5 (09/29/2017)
+- Added retry logic for interactiveLogin if 'authorization_pending' error is received as pointed in issue #2002.
+
+### 2.3.4 (09/29/2017)
 - Updated version of dependencies like async, uuid and moment.
 
 ### 2.3.3 (09/22/2017)

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

@@ -171,6 +171,25 @@ function _interactive(options, callback) {
   let authorityUrl = interactiveOptions.environment.activeDirectoryEndpointUrl + interactiveOptions.domain;
   interactiveOptions.context = new adal.AuthenticationContext(authorityUrl, interactiveOptions.environment.validateAuthority, interactiveOptions.tokenCache);
   let tenantList = [];
+  // will retry until a non-pending error is returned or credentials are returned.
+  let tryAcquireToken = function (userCodeResponse, callback) {
+    interactiveOptions.context.acquireTokenWithDeviceCode(interactiveOptions.environment.activeDirectoryResourceId, interactiveOptions.clientId, userCodeResponse, function (err, tokenResponse) {
+      if (err) {
+        if (err.error === 'authorization_pending') {
+          setTimeout(() => {
+            tryAcquireToken(userCodeResponse, callback);
+          }, 1000);
+        } else {
+          return callback(err);
+        }
+      }
+      interactiveOptions.username = tokenResponse.userId;
+      interactiveOptions.authorizationScheme = tokenResponse.tokenType;
+      return callback(null);
+    });
+  };
+
+  //execute actions in sequence
   async.waterfall([
     //acquire usercode
     function (callback) {
@@ -185,14 +204,7 @@ function _interactive(options, callback) {
       });
     },
     //acquire token with device code and set the username to userId received from tokenResponse.
-    function (userCodeResponse, callback) {
-      interactiveOptions.context.acquireTokenWithDeviceCode(interactiveOptions.environment.activeDirectoryResourceId, interactiveOptions.clientId, userCodeResponse, function (err, tokenResponse) {
-        if (err) return callback(err);
-        interactiveOptions.username = tokenResponse.userId;
-        interactiveOptions.authorizationScheme = tokenResponse.tokenType;
-        return callback(null);
-      });
-    },
+    tryAcquireToken,
     //get the list of tenants
     function (callback) {
       let credentials = _createCredentials.call(interactiveOptions);

runtime/ms-rest-azure/package.json

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