@pnpm/registry-access.commands 1100.2.16 → 1100.3.1

package/lib/distTag.js

@@ -1,8 +1,12 @@
+import readline from 'node:readline';
+import { input } from '@inquirer/prompts';
 import { docsUrl } from '@pnpm/cli.utils';
 import { pickRegistryForPackage } from '@pnpm/config.pick-registry-for-package';
 import { PnpmError } from '@pnpm/error';
+import { globalInfo, globalWarn } from '@pnpm/logger';
 import { createGetAuthHeaderByURI } from '@pnpm/network.auth-header';
 import { createFetchFromRegistry } from '@pnpm/network.fetch';
+import { SyntheticOtpError, withOtpHandling, } from '@pnpm/network.web-auth';
 import npa from '@pnpm/npm-package-arg';
 import { setDistTag } from '@pnpm/registry-access.client';
 import { renderHelp } from 'render-help';
@@ -103,15 +107,21 @@ async function distTagAdd(opts, params) {
     const registryUrl = pickRegistryForPackage(opts.registries ?? { default: 'https://registry.npmjs.org/' }, packageName);
     const authHeader = getAuthHeaderForRegistry(opts.configByUri, registryUrl);
     const fetchFromRegistry = createFetchFromRegistry(opts);
-    const otp = opts.cliOptions?.otp;
-    await setDistTag({
-        packageName,
-        version,
-        distTag: tag,
-        registryUrl,
-        authHeader,
-        fetchFromRegistry,
-        otp,
+    const cliOtp = opts.cliOptions?.otp;
+    const authType = cliOtp ? 'legacy' : 'web';
+    await withOtpHandling({
+        context: createOtpContext(opts),
+        fetchOptions: WEB_AUTH_FETCH_OPTIONS,
+        operation: (otp) => setDistTag({
+            packageName,
+            version,
+            distTag: tag,
+            registryUrl,
+            authHeader,
+            authType,
+            fetchFromRegistry,
+            otp: otp ?? cliOtp,
+        }),
     });
     return `+${tag}: ${packageName}@${version}`;
 }
@@ -127,24 +137,67 @@ async function distTagRm(opts, params) {
     const registryUrl = pickRegistryForPackage(opts.registries ?? { default: 'https://registry.npmjs.org/' }, packageName);
     const authHeader = getAuthHeaderForRegistry(opts.configByUri, registryUrl);
     const fetchFromRegistry = createFetchFromRegistry(opts);
-    const otp = opts.cliOptions?.otp;
+    const cliOtp = opts.cliOptions?.otp;
     // First check the tag exists
     const distTags = await fetchDistTags(packageName, registryUrl, fetchFromRegistry, authHeader);
     if (!(tag in distTags)) {
         throw new PnpmError('DIST_TAG_NOT_FOUND', `dist-tag "${tag}" is not set on package "${packageName}"`);
     }
     const distTagUrl = getDistTagUrl(packageName, registryUrl, tag);
+    const authType = cliOtp ? 'legacy' : 'web';
+    await withOtpHandling({
+        context: createOtpContext(opts),
+        fetchOptions: WEB_AUTH_FETCH_OPTIONS,
+        operation: (otp) => deleteDistTag({
+            authHeader,
+            authType,
+            distTagUrl,
+            fetchFromRegistry,
+            otp: otp ?? cliOtp,
+            tag,
+        }),
+    });
+    return `-${tag}: ${packageName}@${distTags[tag]}`;
+}
+async function deleteDistTag({ authHeader, authType, distTagUrl, fetchFromRegistry, otp, tag, }) {
     const response = await fetchFromRegistry(distTagUrl, {
         authHeaderValue: authHeader,
         method: 'DELETE',
         headers: {
+            'npm-auth-type': authType,
             ...(otp ? { 'npm-otp': otp } : {}),
         },
     });
-    if (!response.ok) {
-        await throwRegistryError(response, `remove dist-tag "${tag}" from`);
+    if (response.ok)
+        return;
+    const body = await response.text();
+    const action = `remove dist-tag "${tag}" from`;
+    if (response.status === 401) {
+        throw parseAuthError(body, action);
     }
-    return `-${tag}: ${packageName}@${distTags[tag]}`;
+    if (response.status === 403) {
+        throw new PnpmError('FORBIDDEN', `You do not have permission to ${action} this package. ${body}`);
+    }
+    throw new PnpmError('REGISTRY_ERROR', `Failed to ${action} package: ${response.status} ${response.statusText}. ${body}`);
+}
+function parseAuthError(body, action) {
+    let parsed;
+    try {
+        parsed = JSON.parse(body);
+    }
+    catch {
+        parsed = undefined;
+    }
+    if (parsed != null && typeof parsed === 'object' && 'authUrl' in parsed && 'doneUrl' in parsed) {
+        return new SyntheticOtpError({
+            authUrl: typeof parsed.authUrl === 'string' ? parsed.authUrl : undefined,
+            doneUrl: typeof parsed.doneUrl === 'string' ? parsed.doneUrl : undefined,
+        });
+    }
+    if (/one-time pass/i.test(body)) {
+        return new SyntheticOtpError(undefined);
+    }
+    return new PnpmError('UNAUTHORIZED', `You must be logged in to ${action} packages. ${body}`);
 }
 function getAuthHeaderForRegistry(configByUri, registryUrl) {
     const getAuthHeader = createGetAuthHeaderByURI(configByUri ?? {});
@@ -168,14 +221,22 @@ async function fetchDistTags(packageName, registryUrl, fetchFromRegistry, authHe
     }
     return await response.json();
 }
-async function throwRegistryError(response, action) {
-    const errorBody = await response.text();
-    if (response.status === 401) {
-        throw new PnpmError('UNAUTHORIZED', `You must be logged in to ${action} packages. ${errorBody}`);
-    }
-    if (response.status === 403) {
-        throw new PnpmError('FORBIDDEN', `You do not have permission to ${action} this package. ${errorBody}`);
-    }
-    throw new PnpmError('REGISTRY_ERROR', `Failed to ${action} package: ${response.status} ${response.statusText}. ${errorBody}`);
+const WEB_AUTH_FETCH_OPTIONS = {
+    method: 'GET',
+};
+// `withOtpHandling` polls `doneUrl` through `context.fetch`, so it must inherit
+// the command's proxy/TLS/`configByUri` config — otherwise the write succeeds
+// but the web-auth retry fails in custom-network environments.
+function createOtpContext(opts) {
+    return {
+        Date,
+        createReadlineInterface: readline.createInterface.bind(null, { input: process.stdin }),
+        enquirer: { input },
+        fetch: createFetchFromRegistry(opts),
+        globalInfo,
+        globalWarn,
+        process,
+        setTimeout,
+    };
 }
 //# sourceMappingURL=distTag.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/registry-access.commands",
-  "version": "1100.2.16",
+  "version": "1100.3.1",
   "description": "Commands for managing packages on the registry",
   "keywords": [
     "pnpm",
@@ -8,7 +8,10 @@
   ],
   "license": "MIT",
   "funding": "https://opencollective.com/pnpm",
-  "repository": "https://github.com/pnpm/pnpm/tree/main/registry-access/commands",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/pnpm/pnpm/tree/main/registry-access/commands"
+  },
   "homepage": "https://github.com/pnpm/pnpm/tree/main/registry-access/commands#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
@@ -24,32 +27,38 @@
     "!*.map"
   ],
   "dependencies": {
+    "@inquirer/prompts": "^8.4.3",
     "@pnpm/npm-package-arg": "^2.0.0",
     "chalk": "^5.6.2",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "render-help": "^2.0.0",
     "semver": "^7.8.1",
-    "@pnpm/cli.utils": "1101.0.8",
-    "@pnpm/config.pick-registry-for-package": "1100.0.6",
+    "@pnpm/config.reader": "1101.6.0",
+    "@pnpm/network.auth-header": "1101.1.0",
+    "@pnpm/network.fetch": "1100.1.0",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/config.reader": "1101.4.1",
-    "@pnpm/network.auth-header": "1101.0.0",
-    "@pnpm/registry-access.client": "1100.0.1",
-    "@pnpm/network.fetch": "1100.0.7",
-    "@pnpm/types": "1101.2.0",
-    "@pnpm/resolving.registry.types": "1100.0.5"
+    "@pnpm/config.pick-registry-for-package": "1100.0.7",
+    "@pnpm/cli.utils": "1101.0.9",
+    "@pnpm/resolving.registry.types": "1100.1.1",
+    "@pnpm/types": "1101.3.0",
+    "@pnpm/network.web-auth": "1101.1.0",
+    "@pnpm/registry-access.client": "1100.1.1"
+  },
+  "peerDependencies": {
+    "@pnpm/logger": "^1001.0.1"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
-    "@pnpm/registry-mock": "6.0.0",
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
     "execa": "npm:safe-execa@0.3.0",
-    "@pnpm/prepare": "1100.0.11",
-    "@pnpm/registry-access.commands": "1100.2.16",
-    "@pnpm/testing.mock-agent": "1100.0.7",
-    "@pnpm/releasing.commands": "1100.3.1",
-    "@pnpm/testing.command-defaults": "1100.0.1"
+    "@pnpm/prepare": "1100.0.13",
+    "@pnpm/registry-access.commands": "1100.3.1",
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/releasing.commands": "1100.4.2",
+    "@pnpm/testing.mock-agent": "1101.0.0",
+    "@pnpm/testing.command-defaults": "1100.0.3",
+    "@pnpm/testing.registry-mock": "1100.0.3"
   },
   "engines": {
     "node": ">=22.13"