wrangler 2.20.0 → 3.0.0

package/src/user/auth-variables.ts

@@ -1,113 +0,0 @@
-import { getEnvironmentVariableFactory } from "../environment-variables/factory";
-import { getCloudflareApiEnvironmentFromEnv } from "../environment-variables/misc-variables";
-import { getAccessToken } from "./access";
-
-/**
- * `CLOUDFLARE_ACCOUNT_ID` overrides the account inferred from the current user.
- */
-export const getCloudflareAccountIdFromEnv = getEnvironmentVariableFactory({
-	variableName: "CLOUDFLARE_ACCOUNT_ID",
-	deprecatedName: "CF_ACCOUNT_ID",
-});
-
-export const getCloudflareAPITokenFromEnv = getEnvironmentVariableFactory({
-	variableName: "CLOUDFLARE_API_TOKEN",
-	deprecatedName: "CF_API_TOKEN",
-});
-export const getCloudflareGlobalAuthKeyFromEnv = getEnvironmentVariableFactory({
-	variableName: "CLOUDFLARE_API_KEY",
-	deprecatedName: "CF_API_KEY",
-});
-export const getCloudflareGlobalAuthEmailFromEnv =
-	getEnvironmentVariableFactory({
-		variableName: "CLOUDFLARE_EMAIL",
-		deprecatedName: "CF_EMAIL",
-	});
-
-/**
- * `WRANGLER_CLIENT_ID` is a UUID that is used to identify Wrangler
- * to the Cloudflare APIs.
- *
- * Normally you should not need to set this explicitly.
- * If you want to switch to the staging environment set the
- * `WRANGLER_USE_STAGING` environment variable instead.
- */
-export const getClientIdFromEnv = getEnvironmentVariableFactory({
-	variableName: "WRANGLER_CLIENT_ID",
-	defaultValue: () =>
-		getCloudflareApiEnvironmentFromEnv() === "staging"
-			? "4b2ea6cc-9421-4761-874b-ce550e0e3def"
-			: "54d11594-84e4-41aa-b438-e81b8fa78ee7",
-});
-
-/**
- * `WRANGLER_AUTH_DOMAIN` is the URL base domain that is used
- * to access OAuth URLs for the Cloudflare APIs.
- *
- * Normally you should not need to set this explicitly.
- * If you want to switch to the staging environment set the
- * `WRANGLER_USE_STAGING` environment variable instead.
- */
-export const getAuthDomainFromEnv = getEnvironmentVariableFactory({
-	variableName: "WRANGLER_AUTH_DOMAIN",
-	defaultValue: () =>
-		getCloudflareApiEnvironmentFromEnv() === "staging"
-			? "dash.staging.cloudflare.com"
-			: "dash.cloudflare.com",
-});
-
-/**
- * `WRANGLER_AUTH_URL` is the path that is used to access OAuth
- * for the Cloudflare APIs.
- *
- * Normally you should not need to set this explicitly.
- * If you want to switch to the staging environment set the
- * `WRANGLER_USE_STAGING` environment variable instead.
- */
-export const getAuthUrlFromEnv = getEnvironmentVariableFactory({
-	variableName: "WRANGLER_AUTH_URL",
-	defaultValue: () => `https://${getAuthDomainFromEnv()}/oauth2/auth`,
-});
-
-/**
- * `WRANGLER_TOKEN_URL` is the path that is used to exchange an OAuth
- * token for an API token.
- *
- * Normally you should not need to set this explicitly.
- * If you want to switch to the staging environment set the
- * `WRANGLER_USE_STAGING` environment variable instead.
- */
-export const getTokenUrlFromEnv = getEnvironmentVariableFactory({
-	variableName: "WRANGLER_TOKEN_URL",
-	defaultValue: () => `https://${getAuthDomainFromEnv()}/oauth2/token`,
-});
-
-/**
- * `WRANGLER_REVOKE_URL` is the path that is used to exchange an OAuth
- * refresh token for a new OAuth token.
- *
- * Normally you should not need to set this explicitly.
- * If you want to switch to the staging environment set the
- * `WRANGLER_USE_STAGING` environment variable instead.
- */
-export const getRevokeUrlFromEnv = getEnvironmentVariableFactory({
-	variableName: "WRANGLER_REVOKE_URL",
-	defaultValue: () => `https://${getAuthDomainFromEnv()}/oauth2/revoke`,
-});
-
-/**
- * Set the `WRANGLER_CF_AUTHORIZATION_TOKEN` to the CF_Authorization token found at https://dash.staging.cloudflare.com/bypass-limits
- * if you want to access the staging environment, triggered by `WRANGLER_API_ENVIRONMENT=staging`.
- */
-export const getCloudflareAccessToken = async () => {
-	const env = getEnvironmentVariableFactory({
-		variableName: "WRANGLER_CF_AUTHORIZATION_TOKEN",
-	})();
-
-	// If the environment variable is defined, go ahead and use it.
-	if (env !== undefined) {
-		return env;
-	}
-
-	return getAccessToken(getAuthDomainFromEnv());
-};

package/src/user/choose-account.tsx

@@ -1,39 +0,0 @@
-import { fetchListResult } from "../cfetch";
-import { getCloudflareAccountIdFromEnv } from "./auth-variables";
-
-export type ChooseAccountItem = {
-	id: string;
-	name: string;
-};
-
-/**
- * Infer a list of available accounts for the current user.
- */
-export async function getAccountChoices(): Promise<ChooseAccountItem[]> {
-	const accountIdFromEnv = getCloudflareAccountIdFromEnv();
-	if (accountIdFromEnv) {
-		return [{ id: accountIdFromEnv, name: "" }];
-	} else {
-		try {
-			const response = await fetchListResult<{
-				account: ChooseAccountItem;
-			}>(`/memberships`);
-			const accounts = response.map((r) => r.account);
-			if (accounts.length === 0) {
-				throw new Error(
-					"Failed to automatically retrieve account IDs for the logged in user.\n" +
-						"In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as `account_id` in your `wrangler.toml` file."
-				);
-			} else {
-				return accounts;
-			}
-		} catch (err) {
-			if ((err as { code: number }).code === 9109) {
-				throw new Error(
-					`Failed to automatically retrieve account IDs for the logged in user.
-You may have incorrect permissions on your API token. You can skip this account check by adding an \`account_id\` in your \`wrangler.toml\`, or by setting the value of CLOUDFLARE_ACCOUNT_ID"`
-				);
-			} else throw err;
-		}
-	}
-}

package/src/user/generate-auth-url.ts

@@ -1,33 +0,0 @@
-interface GenerateAuthUrlProps {
-	authUrl: string;
-	clientId: string;
-	callbackUrl: string;
-	scopes: string[];
-	stateQueryParam: string;
-	codeChallenge: string;
-}
-
-/**
- * generateAuthUrl was extracted from getAuthURL in user.tsx
- * to make it possible to mock the generated URL
- */
-export const generateAuthUrl = ({
-	authUrl,
-	clientId,
-	callbackUrl,
-	scopes,
-	stateQueryParam,
-	codeChallenge,
-}: GenerateAuthUrlProps) => {
-	return (
-		authUrl +
-		`?response_type=code&` +
-		`client_id=${encodeURIComponent(clientId)}&` +
-		`redirect_uri=${encodeURIComponent(callbackUrl)}&` +
-		// we add offline_access manually for every request
-		`scope=${encodeURIComponent([...scopes, "offline_access"].join(" "))}&` +
-		`state=${stateQueryParam}&` +
-		`code_challenge=${encodeURIComponent(codeChallenge)}&` +
-		`code_challenge_method=S256`
-	);
-};

package/src/user/generate-random-state.ts

@@ -1,16 +0,0 @@
-import { webcrypto as crypto } from "node:crypto";
-import { PKCE_CHARSET } from "../user";
-
-/**
- * Generates random state to be passed for anti-csrf.
- * extracted from  user.tsx to make it possible to
- * mock the generated URL
- */
-export function generateRandomState(lengthOfState: number): string {
-	const output = new Uint32Array(lengthOfState);
-	// @ts-expect-error crypto's types aren't there yet
-	crypto.getRandomValues(output);
-	return Array.from(output)
-		.map((num: number) => PKCE_CHARSET[num % PKCE_CHARSET.length])
-		.join("");
-}

package/src/user/index.ts

@@ -1,2 +0,0 @@
-export * from "./user";
-export * from "./choose-account";