Skip to content
Permalink
Browse files
fix(repo, auth.sso): don't promisify open-url
This causes a `cb() not called` error as the promisified
function explodes silently.

PR-URL: #2824
Credit: @wraithgar
Close: #2824
Reviewed-by: @ruyadorno
  • Loading branch information
wraithgar authored and ruyadorno committed Mar 4, 2021
1 parent 1efdd96 commit 96006640b902d31415260df5ce3ad8d066a64623
Showing with 7 additions and 13 deletions.
  1. +1 −3 lib/auth/sso.js
  2. +1 −2 lib/repo.js
  3. +4 −6 test/lib/auth/sso.js
  4. +1 −2 test/lib/repo.js
@@ -7,13 +7,11 @@
// CLI, we can remove this, and fold the lib/auth/legacy.js back into
// lib/adduser.js

const { promisify } = require('util')

const log = require('npmlog')
const profile = require('npm-profile')
const npmFetch = require('npm-registry-fetch')

const openUrl = promisify(require('../utils/open-url.js'))
const openUrl = require('../utils/open-url.js')
const otplease = require('../utils/otplease.js')

const pollForSession = ({ registry, token, opts }) => {
@@ -1,10 +1,9 @@
const log = require('npmlog')
const pacote = require('pacote')
const { URL } = require('url')
const { promisify } = require('util')

const hostedFromMani = require('./utils/hosted-git-info-from-manifest.js')
const openUrl = promisify(require('./utils/open-url.js'))
const openUrl = require('./utils/open-url.js')
const usageUtil = require('./utils/usage.js')

class Repo {
@@ -22,14 +22,12 @@ const sso = requireInject('../../../lib/auth/sso.js', {
},
'npm-profile': profile,
'npm-registry-fetch': npmFetch,
'../../../lib/utils/open-url.js': (npm, url, msg, cb) => {
if (url)
cb()
else {
cb(Object.assign(
'../../../lib/utils/open-url.js': async (npm, url, msg) => {
if (!url) {
throw Object.assign(
new Error('failed open url'),
{ code: 'ERROR' }
))
)
}
},
'../../../lib/utils/otplease.js': (opts, fn) => {
@@ -108,10 +108,9 @@ const pacote = {

// keep a tally of which urls got opened
const opened = {}
const openUrl = async (npm, url, errMsg, cb) => {
const openUrl = async (npm, url, errMsg) => {
opened[url] = opened[url] || 0
opened[url]++
process.nextTick(cb)
}

const Repo = requireInject('../../lib/repo.js', {

0 comments on commit 9600664

Please sign in to comment.