ado-npm-auth 0.0.3 → 0.1.1

package/README.md

@@ -12,6 +12,14 @@ You can run the binary `"ado-npm-auth"` via `yarn ado-npm-auth` or `npm exec ado
 
 It will then shell out to the `azureauth` package on [npm](https://www.npmjs.com/package/azureauth), retrieve a token, and update your `~/.npmrc`.
 
+## Beware the chicken and egg problem
+
+You may need to set the registry to the public NPM feed when running `npm exec` or `npx`. 
+
+If that's the case, set the environment variable `npm_config_registry=https://registry.npmjs.org`. 
+
+That will ensure that `npx` or `npm exec` grabs from the public NPM feed, bypassing the soon-to-be authenticated ADO feed. 
+
 ## ado-npm-auth vs vsts-npm-auth
 
 The main difference between the two is how they function, and where they can run. The `vsts-npm-auth` tool is Windows only, and uses MSAL authentication.
@@ -32,4 +40,4 @@ One of the easiest ways to use the tool is to add it to your `"preinstall"` scri
 
 It will then perform a quick "pre-flight" check to assess if the token is valid, and generate a new one if it has expired.
 
-![screenshot of tool running via preinstall](https://github.com/microsoft/ado-npm-auth/raw/main/packages/ado-npm-auth/static/preinstall.png)
+![screenshot of tool running via preinstall](https://github.com/microsoft/ado-npm-auth/raw/main/packages/ado-npm-auth/static/preinstall.png)

package/dist/ado-npm-auth.cjs

@@ -38004,6 +38004,14 @@ module.exports = require("fs");
 
 /***/ }),
 
+/***/ 1455:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("node:fs/promises");
+
+/***/ }),
+
 /***/ 6760:
 /***/ ((module) => {
 
@@ -38098,7 +38106,7 @@ __webpack_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony import */ var _utils_is_codespaces_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(3827);
 /* harmony import */ var _telemetry_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6000);
 /* harmony import */ var os__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(857);
-/* harmony import */ var _npmrc_is_valid_pat_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(5192);
+/* harmony import */ var _npmrc_is_valid_pat_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(7467);
 /* harmony import */ var _npmrc_set_npmrc_pat_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4460);
 
 
@@ -38176,7 +38184,9 @@ __webpack_async_result__();
 /* harmony import */ var _npmcli_config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7954);
 /* harmony import */ var workspace_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6892);
 /* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(6760);
-/* harmony import */ var _utils_get_organization_from_feed_url_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(962);
+/* harmony import */ var node_fs_promises__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(1455);
+/* harmony import */ var _utils_get_organization_from_feed_url_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(962);
+
 
 
 
@@ -38190,17 +38200,26 @@ const getRepoNpmrcAdoOrganizations = async () => {
     var _a;
     const workspaceRoot = (0,workspace_tools__WEBPACK_IMPORTED_MODULE_1__.getWorkspaceRoot)(process.cwd()) || "";
     let config;
-    // TODO: check for workspaces npmrc
+    const npmrcPath = (0,node_path__WEBPACK_IMPORTED_MODULE_2__.join)(workspaceRoot, ".npmrc");
+    try {
+        await node_fs_promises__WEBPACK_IMPORTED_MODULE_3__.access(npmrcPath);
+    }
+    catch (error) {
+        throw new Error("No project .npmrc file found");
+    }
     try {
         config = new _npmcli_config__WEBPACK_IMPORTED_MODULE_0__({
-            npmPath: (0,node_path__WEBPACK_IMPORTED_MODULE_2__.join)(workspaceRoot, ".npmrc"),
+            npmPath: npmrcPath,
             shorthands: {},
             definitions: {}, // needed so we can access random feed names
         });
         await config.load();
     }
     catch (error) {
-        throw new Error("No project .npmrc file found");
+        if (error instanceof TypeError && error.message.includes("Invalid URL")) {
+            throw new Error("Registry URL missing or invalid");
+        }
+        throw new Error("Error loading .npmrc");
     }
     // @npmcli/config does not have a normal way to display all keys
     // so we use this ugly access instead
@@ -38211,7 +38230,7 @@ const getRepoNpmrcAdoOrganizations = async () => {
         const feed = config.get(registry, "project");
         return {
             feed,
-            organization: (0,_utils_get_organization_from_feed_url_js__WEBPACK_IMPORTED_MODULE_3__/* .getOrganizationFromFeedUrl */ .N)(feed),
+            organization: (0,_utils_get_organization_from_feed_url_js__WEBPACK_IMPORTED_MODULE_4__/* .getOrganizationFromFeedUrl */ .N)(feed),
         };
     });
 };
@@ -38219,7 +38238,7 @@ const getRepoNpmrcAdoOrganizations = async () => {
 
 /***/ }),
 
-/***/ 5192:
+/***/ 7467:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -38391,8 +38410,8 @@ var get_organization_from_feed_url = __webpack_require__(962);
 const external_node_os_namespaceObject = require("node:os");
 // EXTERNAL MODULE: external "node:path"
 var external_node_path_ = __webpack_require__(6760);
-;// CONCATENATED MODULE: external "node:fs/promises"
-const promises_namespaceObject = require("node:fs/promises");
+// EXTERNAL MODULE: external "node:fs/promises"
+var promises_ = __webpack_require__(1455);
 // EXTERNAL MODULE: ./lib/npmrc/get-repo-npmrc-ado-orgs.js
 var get_repo_npmrc_ado_orgs = __webpack_require__(2236);
 ;// CONCATENATED MODULE: ./lib/npmrc/is-valid-pat.js
@@ -38410,17 +38429,17 @@ const isValidPat = async () => {
 const removeUserNpmrcRegistries = async () => {
     const userNpmrc = (0,external_node_path_.join)((0,external_node_os_namespaceObject.homedir)(), ".npmrc");
     try {
-        const npmrcContent = await (0,promises_namespaceObject.readFile)(userNpmrc, "utf-8");
+        const npmrcContent = await (0,promises_.readFile)(userNpmrc, "utf-8");
         // remove the entry for registries in the user-level .npmrc
         const updatedNpmrcContent = npmrcContent
             .split(external_node_os_namespaceObject.EOL)
             .filter((line) => !line.includes("registry="))
             .join(external_node_os_namespaceObject.EOL);
-        await (0,promises_namespaceObject.writeFile)(userNpmrc, updatedNpmrcContent);
+        await (0,promises_.writeFile)(userNpmrc, updatedNpmrcContent);
     }
     catch (error) {
         // user npmrc does not exist so make an empty one
-        await (0,promises_namespaceObject.writeFile)(userNpmrc, "");
+        await (0,promises_.writeFile)(userNpmrc, "");
     }
 };
 const getNpmrcFeeds = async () => {
@@ -38439,7 +38458,7 @@ const getNpmrcFeeds = async () => {
 };
 const getUserNpmrcFeeds = async () => {
     const userNpmrcFilepath = (0,external_node_path_.join)((0,external_node_os_namespaceObject.homedir)(), ".npmrc");
-    const userNpmrcContent = await (0,promises_namespaceObject.readFile)(userNpmrcFilepath, "utf-8");
+    const userNpmrcContent = await (0,promises_.readFile)(userNpmrcFilepath, "utf-8");
     return userNpmrcContent
         .split(external_node_os_namespaceObject.EOL)
         .filter((line) => line.includes(":_password="))
@@ -38525,6 +38544,9 @@ var is_wsl = __webpack_require__(1891);
 ;// CONCATENATED MODULE: ./lib/azureauth/azureauth-command.js
 
 let memo = undefined;
+const clearMemo = () => {
+    memo = void 0;
+};
 /**
  * Get the executable path of azureauth command
  * @returns { string } the string of the executable command to run azureauth
@@ -38532,6 +38554,7 @@ let memo = undefined;
 const npxAzureAuthCommand = [
     "npm",
     "exec",
+    "--silent",
     "--yes",
     "azureauth",
     "--",
@@ -38549,13 +38572,16 @@ var external_child_process_ = __webpack_require__(5317);
 
 
 let is_azureauth_installed_memo = undefined;
+const is_azureauth_installed_clearMemo = () => {
+    is_azureauth_installed_memo = void 0;
+};
 /**
  * Determine if a valid version (>=0.8.0.0) is installed
  * @returns { boolean } Whether a valid version of azureauth is installed
  */
 const isAzureAuthInstalled = async () => {
     if (is_azureauth_installed_memo === undefined) {
-        const command = `${azureAuthCommand()} --version`;
+        const command = `${azureAuthCommand().join(" ")} --version`;
         try {
             const result = await exec(command);
             // version must be >=0.8.0.0
@@ -38629,13 +38655,21 @@ const adoPat = async (options) => {
                         npm_config_registry: "https://registry.npmjs.org",
                     },
                 });
+                if (result.stderr) {
+                    throw new Error(result.stderr);
+                }
             }
             catch (error) {
-                throw new Error(`Failed to get Ado Pat from npx AzureAuth: ${error.message}. Adding the --skip-auth flag may fix this issue.`);
+                throw new Error(`Failed to get Ado Pat from npx AzureAuth: ${error.message}`);
             }
         }
         if (options.output === "json") {
-            return JSON.parse(result.stdout);
+            try {
+                return JSON.parse(result.stdout);
+            }
+            catch (error) {
+                throw new Error(`Failed to parse JSON output: ${result.stdout}`);
+            }
         }
         return result.stdout;
     }
@@ -38838,7 +38872,9 @@ const logTelemetry = (inputProperties, flush, client) => {
  */
 const getFeedWithoutProtocol = (feed) => {
     const feedUrl = new URL(feed);
-    const feedWithoutProtocol = `${feedUrl.host}${feedUrl.pathname}`;
+    const protocol = feedUrl.protocol; // will be something like "http:"
+    const protocolLength = protocol.length + 2; // we want to strip out the protocol, colon, and double slash
+    const feedWithoutProtocol = feedUrl.toString().slice(protocolLength);
     return feedWithoutProtocol;
 };
 //# sourceMappingURL=get-feed-without-protocol.js.map
@@ -38852,6 +38888,68 @@ const getFeedWithoutProtocol = (feed) => {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   N: () => (/* binding */ getOrganizationFromFeedUrl)
 /* harmony export */ });
+/**
+ * Extracts the organization and project details from a given Azure DevOps URL.
+ * The function differentiates between the "new style" URLs that use 'dev.azure.com'
+ * and "old style" URLs that use a subdomain of 'visualstudio.com'.
+ *
+ * @param {string} url - The Azure DevOps URL from which to extract details.
+ * @returns {Object} An object containing the `organization` and `project` extracted from the URL.
+ * @throws {Error} Throws an error if the URL is invalid, not in the expected format,
+ *                 or does not contain the necessary information for extraction.
+ *
+ * @example
+ * // New style URL
+ * extractAdoDetails("https://dev.azure.com/contoso/WebsiteRedesign");
+ * // returns { organization: "contoso", project: "WebsiteRedesign" }
+ *
+ * // Old style URL
+ * extractAdoDetails("https://contoso.visualstudio.com/WebsiteRedesign");
+ * // returns { organization: "contoso", project: "WebsiteRedesign" }
+ *
+ * // Invalid URL
+ * extractAdoDetails("https://invalid.url.com");
+ * // throws Error
+ */
+const extractAdoDetails = (url) => {
+    try {
+        const parsedUrl = new URL(url);
+        const hostname = parsedUrl.hostname;
+        const pathname = parsedUrl.pathname;
+        // Check for new style URLs (dev.azure.com)
+        if (hostname.endsWith("dev.azure.com")) {
+            const pathSegments = pathname.split('/').filter(Boolean); // Remove empty strings from the split result
+            if (pathSegments.length >= 2) {
+                return {
+                    organization: pathSegments[0],
+                    project: pathSegments[1]
+                };
+            }
+            else {
+                throw new Error("Not enough segments in path for a valid organization and project extraction.");
+            }
+        }
+        // Check for old style URLs (visualstudio.com)
+        if (hostname.endsWith("visualstudio.com")) {
+            const subdomain = hostname.split('.')[0];
+            const pathSegments = pathname.split('/').filter(Boolean);
+            if (subdomain && pathSegments.length >= 1) {
+                return {
+                    organization: subdomain,
+                    project: pathSegments[0]
+                };
+            }
+            else {
+                throw new Error("Not enough segments in path or missing subdomain for a valid organization and project extraction.");
+            }
+        }
+        // If the URL does not match expected formats
+        throw new Error("URL format not recognized or does not contain enough information.");
+    }
+    catch (error) {
+        throw new Error("Invalid URL or unsupported format");
+    }
+};
 /**
  * Get the ADO Org for a npm feed
  * @param {string} feedUrl URL of the feed to get the ADO organization from
@@ -38860,19 +38958,8 @@ const getFeedWithoutProtocol = (feed) => {
  */
 const getOrganizationFromFeedUrl = (feedUrl, defaultOrg = "") => {
     try {
-        const url = new URL(feedUrl);
-        const packagingIndex = url.pathname.indexOf("/_packaging");
-        if (packagingIndex > 0) {
-            // sometimes org is included in the path as the first item in the path
-            // after the initial "/"
-            // ex. "https://pkgs.dev.azure.com/foo/bar/_packaging/baz/npm/registry/" -> "foo"
-            // these are project-scoped feeds
-            return url.pathname.split("/")[1];
-        }
-        // otherwise feed is the first item in the host
-        // ex. "https://foo.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry" -> "foo"
-        // these are org-wide feeds
-        return url.host.split(".")[0];
+        const { organization } = extractAdoDetails(feedUrl);
+        return organization;
     }
     catch (error) {
         return defaultOrg;