azureauth 0.4.4 → 0.4.6

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "azureauth",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "node-azure auth wrapps the AzureAuth CLI wrapper for performing AAD Authentication",
   "bin": {
     "azureauth": "./cli.js"
   },
+  "repository": {
+    "url": "https://github.com/jcreamer898/node-azureauth"
+  },
   "main": "lib/index.js",
   "type": "module",
   "scripts": {

package/scripts/install.js

@@ -2,9 +2,10 @@ import path from "path";
 import fs from "fs";
 import { DownloaderHelper } from "node-downloader-helper";
 import decompress from "decompress";
-import { fileURLToPath } from 'url'
+import { fileURLToPath } from "url";
 
-const __dirname = fileURLToPath(new URL('.', import.meta.url))
+const __dirname = fileURLToPath(new URL(".", import.meta.url));
+const AZURE_AUTH_VERSION = "0.8.4";
 
 async function download(url, saveDirectory) {
   const downloader = new DownloaderHelper(url, saveDirectory);
@@ -27,11 +28,11 @@ const arch = process.arch;
 
 const AZUREAUTH_INFO = {
   name: "azureauth",
-  // https://github.com/AzureAD/microsoft-authentication-cli/releases/download/0.8.2/azureauth-0.8.2-osx-arm64.tar.gz
-  // https://github.com/AzureAD/microsoft-authentication-cli/releases/download/0.8.2/azureauth-0.8.2-osx-x64.tar.gz
-  // https://github.com/AzureAD/microsoft-authentication-cli/releases/download/0.8.2/azureauth-0.8.2-win10-x64.zip
+  // https://github.com/AzureAD/microsoft-authentication-cli/releases/download/${AZUREAUTH_INFO.version}/azureauth-${AZUREAUTH_INFO.version}-osx-arm64.tar.gz
+  // https://github.com/AzureAD/microsoft-authentication-cli/releases/download/${AZUREAUTH_INFO.version}/azureauth-${AZUREAUTH_INFO.version}-osx-x64.tar.gz
+  // https://github.com/AzureAD/microsoft-authentication-cli/releases/download/${AZUREAUTH_INFO.version}/azureauth-${AZUREAUTH_INFO.version}-win10-x64.zip
   url: "https://github.com/AzureAD/microsoft-authentication-cli/releases/download/",
-  version: "0.8.2",
+  version: AZURE_AUTH_VERSION,
 };
 
 const AZUREAUTH_NAME_MAP = {
@@ -67,33 +68,36 @@ export const install = async () => {
   // if platform is missing, download source instead of executable
   const DOWNLOAD_MAP = {
     win32: {
-      def: "azureauth.exe",
-      x64: "azureauth-0.8.2-win10-x64.zip",
+      x64: `azureauth-${AZUREAUTH_INFO.version}-win10-x64.zip`,
     },
     darwin: {
-      def: "azureauth",
-      x64: "azureauth-0.8.2-osx-x64.tar.gz",
+      x64: `azureauth-${AZUREAUTH_INFO.version}-osx-x64.tar.gz`,
+      arm64: `azureauth-${AZUREAUTH_INFO.version}-osx-arm64.tar.gz`,
     },
     // TODO: support linux when the binaries are available
     // linux: {
     //   def: "azureauth.exe",
-    //   x64: "azureauth-0.8.2-win10-x64.zip",
+    //   x64: "azureauth-${AZUREAUTH_INFO.version}-win10-x64.zip",
     // },
   };
   if (platform in DOWNLOAD_MAP) {
     // download the executable
-    const filename =
-      arch in DOWNLOAD_MAP[platform]
-        ? DOWNLOAD_MAP[platform][arch]
-        : DOWNLOAD_MAP[platform].def;
-
+    let filename = "";
+    if (arch in DOWNLOAD_MAP[platform]) {
+      filename = DOWNLOAD_MAP[platform][arch];
+    } else {
+      throw new Error("Arch is not supported in azureauth");
+    }
     const url = `${AZUREAUTH_INFO.url}${AZUREAUTH_INFO.version}/${filename}`;
     const distPath = path.join(OUTPUT_DIR, "azureauth");
     const archivePath = path.join(OUTPUT_DIR, filename);
 
     console.log(`Downloading azureauth from ${url}`);
-    await download(url, OUTPUT_DIR);
-
+    try {
+      await download(url, OUTPUT_DIR);
+    } catch (err) {
+      throw new Error(`Download failed: ${err.message}`);
+    }
     console.log(`Downloaded in ${OUTPUT_DIR}`);
 
     // Make a dir to uncompress the zip or tar into
@@ -117,4 +121,15 @@ export const install = async () => {
   }
 };
 
-await install();
+const MAX_RETRIES = 3;
+for (let i = 0; i < MAX_RETRIES; i++) {
+  try {
+    await install();
+    break; // success, so exit the loop
+  } catch (err) {
+    console.log(`Install failed: ${err.message}`);
+  }
+  if (i === MAX_RETRIES - 1) {
+    throw new Error(`Install failed after ${MAX_RETRIES} attempts`);
+  }
+}