@cloudflare/workers-auth 0.12.0 → 0.13.1

package/dist/cf/index.d.mts

@@ -1,6 +1,6 @@
-import { a as ConfigStorage, A as AuthConfigStorage, U as UserAuthConfig, f as OAuthFlowContext, g as ProfileStore } from '../file-format-hS8cJZA7.mjs';
-import { C as CliDescriptor, A as AuthContext, a as CloudflareAuth, U as UserPreferences, K as KeyringPreferenceContext, S as SetKeyringPreferenceResult } from '../keyring-preference-dD49DWOI.mjs';
-export { b as CloudflareLoginProps } from '../keyring-preference-dD49DWOI.mjs';
+import { a as ConfigStorage, A as AuthConfigStorage, U as UserAuthConfig, f as OAuthFlowContext, g as ProfileStore } from '../file-format-DDVG6IGi.mjs';
+import { C as CliDescriptor, A as AuthContext, a as CloudflareAuth, U as UserPreferences, K as KeyringPreferenceContext, S as SetKeyringPreferenceResult } from '../keyring-preference-DCQufwLw.mjs';
+export { b as CloudflareLoginProps } from '../keyring-preference-DCQufwLw.mjs';
 import '@cloudflare/workers-utils';
 
 /**

package/dist/cf/index.mjs

@@ -1,6 +1,6 @@
 import { createRequire } from 'node:module';
-import { createAuthConfigFileHelpers, createPreferences, createKeyringPreference, createFileStorage, createCloudflareAuth, createCloudflareProfileStore } from '../chunk-VVLCNASF.mjs';
-import '../chunk-FT2NMTJB.mjs';
+import { createAuthConfigFileHelpers, createPreferences, createKeyringPreference, createFileStorage, createCloudflareAuth, createCloudflareProfileStore } from '../chunk-PGZZHNWG.mjs';
+import '../chunk-NDZDTP46.mjs';
 import { __name } from '../chunk-VAZEJK55.mjs';
 import { getEnvironmentVariableFactory, getGlobalConfigPath, getCloudflareApiEnvironmentFromEnv } from '@cloudflare/workers-utils';
 import path from 'node:path';

package/dist/{chunk-FT2NMTJB.mjs → chunk-NDZDTP46.mjs}

@@ -541,7 +541,7 @@ function getCachedTemporaryPreviewAccount(storage) {
   return temporaryPreviewAccount;
 }
 __name(getCachedTemporaryPreviewAccount, "getCachedTemporaryPreviewAccount");
-async function requestPowSolution(logger) {
+async function requestPowSolution(temporaryAccountLogger) {
   const response = await fetch(getTemporaryPreviewChallengeUrl(), {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -579,12 +579,12 @@ async function requestPowSolution(logger) {
       }
     );
   }
-  logger.log("Solving proof-of-work challenge\u2026");
+  temporaryAccountLogger.log("Solving proof-of-work challenge\u2026");
   return solveChallenge({ challengeToken, seed, k, g });
 }
 __name(requestPowSolution, "requestPowSolution");
-async function createTemporaryPreviewAccount(logger, request) {
-  const pow = await requestPowSolution(logger);
+async function createTemporaryPreviewAccount(temporaryAccountLogger, request) {
+  const pow = await requestPowSolution(temporaryAccountLogger);
   const response = await fetch(getTemporaryPreviewUrl(), {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -679,7 +679,7 @@ async function getOrCreateTemporaryPreviewAccount(options) {
     });
   }
   const temporaryPreviewAccount = await createTemporaryPreviewAccount(
-    options.logger,
+    options.temporaryAccountLogger,
     options.request
   );
   options.storage.write(temporaryPreviewAccount);
@@ -1957,7 +1957,6 @@ function createOAuthFlow(ctx) {
     }
     const result = await getOrCreateTemporaryPreviewAccount({
       ...ctx.temporary,
-      logger: ctx.logger,
       ...temporaryRequest ? { request: temporaryRequest } : {}
     });
     activeTemporaryAccount = result.account;

package/dist/{chunk-VVLCNASF.mjs → chunk-PGZZHNWG.mjs}

@@ -1,5 +1,5 @@
 import { createRequire } from 'node:module';
-import { stringifyFile, parseFile, dedent, createCredentialStorageContext, createOAuthFlow, getAuthFromEnv, createProfileStore, validateAccountId, getCloudflareAccountIdFromEnv, getAuthConfigFilePath, getEncryptedAuthConfigFilePath, scrubEncryptedCredentials, validateProfileName, getCloudflareAuthUseKeyringFromEnv } from './chunk-FT2NMTJB.mjs';
+import { stringifyFile, parseFile, dedent, createCredentialStorageContext, createOAuthFlow, getAuthFromEnv, createProfileStore, validateAccountId, getCloudflareAccountIdFromEnv, getAuthConfigFilePath, getEncryptedAuthConfigFilePath, scrubEncryptedCredentials, validateProfileName, getCloudflareAuthUseKeyringFromEnv } from './chunk-NDZDTP46.mjs';
 import { __name } from './chunk-VAZEJK55.mjs';
 import { existsSync, rmSync, mkdirSync, writeFileSync, chmodSync, readFileSync as readFileSync$1, readdirSync } from 'node:fs';
 import path3 from 'node:path';
@@ -737,10 +737,10 @@ function createFileStorage(format, getPath) {
 }
 __name(createFileStorage, "createFileStorage");
 function createTemporaryTermsPrompt(deps) {
-  const { logger, prompt } = deps;
+  const { temporaryAccountLogger, prompt } = deps;
   return /* @__PURE__ */ __name(async function ensureTemporaryTermsAccepted(question, notice) {
     if (isNonInteractiveOrCI()) {
-      logger.log(notice);
+      temporaryAccountLogger.log(notice);
       return true;
     }
     const answer = await prompt(question);
@@ -770,9 +770,9 @@ function notLoggedInErrorBodies(loginCommand) {
   };
 }
 __name(notLoggedInErrorBodies, "notLoggedInErrorBodies");
-function logTemporaryPreviewAccount(logger, temporaryPreviewAccount, cached) {
+function logTemporaryPreviewAccount(temporaryAccountLogger, temporaryPreviewAccount, cached) {
   const claimExpiresAt = new Date(temporaryPreviewAccount.claim.expiresAt);
-  logger.log(
+  temporaryAccountLogger.log(
     dedent`
 			Temporary account ready:
 				Account: ${temporaryPreviewAccount.account.name} (${cached ? "reused" : "created"})
@@ -784,6 +784,7 @@ function logTemporaryPreviewAccount(logger, temporaryPreviewAccount, cached) {
 __name(logTemporaryPreviewAccount, "logTemporaryPreviewAccount");
 function createCloudflareAuth(descriptor, ctx) {
   const { logger } = ctx;
+  const temporaryAccountLogger = ctx.temporaryAccountLogger ?? logger;
   const cliName = descriptor.cliName;
   const NOT_LOGGED_IN_ERROR_BODIES = notLoggedInErrorBodies(
     descriptor.commands.login
@@ -826,7 +827,11 @@ Run \`${descriptor.commands.whoami}\` to check your current authentication statu
         descriptor.fileFormat,
         descriptor.getTemporaryAccountConfigPath
       ),
-      prompt: createTemporaryTermsPrompt({ logger, prompt: ctx.prompt })
+      prompt: createTemporaryTermsPrompt({
+        temporaryAccountLogger,
+        prompt: ctx.prompt
+      }),
+      temporaryAccountLogger
     }
   });
   function setProfile(profile) {
@@ -1094,7 +1099,11 @@ ${accounts.map(
         );
       }
       const { account: temporaryPreviewAccount, cached } = await oauthFlow.activateTemporaryAccount();
-      logTemporaryPreviewAccount(logger, temporaryPreviewAccount, cached);
+      logTemporaryPreviewAccount(
+        temporaryAccountLogger,
+        temporaryPreviewAccount,
+        cached
+      );
       return temporaryPreviewAccount.account.id;
     }
     const result = await loginOrRefreshIfRequired(config);

package/dist/{file-format-hS8cJZA7.d.mts → file-format-DDVG6IGi.d.mts}

@@ -105,6 +105,11 @@ interface OAuthFlowTemporaryContext {
      *    always return true
      */
     prompt: (question: string, notice: string) => Promise<boolean>;
+    /**
+     * Where progress messages emitted while provisioning go (for example the
+     * proof-of-work notice).
+     */
+    temporaryAccountLogger: TemporaryAccountLogger;
 }
 /** Optional provisioning inputs for a newly-created temporary account. */
 interface TemporaryAccountRequest {
@@ -131,6 +136,13 @@ interface OAuthConsentPages {
  * Consumers pass in an implementation that maps to their own logging surface.
  */
 type OAuthFlowLogger = Logger;
+/**
+ * Sink for temporary-account notices: the terms notice, the proof-of-work
+ * notice, and the claim details. They are not part of a command's output, so a
+ * CLI can route them to stderr to keep them out of output written to stdout
+ * (JSON, piped object contents, …).
+ */
+type TemporaryAccountLogger = Pick<OAuthFlowLogger, "log">;
 /**
  * Dependency-injection surface for {@link createOAuthFlow}.
  *
@@ -497,4 +509,4 @@ interface CredentialStore extends AuthConfigStorage {
  */
 type FileFormat = "toml" | "json";
 
-export { type AuthConfigStorage as A, type CredentialStore as C, type DeactivateDirectoryResult as D, type FileFormat as F, type LoginOrRefreshFailureReason as L, type OAuthFlowLogger as O, type ProfileConfigOperations as P, type TemporaryAccountRequest as T, type UserAuthConfig as U, type ConfigStorage as a, type DirectoryBindingOperations as b, type DirectoryBindingsStorage as c, type LoginOrRefreshResult as d, type LoginProps as e, type OAuthFlowContext as f, type ProfileStore as g, type TemporaryPreviewAccount as h, createOAuthFlow as i, createProfileStore as j, generateAuthUrl as k, generateRandomState as l, type OAuthConsentPages as m, validateProfileName as v };
+export { type AuthConfigStorage as A, type CredentialStore as C, type DeactivateDirectoryResult as D, type FileFormat as F, type LoginOrRefreshFailureReason as L, type OAuthFlowLogger as O, type ProfileConfigOperations as P, type TemporaryAccountRequest as T, type UserAuthConfig as U, type ConfigStorage as a, type DirectoryBindingOperations as b, type DirectoryBindingsStorage as c, type LoginOrRefreshResult as d, type LoginProps as e, type OAuthFlowContext as f, type ProfileStore as g, type TemporaryPreviewAccount as h, createOAuthFlow as i, createProfileStore as j, generateAuthUrl as k, generateRandomState as l, type TemporaryAccountLogger as m, type OAuthConsentPages as n, validateProfileName as v };

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { O as OAuthFlowLogger, U as UserAuthConfig, A as AuthConfigStorage, C as CredentialStore, F as FileFormat } from './file-format-hS8cJZA7.mjs';
-export { a as ConfigStorage, D as DeactivateDirectoryResult, b as DirectoryBindingOperations, c as DirectoryBindingsStorage, L as LoginOrRefreshFailureReason, d as LoginOrRefreshResult, e as LoginProps, f as OAuthFlowContext, P as ProfileConfigOperations, g as ProfileStore, T as TemporaryAccountRequest, h as TemporaryPreviewAccount, i as createOAuthFlow, j as createProfileStore, k as generateAuthUrl, l as generateRandomState, v as validateProfileName } from './file-format-hS8cJZA7.mjs';
+import { O as OAuthFlowLogger, U as UserAuthConfig, A as AuthConfigStorage, C as CredentialStore, F as FileFormat } from './file-format-DDVG6IGi.mjs';
+export { a as ConfigStorage, D as DeactivateDirectoryResult, b as DirectoryBindingOperations, c as DirectoryBindingsStorage, L as LoginOrRefreshFailureReason, d as LoginOrRefreshResult, e as LoginProps, f as OAuthFlowContext, P as ProfileConfigOperations, g as ProfileStore, T as TemporaryAccountRequest, h as TemporaryPreviewAccount, i as createOAuthFlow, j as createProfileStore, k as generateAuthUrl, l as generateRandomState, v as validateProfileName } from './file-format-DDVG6IGi.mjs';
 import { ApiCredentials } from '@cloudflare/workers-utils';
 import { SpawnSyncReturns } from 'node:child_process';
 

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { createRequire } from 'node:module';
-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, generateVerificationUrl, 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-FT2NMTJB.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, generateVerificationUrl, 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-NDZDTP46.mjs';
 import './chunk-VAZEJK55.mjs';
 
 createRequire(import.meta.url || (typeof __filename === "string" ? __filename : "/"));

package/dist/{keyring-preference-dD49DWOI.d.mts → keyring-preference-DCQufwLw.d.mts}

@@ -1,4 +1,4 @@
-import { f as OAuthFlowContext, m as OAuthConsentPages, F as FileFormat, C as CredentialStore, T as TemporaryAccountRequest, d as LoginOrRefreshResult, U as UserAuthConfig } from './file-format-hS8cJZA7.mjs';
+import { f as OAuthFlowContext, m as TemporaryAccountLogger, n as OAuthConsentPages, F as FileFormat, C as CredentialStore, T as TemporaryAccountRequest, d as LoginOrRefreshResult, U as UserAuthConfig } from './file-format-DDVG6IGi.mjs';
 import { ApiCredentials, ComplianceConfig } from '@cloudflare/workers-utils';
 
 /** Minimal shape of the interactive `select` prompt's options for account selection. */
@@ -20,6 +20,13 @@ interface AccountSelectOptions {
 interface AuthContext {
     /** The consumer's logger (drop-in for wrangler's logger singleton). */
     logger: OAuthFlowContext["logger"];
+    /**
+     * Where temporary-account status messages go: the terms notice, the
+     * proof-of-work notice, and the "Temporary account ready" claim details.
+     * These are not command output, so a CLI whose commands write parseable
+     * output to stdout should send them to stderr. Defaults to {@link logger}.
+     */
+    temporaryAccountLogger?: TemporaryAccountLogger;
     /**
      * User-Agent header sent with the account/membership REST calls
      * (e.g. `wrangler/<version>` or `cf/<version>`).