diff --git a/src/network/got.ts b/src/network/got.ts index fced30bfa0..3c574f3985 100644 --- a/src/network/got.ts +++ b/src/network/got.ts @@ -31,7 +31,7 @@ export type Got = { onProgress?: (downloaded: number, totalSize: number) => void, integrity?: string }): Promise<{}>, - getJSON(url: string): Promise, + getJSON(url: string, registry: string): Promise, } export type NpmRegistryClient = { @@ -58,10 +58,10 @@ export default ( const limit = pLimit(opts.networkConcurrency) - async function getJSON (url: string) { + async function getJSON (url: string, registry: string) { return limit(() => new Promise((resolve, reject) => { const getOpts = { - auth: getCredentialsByURI(url), + auth: getCredentialsByURI(registry), fullMetadata: false, } client.get(url, getOpts, (err: Error, data: Object, raw: Object, res: HttpResponse) => { @@ -81,7 +81,7 @@ export default ( return limit(async () => { await mkdirp(path.dirname(saveto)) - const auth = getCredentialsByURI(opts.registry || url) + const auth = opts.registry && getCredentialsByURI(opts.registry) // If a tarball is hosted on a different place than the manifest, only send // credentials on `alwaysAuth` const shouldAuth = auth && ( diff --git a/src/resolve/git.ts b/src/resolve/git.ts index 710a221927..c8c8094cfe 100644 --- a/src/resolve/git.ts +++ b/src/resolve/git.ts @@ -110,7 +110,8 @@ async function tryResolveViaGitHubApi ( 'commits', spec.ref ].join('/') - const body = await got.getJSON(url) + // TODO: investigate what should be the correct registry path here + const body = await got.getJSON(url, url) return body.sha } diff --git a/src/resolve/npm/loadPackageMeta.ts b/src/resolve/npm/loadPackageMeta.ts index 29ddef1139..ed4a6da619 100644 --- a/src/resolve/npm/loadPackageMeta.ts +++ b/src/resolve/npm/loadPackageMeta.ts @@ -83,7 +83,7 @@ export default async function loadPkgMetaNonCached ( async function fromRegistry (got: Got, spec: PackageSpec, registry: string) { const uri = toUri(spec, registry) - const meta = await got.getJSON(uri) + const meta = await got.getJSON(uri, registry) return meta }