pnpm login, pnpm adduser, and pnpm logout dropped the last path segment of a registry hosted under a URL subpath when the configured URL had no trailing slash: normalize-registry-url 2.0.1 returns URLs that already contain a path unchanged instead of appending the slash, and the WHATWG relative resolution used to build the -/v1/login, couchdb-user, and token-revocation endpoints then resolves against the truncated parent path. The auth token was likewise stored under a truncated key. Registries at a domain root were unaffected, and so were subpath URLs written with a trailing slash. Fix the package once for every consumer (config reader, login, logout, publish registry keys) with a patchedDependencies patch that always appends the trailing slash, matching the Rust CLI, whose normalization was already correct. The lockfile diff is limited to the patch hashes; the unrelated peer-context re-resolution a full install wanted to make was reverted deliberately. The config-reader test expectations that encoded the old truncating behavior are updated to expect the trailing slash. The Rust side gains the mirrored subpath-without-trailing-slash tests for web login, classic login, and logout; its behavior is unchanged.
218 lines
5.6 KiB
TypeScript
218 lines
5.6 KiB
TypeScript
import fs from 'node:fs'
|
|
|
|
import { expect, test } from '@jest/globals'
|
|
import { prepareEmpty } from '@pnpm/prepare'
|
|
|
|
import { getNetworkConfigs, type NetworkConfigs } from '../src/getNetworkConfigs.js'
|
|
|
|
test('without files', () => {
|
|
expect(getNetworkConfigs({})).toStrictEqual({
|
|
registries: {},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo/',
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'//example.com/foo:ca': 'some-ca',
|
|
})).toStrictEqual({
|
|
registries: {},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
tls: { ca: 'some-ca' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'//example.com/foo:cert': 'some-cert',
|
|
})).toStrictEqual({
|
|
registries: {},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
tls: { cert: 'some-cert' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:ca': 'some-ca',
|
|
'//example.com/foo:cert': 'some-cert',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo/',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
tls: { ca: 'some-ca', cert: 'some-cert' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
})
|
|
|
|
test('with files', () => {
|
|
prepareEmpty()
|
|
|
|
fs.writeFileSync('cafile', 'some-ca')
|
|
fs.writeFileSync('certfile', 'some-cert')
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:cafile': 'cafile',
|
|
'//example.com/foo:certfile': 'certfile',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo/',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
tls: { ca: 'some-ca', cert: 'some-cert' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
})
|
|
|
|
test('auth and tls combined', () => {
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:_authToken': 'example auth token',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo/',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
'@': { authToken: 'example auth token' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:_auth': btoa('foo:bar'),
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo/',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
'@': {
|
|
basicAuth: {
|
|
username: 'foo',
|
|
password: 'bar',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:username': 'foo',
|
|
'//example.com/foo:_password': btoa('bar'),
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo/',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
'@': {
|
|
basicAuth: {
|
|
username: 'foo',
|
|
password: 'bar',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:tokenHelper': 'node ./my-token-helper.cjs',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo/',
|
|
},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
'@': { tokenHelper: ['node', './my-token-helper.cjs'] },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
|
|
expect(getNetworkConfigs({
|
|
'//example.com/foo:_authToken': 'token',
|
|
'//example.com/foo:cert': 'some-cert',
|
|
'//example.com/foo:key': 'some-key',
|
|
})).toStrictEqual({
|
|
registries: {},
|
|
configByUri: {
|
|
'//example.com/foo': {
|
|
'@': { authToken: 'token' },
|
|
tls: { cert: 'some-cert', key: 'some-key' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
})
|
|
|
|
test('package-scope auth is grouped under the registry URI', () => {
|
|
expect(getNetworkConfigs({
|
|
'//npm.pkg.github.com/:_authToken': 'registry-token',
|
|
'//npm.pkg.github.com/:@orgA:_authToken': 'org-a-token',
|
|
'//npm.pkg.github.com/:@orgB:_authToken': 'org-b-token',
|
|
'//reg.com/npm/:@orgA:_authToken': 'org-a-path-token',
|
|
'//localhost:4873/:@orgC:_authToken': 'org-c-port-token',
|
|
})).toStrictEqual({
|
|
registries: {},
|
|
configByUri: {
|
|
'//npm.pkg.github.com/': {
|
|
'@': { authToken: 'registry-token' },
|
|
'@orgA': { authToken: 'org-a-token' },
|
|
'@orgB': { authToken: 'org-b-token' },
|
|
},
|
|
'//reg.com/npm/': {
|
|
'@orgA': { authToken: 'org-a-path-token' },
|
|
},
|
|
'//localhost:4873/': {
|
|
'@orgC': { authToken: 'org-c-port-token' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
})
|
|
|
|
test('slash package-scope auth is grouped under the registry URI', () => {
|
|
expect(getNetworkConfigs({
|
|
'//npm.pkg.github.com/@orgA:_authToken': 'org-a-token',
|
|
'//npm.pkg.github.com/@orgB/:_authToken': 'org-b-token',
|
|
'//reg.com/npm/@orgA:_authToken': 'org-a-path-token',
|
|
})).toStrictEqual({
|
|
registries: {},
|
|
configByUri: {
|
|
'//npm.pkg.github.com/': {
|
|
'@orgA': { authToken: 'org-a-token' },
|
|
'@orgB': { authToken: 'org-b-token' },
|
|
},
|
|
'//reg.com/npm/': {
|
|
'@orgA': { authToken: 'org-a-path-token' },
|
|
},
|
|
},
|
|
} as NetworkConfigs)
|
|
})
|
|
|
|
test('unsupported key', () => {
|
|
expect(getNetworkConfigs({
|
|
'@foo:registry': 'https://example.com/foo',
|
|
'//example.com/foo:someUnsupportedKey': 'hello world',
|
|
})).toStrictEqual({
|
|
registries: {
|
|
'@foo': 'https://example.com/foo/',
|
|
},
|
|
} as NetworkConfigs)
|
|
})
|