diff --git a/build/actions/auth.js b/build/actions/auth.js index 9c09c00c..43e20943 100644 --- a/build/actions/auth.js +++ b/build/actions/auth.js @@ -1,5 +1,5 @@ (function() { - var Promise, TOKEN_URL, _, events, form, open, resin, settings, url, validEmail, visuals; + var Promise, _, events, form, open, resin, url, validEmail, visuals; Promise = require('bluebird'); @@ -11,8 +11,6 @@ resin = require('resin-sdk'); - settings = require('resin-settings-client'); - form = require('resin-cli-form'); visuals = require('resin-cli-visuals'); @@ -21,20 +19,20 @@ events = require('resin-cli-events'); - TOKEN_URL = url.resolve(settings.get('dashboardUrl'), '/preferences'); - exports.login = { signature: 'login [token]', description: 'login to resin.io', - help: "Use this command to login to your resin.io account.\n\nTo login, you need your token, which is accesible from the preferences page:\n\n " + TOKEN_URL + "\n\nExamples:\n\n $ resin login\n $ resin login \"eyJ0eXAiOiJKV1Qi...\"", + help: 'Use this command to login to your resin.io account.\n\nTo login, you need your token, which is accesible from the preferences page.\n\nExamples:\n\n $ resin login\n $ resin login "eyJ0eXAiOiJKV1Qi..."', action: function(params, options, done) { - return Promise["try"](function() { + return resin.settings.get('dashboardUrl').then(function(dashboardUrl) { + return url.resolve(dashboardUrl, '/preferences'); + }).then(function(preferencesUrl) { if (params.token != null) { return params.token; } - console.info("To login to the Resin CLI, you need your unique token, which is accesible from\nthe preferences page at " + TOKEN_URL + "\n\nAttempting to open a browser at that location..."); - return open(TOKEN_URL)["catch"](function() { - return console.error("Unable to open a web browser in the current environment.\nPlease visit " + TOKEN_URL + " manually."); + console.info("To login to the Resin CLI, you need your unique token, which is accesible from\nthe preferences page at " + preferencesUrl + "\n\nAttempting to open a browser at that location..."); + return open(preferencesUrl)["catch"](function() { + return console.error("Unable to open a web browser in the current environment.\nPlease visit " + preferencesUrl + " manually."); }).then(function() { return form.ask({ message: 'What\'s your token? (visible in the preferences page)', diff --git a/lib/actions/auth.coffee b/lib/actions/auth.coffee index c4f37767..a885c7e0 100644 --- a/lib/actions/auth.coffee +++ b/lib/actions/auth.coffee @@ -3,44 +3,41 @@ open = Promise.promisify(require('open')) _ = require('lodash') url = require('url') resin = require('resin-sdk') -settings = require('resin-settings-client') form = require('resin-cli-form') visuals = require('resin-cli-visuals') validEmail = require('valid-email') events = require('resin-cli-events') -TOKEN_URL = url.resolve(settings.get('dashboardUrl'), '/preferences') - exports.login = signature: 'login [token]' description: 'login to resin.io' - help: """ + help: ''' Use this command to login to your resin.io account. - To login, you need your token, which is accesible from the preferences page: - - #{TOKEN_URL} + To login, you need your token, which is accesible from the preferences page. Examples: $ resin login $ resin login "eyJ0eXAiOiJKV1Qi..." - """ + ''' action: (params, options, done) -> - Promise.try -> + resin.settings.get('dashboardUrl').then (dashboardUrl) -> + return url.resolve(dashboardUrl, '/preferences') + .then (preferencesUrl) -> return params.token if params.token? console.info """ To login to the Resin CLI, you need your unique token, which is accesible from - the preferences page at #{TOKEN_URL} + the preferences page at #{preferencesUrl} Attempting to open a browser at that location... """ - open(TOKEN_URL).catch -> + open(preferencesUrl).catch -> console.error """ Unable to open a web browser in the current environment. - Please visit #{TOKEN_URL} manually. + Please visit #{preferencesUrl} manually. """ .then -> form.ask diff --git a/package.json b/package.json index 26269b63..187c8fba 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ "resin-pine": "^1.3.0", "resin-register-device": "^1.0.1", "resin-sdk": "^2.7.2", - "resin-settings-client": "^1.4.0", "resin-vcs": "^2.0.0", "selfupdate": "^1.1.0", "underscore.string": "^3.1.1",