wrangler 0.0.0-e178d6fb → 0.0.0-e1c2f5b9

package/src/__tests__/whoami.test.tsx

@@ -1,15 +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 {
-	createFetchResult,
-	setMockRawResponse,
-	setMockResponse,
-	unsetAllMocks,
-} from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { useMockIsTTY } from "./helpers/mock-istty";
+import {
+	msw,
+	mswSuccessOauthHandlers,
+	mswSuccessUserHandlers,
+} from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import type { UserInfo } from "../whoami";
 
@@ -21,12 +21,12 @@ describe("getUserInfo()", () => {
 	const { setIsTTY } = useMockIsTTY();
 
 	beforeEach(() => {
+		msw.use(...mswSuccessOauthHandlers, ...mswSuccessUserHandlers);
 		setIsTTY(true);
 	});
 
 	afterEach(() => {
 		process.env = ENV_COPY;
-		unsetAllMocks();
 	});
 
 	it("should return undefined if there is no config file", async () => {
@@ -44,30 +44,54 @@ describe("getUserInfo()", () => {
 		process.env = {
 			CLOUDFLARE_API_TOKEN: "123456789",
 		};
-		setMockRawResponse("/user", () =>
-			createFetchResult(undefined, false, [
-				{ code: 9109, message: "Uauthorized to access requested resource" },
-			])
+		msw.use(
+			rest.get("*/user", (_, res, ctx) => {
+				return res.once(
+					ctx.status(200),
+					ctx.json({
+						success: false,
+						errors: [
+							{
+								code: 9109,
+								message: "Uauthorized to access requested resource",
+							},
+						],
+						messages: [],
+						result: {},
+					})
+				);
+			}),
+			rest.get("*/accounts", (request, res, ctx) => {
+				const headersObject = request.headers.all();
+				delete headersObject["user-agent"];
+
+				expect(headersObject).toMatchInlineSnapshot(`
+			Object {
+			  "accept": "*/*",
+			  "accept-encoding": "gzip,deflate",
+			  "authorization": "Bearer 123456789",
+			  "connection": "close",
+			  "host": "api.cloudflare.com",
+			}
+		`);
+				return res.once(
+					ctx.status(200),
+					ctx.json({
+						success: true,
+						errors: [],
+						messages: [],
+						result: [],
+					})
+				);
+			})
 		);
-		setMockResponse("/accounts", () => []);
 		const userInfo = await getUserInfo();
 		expect(userInfo?.email).toBeUndefined();
 	});
-
 	it("should say it's using an API token when one is set", async () => {
 		process.env = {
 			CLOUDFLARE_API_TOKEN: "123456789",
 		};
-		setMockResponse("/user", () => {
-			return { email: "user@example.com" };
-		});
-		setMockResponse("/accounts", () => {
-			return [
-				{ name: "Account One", id: "account-1" },
-				{ name: "Account Two", id: "account-2" },
-				{ name: "Account Three", id: "account-3" },
-			];
-		});
 
 		const userInfo = await getUserInfo();
 		expect(userInfo).toEqual({
@@ -87,13 +111,6 @@ describe("getUserInfo()", () => {
 			CLOUDFLARE_API_KEY: "123456789",
 			CLOUDFLARE_EMAIL: "user@example.com",
 		};
-		setMockResponse("/accounts", () => {
-			return [
-				{ name: "Account One", id: "account-1" },
-				{ name: "Account Two", id: "account-2" },
-				{ name: "Account Three", id: "account-3" },
-			];
-		});
 
 		const userInfo = await getUserInfo();
 		expect(userInfo).toEqual({
@@ -114,13 +131,6 @@ describe("getUserInfo()", () => {
 			CLOUDFLARE_EMAIL: "user@example.com",
 			CLOUDFLARE_API_TOKEN: "123456789",
 		};
-		setMockResponse("/accounts", () => {
-			return [
-				{ name: "Account One", id: "account-1" },
-				{ name: "Account Two", id: "account-2" },
-				{ name: "Account Three", id: "account-3" },
-			];
-		});
 
 		const userInfo = await getUserInfo();
 		expect(userInfo).toEqual({
@@ -145,18 +155,6 @@ describe("getUserInfo()", () => {
 
 	it("should return the user's email and accounts if authenticated via config token", async () => {
 		writeAuthConfigFile({ oauth_token: "some-oauth-token" });
-
-		setMockResponse("/user", () => {
-			return { email: "user@example.com" };
-		});
-		setMockResponse("/accounts", () => {
-			return [
-				{ name: "Account One", id: "account-1" },
-				{ name: "Account Two", id: "account-2" },
-				{ name: "Account Three", id: "account-3" },
-			];
-		});
-
 		const userInfo = await getUserInfo();
 
 		expect(userInfo).toEqual({
@@ -173,26 +171,17 @@ describe("getUserInfo()", () => {
 
 	it("should display a warning message if the config file contains a legacy api_token field", async () => {
 		writeAuthConfigFile({ api_token: "API_TOKEN" });
-		setMockResponse("/user", () => {
-			return { email: "user@example.com" };
-		});
-		setMockResponse("/accounts", () => {
-			return [
-				{ name: "Account One", id: "account-1" },
-				{ name: "Account Two", id: "account-2" },
-				{ name: "Account Three", id: "account-3" },
-			];
-		});
 		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 1'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\`
-        environment variable.
+		        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\`
+		        environment variable.
 
-      "
-    `);
+		      "
+	    `);
 	});
 });
 
@@ -205,11 +194,43 @@ describe("WhoAmI component", () => {
 		);
 	});
 
-	it("should display the user's email and accounts", async () => {
+	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" },
@@ -227,4 +248,31 @@ describe("WhoAmI component", () => {
 		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"
+		);
+	});
 });