refactor: initialize the user auth state synchronously

.changeset/lemon-radios-sparkle.md

@@ -0,0 +1,9 @@
+---
+"wrangler": patch
+---
+
+refactor: initialize the user auth state synchronously
+
+We can now initialize the user state synchronously, which means that
+we can remove the checks for whether it has been done or not in each
+of the user auth functions.

packages/wrangler/src/__tests__/helpers/mock-account-id.ts

@@ -1,3 +1,5 @@
+import { reinitialiseAuthTokens } from "../../user";
+
 const ORIGINAL_CLOUDFLARE_API_TOKEN = process.env.CLOUDFLARE_API_TOKEN;
 const ORIGINAL_CLOUDFLARE_ACCOUNT_ID = process.env.CLOUDFLARE_ACCOUNT_ID;
 
@@ -16,6 +18,8 @@ export function mockApiToken({
     } else {
       process.env.CLOUDFLARE_API_TOKEN = apiToken;
     }
+    // Now we have updated the environment, we must reinitialize the user auth state.
+    reinitialiseAuthTokens();
   });
   afterEach(() => {
     process.env.CLOUDFLARE_API_TOKEN = ORIGINAL_CLOUDFLARE_API_TOKEN;

packages/wrangler/src/__tests__/helpers/run-in-tmp.ts

@@ -1,6 +1,7 @@
 import * as fs from "node:fs";
 import os from "node:os";
 import * as path from "node:path";
+import { reinitialiseAuthTokens } from "../../user";
 
 const originalCwd = process.cwd();
 
@@ -19,6 +20,8 @@ export function runInTempDir({ homedir }: { homedir?: string } = {}) {
       // This is because the module gets transpiled so that the "method" `homedir()` gets converted to a
       // getter that is not configurable (and so cannot be spied upon).
       jest.spyOn(os, "homedir").mockReturnValue(homedir);
+      // Now that we have changed the home directory location, we must reinitialize the user auth state
+      reinitialiseAuthTokens();
     }
   });
 

packages/wrangler/src/__tests__/logout.test.ts

@@ -2,9 +2,12 @@ import { existsSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import fetchMock from "jest-fetch-mock";
-import { initialise } from "../user";
+import {
+  reinitialiseAuthTokens,
+  USER_AUTH_CONFIG_FILE,
+  writeAuthConfigFile,
+} from "../user";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { writeUserConfig } from "./helpers/mock-user";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 
@@ -14,14 +17,15 @@ describe("wrangler", () => {
 
   describe("logout", () => {
     it("should exit with a message stating the user is not logged in", async () => {
-      await initialise();
       await runWrangler("logout");
       expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
     });
 
     it("should logout user that has been properly logged in", async () => {
-      writeUserConfig("some-oauth-tok", "some-refresh-tok");
-
+      writeAuthConfigFile({
+        oauth_token: "some-oauth-tok",
+        refresh_token: "some-refresh-tok",
+      });
       // Mock out the response for a request to revoke the auth tokens,
       // checking the form of the request is as expected.
       fetchMock.mockResponseOnce(async (req) => {
@@ -30,7 +34,8 @@ describe("wrangler", () => {
         return "";
       });
 
-      await initialise();
+      // Now that we have changed the auth tokens in the wrangler.toml we must reinitialize the user auth state.
+      reinitialiseAuthTokens();
       await runWrangler("logout");
 
       expect(std.out).toMatchInlineSnapshot(`
@@ -42,9 +47,9 @@ describe("wrangler", () => {
       expect(fetchMock).toHaveBeenCalledTimes(1);
 
       // Make sure that logout removed the config file containing the auth tokens.
-      expect(
-        existsSync(path.join(os.homedir(), ".wrangler/config/default.toml"))
-      ).toBe(false);
+      expect(existsSync(path.join(os.homedir(), USER_AUTH_CONFIG_FILE))).toBe(
+        false
+      );
     });
   });
 });

packages/wrangler/src/__tests__/whoami.test.tsx

@@ -1,30 +1,32 @@
 import { render } from "ink-testing-library";
 import React from "react";
-import { initialise } from "../user";
+import { reinitialiseAuthTokens, writeAuthConfigFile } from "../user";
 import { getUserInfo, WhoAmI } from "../whoami";
 import { setMockResponse } from "./helpers/mock-cfetch";
-import { writeUserConfig } from "./helpers/mock-user";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import type { UserInfo } from "../whoami";
 
 describe("getUserInfo()", () => {
   runInTempDir({ homedir: "./home" });
 
   it("should return undefined if there is no config file", async () => {
-    await initialise();
     const userInfo = await getUserInfo();
     expect(userInfo).toBeUndefined();
   });
 
   it("should return undefined if there is an empty config file", async () => {
-    writeUserConfig();
-    await initialise();
+    writeAuthConfigFile({});
+    // Now that we have changed the auth tokens in the wrangler.toml we must reinitialize the user auth state.
+    reinitialiseAuthTokens();
     const userInfo = await getUserInfo();
     expect(userInfo).toBeUndefined();
   });
 
   it("should return the user's email and accounts if authenticated via config token", async () => {
-    writeUserConfig("some-oauth-token");
+    writeAuthConfigFile({ oauth_token: "some-oauth-token" });
+    // Now that we have changed the auth tokens in the wrangler.toml we must reinitialize the user auth state.
+    reinitialiseAuthTokens();
+
     setMockResponse("/user", () => {
       return { email: "user@example.com" };
     });
@@ -36,7 +38,6 @@ describe("getUserInfo()", () => {
       ];
     });
 
-    await initialise();
     const userInfo = await getUserInfo();
 
     expect(userInfo).toEqual({

packages/wrangler/src/index.tsx

@@ -47,7 +47,6 @@ import {
   login,
   logout,
   listScopes,
-  initialise as initialiseUserConfig,
   loginOrRefreshIfRequired,
   getAccountId,
   validateScopeKeys,
@@ -2340,7 +2339,6 @@ export async function main(argv: string[]): Promise<void> {
   wrangler.exitProcess(false);
 
   try {
-    await initialiseUserConfig();
     await wrangler.parse();
   } catch (e) {
     if (e instanceof CommandLineArgsError) {