magi-cli
Advanced tools
Comparing version 0.29.0 to 0.29.1
@@ -0,1 +1,6 @@ | ||
# 0.29.1 (2021-02-24) | ||
### Bug Fixes | ||
* use token for bender auth (#130) (c4a6ed9) | ||
# 0.29.0 (2020-12-07) | ||
@@ -2,0 +7,0 @@ |
@@ -10,41 +10,21 @@ 'use strict'; | ||
async function getBenderApi(auth) { | ||
let {username, password} = config.has('bender.vaadin.com') ? config.get('bender.vaadin.com') : {}; | ||
if (auth || !username || !password) { | ||
console.log('Please provide your bender.vaadin.com authentication credentials') | ||
const usernameAnswer = await ask(`Username${username ? ` (${username})` : ''}: `); | ||
if (usernameAnswer) username = usernameAnswer; | ||
if (!username) { | ||
throw 'Empty username'; | ||
let {token} = config.has('bender.vaadin.com') ? config.get('bender.vaadin.com') : {}; | ||
if (auth || !token) { | ||
console.log('Please provide your bender.vaadin.com token') | ||
console.log('To generate a token, go to https://bender.vaadin.com/profile.html?item=accessTokens', | ||
'then paste the token below') | ||
const tokenAnswer = await ask(`token${token ? ` (${token})` : ''}: `); | ||
if (tokenAnswer) token = tokenAnswer; | ||
if (!token) { | ||
throw 'Empty token'; | ||
} else { | ||
config.set('bender.vaadin.com.username', username); | ||
config.set('bender.vaadin.com.token', token); | ||
} | ||
const passwordAnswer = await ask(`Password${password ? ' (press enter to use saved)' : ''}: `); | ||
if (passwordAnswer) password = passwordAnswer; | ||
if (!password) { | ||
throw 'Empty password'; | ||
} else { | ||
config.set('bender.vaadin.com.password', password); | ||
} | ||
} | ||
const authApi = createAPI({ | ||
baseURL: getURL('/httpAuth'), | ||
auth: {username, password}, | ||
headers: {'Origin': 'https://bender.vaadin.com'} | ||
}); | ||
const authResponse = await authApi.get('/server'); | ||
try { | ||
const cookie = authResponse.headers['set-cookie'] | ||
.find(cookie => /^TCSESSIONID=/.test(cookie)) | ||
.split(/;\s+/)[0]; | ||
return createAPI({baseURL: getURL(), headers: { | ||
'Origin': 'https://bender.vaadin.com', | ||
'Cookie': cookie | ||
}}); | ||
} catch (error) { | ||
throw `API Authentication error: incorrect response`; | ||
} | ||
return createAPI({baseURL: getURL(), headers: { | ||
'Authorization': `Bearer ${token}` | ||
}}); | ||
} | ||
module.exports = {getBenderApi}; |
{ | ||
"name": "magi-cli", | ||
"version": "0.29.0", | ||
"version": "0.29.1", | ||
"description": "Elements team command-line team member", | ||
@@ -16,3 +16,3 @@ "main": "./bin/magi", | ||
"dependencies": { | ||
"axios": "^0.19.0", | ||
"axios": "^0.21.1", | ||
"commander": "^2.20.0", | ||
@@ -19,0 +19,0 @@ "configstore": "^3.1.2", |
69915
245
- Removedaxios@0.19.2(transitive)
- Removedfollow-redirects@1.5.10(transitive)
Updatedaxios@^0.21.1