Skip to content

Commit bdbd0f9

Browse files
committed
fix: adapt for latest keytar
1 parent 358f9ed commit bdbd0f9

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ module.exports = async function (argv) {
5353

5454
if ((info.options.argv.remain[0] !== 'setup' && info.options.argv.remain[0] !== 'init') || info.options.help) {
5555
console.log(`
56-
semantic-release-cli
56+
semantic-release-cli (v${ownPkg.version})
5757
5858
Usage:
5959
semantic-release-cli setup [--tag=<String>]

src/lib/github.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,13 @@ module.exports = async function (pkg, info) {
9191
name: 'password',
9292
message: 'What is your GitHub password?',
9393
validate: _.ary(_.bind(validator.isLength, validator, _, 1), 1),
94-
when: answers => !info.options.keychain || info.options['ask-for-passwords'] || !passwordStorage.get(answers.username)
94+
when: async answers => {
95+
const storedPassword = await passwordStorage.get(answers.username)
96+
return !info.options.keychain || info.options['ask-for-passwords'] || !storedPassword
97+
}
9598
}])
9699

97-
answers.password = answers.password || passwordStorage.get(answers.username)
100+
answers.password = answers.password || await passwordStorage.get(answers.username)
98101

99102
info.github = answers
100103
info.github.endpoint = info.ghepurl || 'https://api.github.com'

src/lib/npm.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ module.exports = async function (pkg, info) {
5656
name: 'password',
5757
message: 'What is your npm password?',
5858
validate: _.ary(_.bind(validator.isLength, null, _, 1), 1),
59-
when: answers => {
59+
when: async answers => {
6060
if (_.has(info.options, 'npm-token')) return false
61-
return !info.options.keychain || info.options['ask-for-passwords'] || !passwordStorage.get(answers.username)
61+
const storedPassword = await passwordStorage.get(answers.username)
62+
return !info.options.keychain || info.options['ask-for-passwords'] || !storedPassword
6263
}
6364
}])
6465

@@ -68,7 +69,11 @@ module.exports = async function (pkg, info) {
6869
return
6970
}
7071

71-
info.npm.password = info.npm.password || passwordStorage.get(info.npm.username)
72+
const storedPassword = await passwordStorage.get(info.npm.username)
73+
console.log(`\nstoredPassword ==============================`)
74+
console.log(storedPassword)
75+
76+
info.npm.password = info.npm.password || storedPassword
7277

7378
await getNpmToken(info)
7479
}

src/lib/password-storage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ module.exports = function (service) {
1313
const key = `semantic-release-cli:${service}`
1414
return {
1515
get: username => keytar.getPassword(key, username),
16-
set: (username, password) => keytar.replacePassword(key, username, password)
16+
set: (username, password) => keytar.setPassword(key, username, password)
1717
}
1818
}

0 commit comments

Comments
 (0)