function checkConfig() {
if (!config.server() || !config.accessToken()) {
- console.log('You have run "login" first');
+ console.log('Run %s first', 'surfer login'.yellow);
process.exit(1);
}
return tmp;
}
-function login(uri) {
+function login(uri, options) {
var tmp = url.parse(uri);
if (!tmp.slashes) tmp = url.parse('https://' + uri);
console.log('Using server', server.cyan);
- var username = readlineSync.question('Username: ');
- var password = readlineSync.question('Password: ', { hideEchoBack: true, mask: '' });
+ var username = options.username || readlineSync.question('Username: ');
+ var password = options.password || readlineSync.question('Password: ', { hideEchoBack: true, mask: '' });
+
+ if (!username || !password) process.exit(1);
superagent.post(server + '/api/login').send({ username: username, password: password }).end(function (error, result) {
if (error && error.code === 'ENOTFOUND') {
}
if (result.status !== 201) {
console.log('Login failed.\n'.red);
- return login(uri);
+
+ // remove the password to avoid a login loop
+ delete options.password;
+
+ return login(uri, options);
}
// TODO remove at some point, this is just to clear the previous old version values
config.set('server', server);
config.set('accessToken', result.body.accessToken);
- gQuery = { access_token: result.body.accessToken };
-
console.log('Login successful'.green);
});
}
function logout() {
- checkConfig();
+ if (!config.accessToken()) return console.log('Done'.green);
- superagent.post(config.server() + '/api/logout').query(gQuery).end(function (error, result) {
+ superagent.post(config.server() + '/api/logout').query({ access_token: config.accessToken() }).end(function (error, result) {
if (result && result.statusCode !== 200) console.log('Failed to logout: ' + result.statusCode);
if (error) console.log(error);