@cloudflare/workers-auth 0.5.3 → 0.5.4

package/dist/cf/index.mjs

@@ -1,5 +1,5 @@
-import { createAuthConfigFileHelpers, createPreferences, createKeyringPreference, createFileStorage, createCloudflareAuth, createCloudflareProfileStore } from '../chunk-7PS36DJW.mjs';
-import '../chunk-5WRJ2ZUV.mjs';
+import { createAuthConfigFileHelpers, createPreferences, createKeyringPreference, createFileStorage, createCloudflareAuth, createCloudflareProfileStore } from '../chunk-RTFTHYPD.mjs';
+import '../chunk-PBW6773T.mjs';
 import { __name } from '../chunk-O6YSETKJ.mjs';
 import { getEnvironmentVariableFactory, getGlobalConfigPath, getCloudflareApiEnvironmentFromEnv } from '@cloudflare/workers-utils';
 import path from 'node:path';

package/dist/{chunk-5WRJ2ZUV.mjs → chunk-PBW6773T.mjs}

@@ -1,6 +1,6 @@
 import { __name } from './chunk-O6YSETKJ.mjs';
 import { getEnvironmentVariableFactory, getCloudflareApiEnvironmentFromEnv, getBooleanEnvironmentVariableFactory, UserError, readFileSync, isNonInteractiveOrCI, getCloudflareApiBaseUrl, COMPLIANCE_REGION_CONFIG_PUBLIC, FatalError, getCloudflareComplianceRegion, parseTOML } from '@cloudflare/workers-utils';
-import { spawnSync } from 'node:child_process';
+import { spawn, spawnSync } from 'node:child_process';
 import { fetch } from 'undici';
 import { webcrypto, createHash, randomBytes, createCipheriv, createDecipheriv } from 'node:crypto';
 import { TextEncoder } from 'node:util';
@@ -208,14 +208,14 @@ See https://developers.cloudflare.com/cloudflare-one/access-controls/service-cre
     );
   }
   logger.debug("Spawning cloudflared to get Access token for domain:");
-  const output = spawnSync("cloudflared", ["access", "login", domain]);
+  const output = await spawnCloudflaredAccessLogin(domain, options.signal);
   if (output.error) {
     throw new UserError(
       "To use Wrangler with Cloudflare Access, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation",
       { telemetryMessage: "user access missing cloudflared" }
     );
   }
-  const stringOutput = output.stdout.toString();
+  const stringOutput = output.stdout;
   logger.debug("cloudflared output:", stringOutput);
   const matches = stringOutput.match(/fetched your token:\n\n(.*)/m);
   if (matches && matches.length >= 2) {
@@ -227,6 +227,33 @@ See https://developers.cloudflare.com/cloudflare-one/access-controls/service-cre
   throw new Error("Failed to authenticate with Cloudflare Access");
 }
 __name(getAccessHeaders, "getAccessHeaders");
+function spawnCloudflaredAccessLogin(domain, signal) {
+  return new Promise((resolve, reject) => {
+    const child = spawn("cloudflared", ["access", "login", domain], { signal });
+    const stdoutChunks = [];
+    child.stdout.on("data", (chunk) => stdoutChunks.push(chunk));
+    child.stderr.resume();
+    const killChild = /* @__PURE__ */ __name(() => child.kill(), "killChild");
+    process.once("exit", killChild);
+    child.on("error", (error) => {
+      process.removeListener("exit", killChild);
+      if (signal?.aborted) {
+        reject(error);
+        return;
+      }
+      resolve({ error, stdout: "" });
+    });
+    child.on("close", () => {
+      process.removeListener("exit", killChild);
+      if (signal?.aborted) {
+        reject(signal.reason ?? new Error("The operation was aborted"));
+        return;
+      }
+      resolve({ stdout: Buffer.concat(stdoutChunks).toString() });
+    });
+  });
+}
+__name(spawnCloudflaredAccessLogin, "spawnCloudflaredAccessLogin");
 async function getCloudflareAccessHeaders(options) {
   const cfAuthToken = getCfAuthorizationTokenFromEnv();
   if (cfAuthToken !== void 0) {

package/dist/{chunk-7PS36DJW.mjs → chunk-RTFTHYPD.mjs}

@@ -1,4 +1,4 @@
-import { stringifyFile, parseFile, dedent, createCredentialStorageContext, createOAuthFlow, getAuthFromEnv, createProfileStore, getCloudflareAccountIdFromEnv, getAuthConfigFilePath, getEncryptedAuthConfigFilePath, scrubEncryptedCredentials, validateProfileName, getCloudflareAuthUseKeyringFromEnv } from './chunk-5WRJ2ZUV.mjs';
+import { stringifyFile, parseFile, dedent, createCredentialStorageContext, createOAuthFlow, getAuthFromEnv, createProfileStore, getCloudflareAccountIdFromEnv, getAuthConfigFilePath, getEncryptedAuthConfigFilePath, scrubEncryptedCredentials, validateProfileName, getCloudflareAuthUseKeyringFromEnv } from './chunk-PBW6773T.mjs';
 import { __name } from './chunk-O6YSETKJ.mjs';
 import { existsSync, rmSync, mkdirSync, writeFileSync, chmodSync, readFileSync as readFileSync$1, readdirSync } from 'node:fs';
 import path3 from 'node:path';

package/dist/index.d.mts

@@ -62,6 +62,8 @@ declare function domainUsesAccess(domain: string, logger: OAuthFlowLogger): Prom
 declare function getAccessHeaders(domain: string, options: {
     logger: OAuthFlowLogger;
     isNonInteractiveOrCI?: () => boolean;
+    /** Aborts a pending `cloudflared` authorization and kills its process. */
+    signal?: AbortSignal;
 }): Promise<Record<string, string>>;
 
 /**

package/dist/index.mjs

@@ -1,2 +1,2 @@
-export { EncryptedFileCredentialStore, FileCredentialStore, LinuxSecretToolKeyProvider, MacSecurityKeyProvider, NapiKeyringKeyProvider, PINNED_KEYRING_VERSION, PKCE_CHARSET, TEMPORARY_TERMS_NOTICE, TEMPORARY_TERMS_PROMPT, clearAccessCaches, clearCredentialStorageState, createCredentialStorageContext, createOAuthFlow, createProfileStore, decryptString, domainUsesAccess, encryptString, findKeyringBinding, generateAuthUrl, generateKey, generateRandomState, getAccessHeaders, getAuthConfigFilePath, getAuthFromEnv, getAuthUrlFromEnv, getCloudflareAPITokenFromEnv, getCloudflareAccountIdFromEnv, getCloudflareAuthUseKeyringFromEnv, getCloudflareGlobalAuthEmailFromEnv, getCloudflareGlobalAuthKeyFromEnv, getEncryptedAuthConfigFilePath, getKeyringAccountName, getKeyringInstallDir, installKeyringBindingSync, parseEncryptedEnvelope, probeSecretTool, readStoredAuthState, resetCredentialStorageState, resolveKeyProvider, scrubEncryptedCredentials, setKeyProviderFactoryForTesting, setKeyringEntryFactory, setLinuxSecretToolRunner, setMacSecurityCommandRunner, setNpmRunner, validateProfileName } from './chunk-5WRJ2ZUV.mjs';
+export { EncryptedFileCredentialStore, FileCredentialStore, LinuxSecretToolKeyProvider, MacSecurityKeyProvider, NapiKeyringKeyProvider, PINNED_KEYRING_VERSION, PKCE_CHARSET, TEMPORARY_TERMS_NOTICE, TEMPORARY_TERMS_PROMPT, clearAccessCaches, clearCredentialStorageState, createCredentialStorageContext, createOAuthFlow, createProfileStore, decryptString, domainUsesAccess, encryptString, findKeyringBinding, generateAuthUrl, generateKey, generateRandomState, getAccessHeaders, getAuthConfigFilePath, getAuthFromEnv, getAuthUrlFromEnv, getCloudflareAPITokenFromEnv, getCloudflareAccountIdFromEnv, getCloudflareAuthUseKeyringFromEnv, getCloudflareGlobalAuthEmailFromEnv, getCloudflareGlobalAuthKeyFromEnv, getEncryptedAuthConfigFilePath, getKeyringAccountName, getKeyringInstallDir, installKeyringBindingSync, parseEncryptedEnvelope, probeSecretTool, readStoredAuthState, resetCredentialStorageState, resolveKeyProvider, scrubEncryptedCredentials, setKeyProviderFactoryForTesting, setKeyringEntryFactory, setLinuxSecretToolRunner, setMacSecurityCommandRunner, setNpmRunner, validateProfileName } from './chunk-PBW6773T.mjs';
 import './chunk-O6YSETKJ.mjs';