ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-20 06:07:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #266 from resin-io/jviotti/feature/resin-url-info

Browse Source 
Clarify resin url on auth and whoami
This commit is contained in:
Juan Cruz Viotti 2015-11-18 16:15:46 -04:00
commit e42d3e8c4c
2 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
build/actions/auth.js
View File

@ -34,19 +34,22 @@
], ],
primary: true, primary: true,
action: function(params, options, done) { action: function(params, options, done) {
return form.run([ return resin.settings.get('resinUrl').then(function(resinUrl) {
{ console.log("Logging in to " + resinUrl);
message: 'Email:', return form.run([
name: 'email', {
type: 'input', message: 'Email:',
validate: validation.validateEmail name: 'email',
}, { type: 'input',
message: 'Password:', validate: validation.validateEmail
name: 'password', }, {
type: 'password' message: 'Password:',
} name: 'password',
], { type: 'password'
override: options }
], {
override: options
});
}).then(resin.auth.login).then(resin.auth.twoFactor.isPassed).then(function(isTwoFactorAuthPassed) { }).then(resin.auth.login).then(resin.auth.twoFactor.isPassed).then(function(isTwoFactorAuthPassed) {
if (isTwoFactorAuthPassed) { if (isTwoFactorAuthPassed) {
return; return;
@ -114,9 +117,10 @@
action: function(params, options, done) { action: function(params, options, done) {
return Promise.props({ return Promise.props({
username: resin.auth.whoami(), username: resin.auth.whoami(),
email: resin.auth.getEmail() email: resin.auth.getEmail(),
url: resin.settings.get('resinUrl')
}).then(function(results) { }).then(function(results) {
return console.log(visuals.table.vertical(results, ['$account information$', 'username', 'email'])); return console.log(visuals.table.vertical(results, ['$account information$', 'username', 'email', 'url']));
}).nodeify(done); }).nodeify(done);
} }
}; };

28
lib/actions/auth.coffee
View File

@ -32,17 +32,21 @@ exports.login =
] ]
primary: true primary: true
action: (params, options, done) -> action: (params, options, done) ->
form.run [ resin.settings.get('resinUrl')
message: 'Email:' .then (resinUrl) ->
name: 'email' console.log("Logging in to #{resinUrl}")
type: 'input'
validate: validation.validateEmail return form.run [
, message: 'Email:'
message: 'Password:' name: 'email'
name: 'password' type: 'input'
type: 'password' validate: validation.validateEmail
], ,
override: options message: 'Password:'
name: 'password'
type: 'password'
],
override: options
.then(resin.auth.login) .then(resin.auth.login)
.then(resin.auth.twoFactor.isPassed) .then(resin.auth.twoFactor.isPassed)
.then (isTwoFactorAuthPassed) -> .then (isTwoFactorAuthPassed) ->
@ -133,10 +137,12 @@ exports.whoami =
Promise.props Promise.props
username: resin.auth.whoami() username: resin.auth.whoami()
email: resin.auth.getEmail() email: resin.auth.getEmail()
url: resin.settings.get('resinUrl')
.then (results) -> .then (results) ->
console.log visuals.table.vertical results, [ console.log visuals.table.vertical results, [
'$account information$' '$account information$'
'username' 'username'
'email' 'email'
'url'
] ]
.nodeify(done) .nodeify(done)