wrangler 0.0.0-e7a0cd5b → 0.0.0-e7cf0caa

package/src/__tests__/type-generation.test.ts

@@ -4,11 +4,8 @@ import { mockConsoleMethods } from "./helpers/mock-console";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 import type { Config } from "../config";
-import type { CfWorkerInit } from "../worker";
 
-const bindingsConfigMock: CfWorkerInit["bindings"] & {
-	rules: Config["rules"];
-} = {
+const bindingsConfigMock: Partial<Config> = {
 	kv_namespaces: [{ binding: "TEST_KV_NAMESPACE", id: "1234" }],
 	vars: {
 		SOMETHING: "asdasdfasdf",
@@ -19,6 +16,22 @@ const bindingsConfigMock: CfWorkerInit["bindings"] & {
 			captian: "Picard",
 		}, // We can assume the objects will be stringified
 	},
+	queues: {
+		producers: [
+			{
+				binding: "TEST_QUEUE_BINDING",
+				queue: "TEST_QUEUE",
+			},
+		],
+		consumers: [
+			{
+				queue: "my-queue",
+				max_batch_size: 10,
+				max_batch_timeout: 1,
+				max_retries: 3,
+			},
+		],
+	},
 	durable_objects: {
 		bindings: [
 			{ name: "DURABLE_TEST1", class_name: "Durability1" },
@@ -33,13 +46,18 @@ const bindingsConfigMock: CfWorkerInit["bindings"] & {
 	],
 	d1_databases: [
 		{
-			// @ts-expect-error This type is resolved in the function that handles creating BETA string
 			binding: "D1_TESTING_SOMETHING",
 			database_name: "D1_BINDING",
 			database_id: "1234",
 		},
 	],
 	services: [{ binding: "SERVICE_BINDING", service: "SERVICE_NAME" }],
+	analytics_engine_datasets: [
+		{
+			binding: "AE_DATASET_BINDING",
+			dataset: "AE_DATASET_TEST",
+		},
+	],
 	dispatch_namespaces: [
 		{ binding: "NAMESPACE_BINDING", namespace: "NAMESPACE_ID" },
 	],
@@ -56,12 +74,10 @@ const bindingsConfigMock: CfWorkerInit["bindings"] & {
 		SOME_TEXT_BLOB2: "SOME_TEXT_BLOB2.txt",
 	},
 	wasm_modules: { MODULE1: "module1.wasm", MODULE2: "module2.wasm" },
-	unsafe: [
-		{
-			// @ts-expect-error Unsafe bindings type is somewhat different in different places
-			bindings: [{ name: "testing_unsafe", type: "plain_text" }],
-		},
-	],
+	unsafe: {
+		bindings: [{ name: "testing_unsafe", type: "plain_text" }],
+		metadata: { some_key: "some_value" },
+	},
 	rules: [
 		{
 			type: "Text",
@@ -89,10 +105,9 @@ describe("generateTypes()", () => {
 				compatibility_date: "2022-01-12",
 				name: "test-name",
 				main: "./index.ts",
-				// eslint-disable-next-line @typescript-eslint/no-explicit-any
-				...(bindingsConfigMock as any),
-				unsafe: bindingsConfigMock.unsafe?.at(0) ?? {},
-			}),
+				...bindingsConfigMock,
+				unsafe: bindingsConfigMock.unsafe ?? {},
+			} as unknown as TOML.JsonMap),
 			"utf-8"
 		);
 
@@ -100,14 +115,15 @@ describe("generateTypes()", () => {
 		expect(std.out).toMatchInlineSnapshot(`
 		"interface Env {
 			TEST_KV_NAMESPACE: KVNamespace;
-			SOMETHING: asdasdfasdf;
-			ANOTHER: thing;
+			SOMETHING: \\"asdasdfasdf\\";
+			ANOTHER: \\"thing\\";
 			OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
 			DURABLE_TEST1: DurableObjectNamespace;
 			DURABLE_TEST2: DurableObjectNamespace;
 			R2_BUCKET_BINDING: R2Bucket;
 			D1_TESTING_SOMETHING: D1Database;
 			SERVICE_BINDING: Fetcher;
+			AE_DATASET_BINDING: AnalyticsEngineDataset;
 			NAMESPACE_BINDING: any;
 			LOGFWDR_SCHEMA: any;
 			SOME_DATA_BLOB1: ArrayBuffer;
@@ -115,6 +131,7 @@ describe("generateTypes()", () => {
 			SOME_TEXT_BLOB1: string;
 			SOME_TEXT_BLOB2: string;
 			testing_unsafe: any;
+			TEST_QUEUE_BINDING: Queue;
 		}
 		declare module \\"*.txt\\" {
 			const value: string;
@@ -139,9 +156,9 @@ describe("generateTypes()", () => {
 				compatibility_date: "2022-01-12",
 				name: "test-name",
 				main: "./index.ts",
-				// @ts-expect-error This type is out of sync with the actual bindingsConfig type
 				vars: bindingsConfigMock.vars,
-			}),
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			} as any),
 			"utf-8"
 		);
 		await runWrangler("types");
@@ -159,6 +176,7 @@ describe("generateTypes()", () => {
 			}),
 			"utf-8"
 		);
+
 		await runWrangler("types");
 		expect(fs.existsSync("./worker-configuration.d.ts")).toBe(false);
 		expect(std.out).toMatchInlineSnapshot(`""`);
@@ -176,9 +194,8 @@ describe("generateTypes()", () => {
 				compatibility_date: "2022-01-12",
 				name: "test-name",
 				main: "./index.ts",
-				// @ts-expect-error This type is out of sync with the actual bindingsConfig type
 				vars: bindingsConfigMock.vars,
-			}),
+			} as TOML.JsonMap),
 			"utf-8"
 		);
 
@@ -200,16 +217,16 @@ describe("generateTypes()", () => {
 				compatibility_date: "2022-01-12",
 				name: "test-name",
 				main: "./index.ts",
-				// @ts-expect-error This type is out of sync with the actual bindingsConfig type
-				unsafe: bindingsConfigMock.unsafe?.at(0) ?? {},
-			}),
+				unsafe: bindingsConfigMock.unsafe ?? {},
+			} as TOML.JsonMap),
 			"utf-8"
 		);
 
 		await runWrangler("types");
 		expect(std.out).toMatchInlineSnapshot(`
-		"declare global {
-			testing_unsafe: any;
+		"export {};
+		declare global {
+			const testing_unsafe: any;
 		}
 		"
 	`);

package/src/__tests__/user.test.ts

@@ -1,18 +1,22 @@
-import fs from "node:fs";
-import path from "node:path";
-import fetchMock from "jest-fetch-mock";
-import { getGlobalWranglerConfigPath } from "../global-wrangler-config-path";
+import { rest } from "msw";
 import { CI } from "../is-ci";
 import {
 	loginOrRefreshIfRequired,
 	readAuthConfigFile,
 	requireAuth,
-	USER_AUTH_CONFIG_FILE,
 	writeAuthConfigFile,
 } from "../user";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { useMockIsTTY } from "./helpers/mock-istty";
-import { mockOAuthFlow } from "./helpers/mock-oauth-flow";
+import {
+	mockExchangeRefreshTokenForAccessToken,
+	mockOAuthFlow,
+} from "./helpers/mock-oauth-flow";
+import {
+	msw,
+	mswSuccessOauthHandlers,
+	mswSuccessUserHandlers,
+} from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 import type { Config } from "../config";
@@ -22,41 +26,43 @@ describe("User", () => {
 	let isCISpy: jest.SpyInstance;
 	runInTempDir();
 	const std = mockConsoleMethods();
-	const {
-		mockOAuthServerCallback,
-		mockGrantAccessToken,
-		mockGrantAuthorization,
-		mockRevokeAuthorization,
-		mockExchangeRefreshTokenForAccessToken,
-	} = mockOAuthFlow();
-
+	// TODO: Implement these two mocks with MSW
+	const { mockOAuthServerCallback } = mockOAuthFlow();
 	const { setIsTTY } = useMockIsTTY();
 
 	beforeEach(() => {
+		msw.use(...mswSuccessOauthHandlers, ...mswSuccessUserHandlers);
 		isCISpy = jest.spyOn(CI, "isCI").mockReturnValue(false);
 	});
 
 	describe("login", () => {
 		it("should login a user when `wrangler login` is run", async () => {
-			mockOAuthServerCallback();
-			const accessTokenRequest = mockGrantAccessToken({ respondWith: "ok" });
-			mockGrantAuthorization({ respondWith: "success" });
+			mockOAuthServerCallback("success");
+
+			let counter = 0;
+			msw.use(
+				rest.post("*/oauth2/token", async (_, response, context) => {
+					counter += 1;
+
+					return response.once(
+						context.json({
+							access_token: "test-access-token",
+							expires_in: 100000,
+							refresh_token: "test-refresh-token",
+							scope: "account:read",
+						})
+					);
+				})
+			);
 
 			await runWrangler("login");
 
-			expect(accessTokenRequest.actual.url).toEqual(
-				accessTokenRequest.expected.url
-			);
-			expect(accessTokenRequest.actual.method).toEqual(
-				accessTokenRequest.expected.method
-			);
-
+			expect(counter).toBe(1);
 			expect(std.out).toMatchInlineSnapshot(`
 			"Attempting to login via OAuth...
-			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20ssl_certs%3Awrite%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
 			Successfully logged in."
 		`);
-
 			expect(readAuthConfigFile()).toEqual<UserAuthConfig>({
 				api_token: undefined,
 				oauth_token: "test-access-token",
@@ -67,71 +73,28 @@ describe("User", () => {
 		});
 	});
 
-	describe("logout", () => {
-		it("should exit with a message stating the user is not logged in", async () => {
-			await runWrangler("logout");
-			expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
-		});
-
-		it("should logout user that has been properly logged in", async () => {
-			writeAuthConfigFile({
-				oauth_token: "some-oauth-tok",
-				refresh_token: "some-refresh-tok",
-			});
-			const outcome = mockRevokeAuthorization();
-
-			await runWrangler("logout");
-
-			expect(outcome.actual.url).toEqual(
-				"https://dash.cloudflare.com/oauth2/revoke"
-			);
-			expect(outcome.actual.method).toEqual("POST");
-
-			expect(std.out).toMatchInlineSnapshot(`"Successfully logged out."`);
-
-			// Make sure that we made the request to logout.
-			expect(fetchMock).toHaveBeenCalledTimes(1);
-
-			// Make sure that logout removed the config file containing the auth tokens.
-			const config = path.join(
-				getGlobalWranglerConfigPath(),
-				USER_AUTH_CONFIG_FILE
-			);
-			expect(fs.existsSync(config)).toBeFalsy();
-		});
-	});
-
-	// TODO: Improve OAuth mocking to handle `/token` endpoints from different calls
-	it("should handle errors for failed token refresh", async () => {
+	it("should handle errors for failed token refresh in a non-interactive environment", async () => {
 		setIsTTY(false);
 		writeAuthConfigFile({
 			oauth_token: "hunter2",
 			refresh_token: "Order 66",
 		});
-		mockExchangeRefreshTokenForAccessToken({
-			respondWith: "badResponse",
-		});
+		mockExchangeRefreshTokenForAccessToken({ respondWith: "refreshError" });
 
 		// Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
 		await expect(
 			requireAuth({} as Config)
 		).rejects.toThrowErrorMatchingInlineSnapshot(
-			`"In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/tokens/create/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN."`
+			`"In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/fundamentals/api/get-started/create-token/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN."`
 		);
 	});
 
 	it("should confirm no error message when refresh is successful", async () => {
 		setIsTTY(false);
-		mockOAuthServerCallback();
 		writeAuthConfigFile({
 			oauth_token: "hunter2",
 			refresh_token: "Order 66",
 		});
-		mockGrantAuthorization({ respondWith: "success" });
-
-		mockExchangeRefreshTokenForAccessToken({
-			respondWith: "refreshSuccess",
-		});
 
 		// Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
 		await expect(requireAuth({} as Config)).rejects.toThrowError();

package/src/__tests__/whoami.test.tsx

@@ -1,17 +1,15 @@
-import { render } from "ink-testing-library";
 import { rest } from "msw";
-import React from "react";
 import { writeAuthConfigFile } from "../user";
-import { getUserInfo, WhoAmI } from "../whoami";
+import { getUserInfo } from "../whoami";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { useMockIsTTY } from "./helpers/mock-istty";
 import {
+	createFetchResult,
 	msw,
 	mswSuccessOauthHandlers,
 	mswSuccessUserHandlers,
 } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
-import type { UserInfo } from "../whoami";
 
 describe("getUserInfo()", () => {
 	const ENV_COPY = process.env;
@@ -47,18 +45,14 @@ describe("getUserInfo()", () => {
 		msw.use(
 			rest.get("*/user", (_, res, ctx) => {
 				return res.once(
-					ctx.status(200),
-					ctx.json({
-						success: false,
-						errors: [
+					ctx.json(
+						createFetchResult({}, false, [
 							{
 								code: 9109,
 								message: "Uauthorized to access requested resource",
 							},
-						],
-						messages: [],
-						result: {},
-					})
+						])
+					)
 				);
 			}),
 			rest.get("*/accounts", (request, res, ctx) => {
@@ -74,15 +68,7 @@ describe("getUserInfo()", () => {
 			  "host": "api.cloudflare.com",
 			}
 		`);
-				return res.once(
-					ctx.status(200),
-					ctx.json({
-						success: true,
-						errors: [],
-						messages: [],
-						result: [],
-					})
-				);
+				return res.once(ctx.json(createFetchResult([])));
 			})
 		);
 		const userInfo = await getUserInfo();
@@ -174,7 +160,7 @@ describe("getUserInfo()", () => {
 		await getUserInfo();
 
 		expect(std.warn).toMatchInlineSnapshot(`
-		      "▲ [WARNING] It looks like you have used Wrangler 1's \`config\` command to login with an API token.
+		      "▲ [WARNING] It looks like you have used Wrangler v1's \`config\` command to login with an API token.
 
 		        This is no longer supported in the current version of Wrangler.
 		        If you wish to authenticate via an API token then please set the \`CLOUDFLARE_API_TOKEN\`
@@ -184,95 +170,3 @@ describe("getUserInfo()", () => {
 	    `);
 	});
 });
-
-describe("WhoAmI component", () => {
-	it("should return undefined if there is no user", async () => {
-		const { lastFrame } = render(<WhoAmI user={undefined}></WhoAmI>);
-
-		expect(lastFrame()).toMatchInlineSnapshot(
-			`"You are not authenticated. Please run \`wrangler login\`."`
-		);
-	});
-
-	it("should display the user's email, accounts and OAuth scopes", async () => {
-		const user: UserInfo = {
-			authType: "OAuth Token",
-			apiToken: "some-oauth-token",
-			email: "user@example.com",
-			tokenPermissions: ["scope1:read", "scope2:write", "scope3"],
-			accounts: [
-				{ name: "Account One", id: "account-1" },
-				{ name: "Account Two", id: "account-2" },
-				{ name: "Account Three", id: "account-3" },
-			],
-		};
-
-		const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
-
-		expect(lastFrame()).toContain(
-			"You are logged in with an OAuth Token, associated with the email 'user@example.com'!"
-		);
-		expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
-		expect(lastFrame()).toMatch(/Account One .+ account-1/);
-		expect(lastFrame()).toMatch(/Account Two .+ account-2/);
-		expect(lastFrame()).toMatch(/Account Three .+ account-3/);
-		expect(lastFrame()).toContain(
-			"Token Permissions: If scopes are missing, you may need to logout and re-login."
-		);
-		expect(lastFrame()).toContain("- scope1 (read)");
-		expect(lastFrame()).toContain("- scope2 (write)");
-		expect(lastFrame()).toContain("- scope3");
-	});
-
-	// For the case where the cache hasn't updated to include the scopes array
-	it("should display the user's email and accounts, but no OAuth scopes if none provided", async () => {
-		const user: UserInfo = {
-			authType: "OAuth Token",
-			apiToken: "some-oauth-token",
-			email: "user@example.com",
-			tokenPermissions: undefined,
-			accounts: [
-				{ name: "Account One", id: "account-1" },
-				{ name: "Account Two", id: "account-2" },
-				{ name: "Account Three", id: "account-3" },
-			],
-		};
-
-		const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
-
-		expect(lastFrame()).toContain(
-			"You are logged in with an OAuth Token, associated with the email 'user@example.com'!"
-		);
-		expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
-		expect(lastFrame()).toMatch(/Account One .+ account-1/);
-		expect(lastFrame()).toMatch(/Account Two .+ account-2/);
-		expect(lastFrame()).toMatch(/Account Three .+ account-3/);
-	});
-
-	it("should display the user's email, accounts and link to view token permissions for non-OAuth tokens", async () => {
-		const user: UserInfo = {
-			authType: "API Token",
-			apiToken: "some-api-token",
-			email: "user@example.com",
-			tokenPermissions: undefined,
-			accounts: [
-				{ name: "Account One", id: "account-1" },
-				{ name: "Account Two", id: "account-2" },
-				{ name: "Account Three", id: "account-3" },
-			],
-		};
-
-		const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
-
-		expect(lastFrame()).toContain(
-			"You are logged in with an API Token, associated with the email 'user@example.com'!"
-		);
-		expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
-		expect(lastFrame()).toMatch(/Account One .+ account-1/);
-		expect(lastFrame()).toMatch(/Account Two .+ account-2/);
-		expect(lastFrame()).toMatch(/Account Three .+ account-3/);
-		expect(lastFrame()).toContain(
-			"To see token permissions visit https://dash.cloudflare.com/profile/api-tokens"
-		);
-	});
-});