Fix to token authentication.

Author: anderly

lib/commands/login._js

@@ -63,16 +63,13 @@ exports.init = function (cli) {
         options.token = undefined;
       }
 
-      var supportedLoginTypeText = $('Please note that currently you can login only via username/password. ' +
+      var supportedLoginTypeText = $('Please note that currently you can only login via username/password or username/token. ' +
         'To create an account, visit http://dnsimple.com.');
       log.warn(supportedLoginTypeText);
 
       var username = cli.interaction.promptIfNotGiven('Username: ', options.user, _);
 
       var token = options.token;
-      // if (options.password === undefined) {
-      //     token = cli.interaction.promptIfNotGiven('API Token: ', options.token, _);
-      // }
 
       if (!tokenCache.isSecureCache) {
         var haveSeenBefore = __.values(profile.current.subscriptions).some(function (s) {

lib/util/authentication/dnsimpleAuth.js

@@ -258,7 +258,14 @@ _.extend(ServicePrincipalAccessToken.prototype, {
 */
 function acquireToken(authConfig, username, password, callback) {
   //var context = createAuthenticationContext(authConfig);
-  var dns = new dnsimple({ email: username, password: password, hostname: authConfig.resourceId.replace('https://','') });
+  var options = { email: username };
+  if (authConfig.token) {
+    options['token'] = authConfig.token;
+  } else {
+    options['password'] = password;
+  }
+  options['hostname'] = authConfig.resourceId.replace('https://','');
+  var dns = new dnsimple(options);
 
   dns.talk('GET', 'user', function(err, response) {
     if (err) { return callback(err); }

lib/util/profile/environment.js

@@ -136,7 +136,7 @@ _.extend(Environment.prototype, {
       // clientId: constants.XPLAT_CLI_CLIENT_ID
       authorityUrl: this.apiTokenEndpointUrl,
       apiVersion: this.apiVersion,
-      //token: token,
+      token: token,
       resourceId: this.apiEndpointUrl,
       clientId: constants.DNSIMPLE_CLI_CLIENT_ID
     };
@@ -174,23 +174,19 @@ _.extend(Environment.prototype, {
       callback(null, subs);
     }
 
-    if (!token) {
-       subscriptionUtils.getSubscriptions(self, username, password, processSubscriptions);
-    } else {
-      dnsimpleAuth.acquireServicePrincipalToken(self.getAuthConfig(token), username, password, function (err, token) {
-        if (err) { return callback(err); }
-        subscriptionUtils.getSubscriptionsInTenant(self, username, tenant, token, processSubscriptions);
-      });
-    }
+    subscriptionUtils.getSubscriptions(self, username, token, password, processSubscriptions);
   },
 
   acquireToken : function (username, password, token, callback) {
     dnsimpleAuth.acquireToken(this.getAuthConfig(token), username, password, callback);
   },
 
   getDnsimpleClient: function (credentials) {
-    return new dnsimple({ email: credentials.userId, token: credentials.accessToken, hostname: this.apiEndpointUrl.replace('https://','') });
-    //return resourceClient.createResourceSubscriptionClient(credentials, this.resourceManagerEndpointUrl);
+    var options = { email: credentials.userId };
+    options['token'] = credentials.authConfig.token || credentials.accessToken;
+    options['hostname'] = this.apiEndpointUrl.replace('https://','');
+    var dns = new dnsimple(options);
+    return dns;
   }
 });
 

lib/util/profile/subscriptionUtils._js

@@ -23,8 +23,8 @@ var util = require('util');
 var AccessTokenCloudCredentials = require('../authentication/accessTokenCloudCredentials');
 var utils = require('../utils');
 
-function getSubscriptions(environment, username, password, _) {
-  var accessToken = environment.acquireToken(username, password, '', _);
+function getSubscriptions(environment, username, token, password, _) {
+  var accessToken = environment.acquireToken(username, password, token, _);
   username = crossCheckUserNameWithToken(username, accessToken.userId);
   //var dns = environment.getDnsimpleClient(createCredential(accessToken));
   var dns = environment.getDnsimpleClient(accessToken);

package.json

@@ -4,7 +4,7 @@
   "contributors": [
     "Anderly, Adam <adam@anderly.com>"
   ],
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "DNSimple Command Line tool",
   "tags": [
     "dnsimple",