wrangler 0.0.0-e978986 → 0.0.0-ea7ee45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (181) hide show
  1. package/README.md +7 -1
  2. package/bin/wrangler.js +111 -57
  3. package/kv-asset-handler.js +1 -0
  4. package/miniflare-dist/index.mjs +9 -2
  5. package/package.json +156 -152
  6. package/src/__tests__/config-cache.test.ts +24 -24
  7. package/src/__tests__/configuration.test.ts +3818 -3363
  8. package/src/__tests__/dev.test.tsx +1128 -949
  9. package/src/__tests__/guess-worker-format.test.ts +68 -68
  10. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  11. package/src/__tests__/helpers/faye-websocket.d.ts +4 -4
  12. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  13. package/src/__tests__/helpers/mock-bin.ts +20 -20
  14. package/src/__tests__/helpers/mock-cfetch.ts +92 -92
  15. package/src/__tests__/helpers/mock-console.ts +49 -39
  16. package/src/__tests__/helpers/mock-dialogs.ts +94 -71
  17. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  18. package/src/__tests__/helpers/mock-istty.ts +65 -18
  19. package/src/__tests__/helpers/mock-kv.ts +26 -26
  20. package/src/__tests__/helpers/mock-oauth-flow.ts +223 -228
  21. package/src/__tests__/helpers/mock-process.ts +39 -0
  22. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  23. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  24. package/src/__tests__/helpers/run-in-tmp.ts +27 -27
  25. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  26. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  27. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  28. package/src/__tests__/https-options.test.ts +104 -104
  29. package/src/__tests__/index.test.ts +239 -233
  30. package/src/__tests__/init.test.ts +1605 -1180
  31. package/src/__tests__/jest.setup.ts +63 -33
  32. package/src/__tests__/kv.test.ts +1128 -990
  33. package/src/__tests__/logger.test.ts +100 -74
  34. package/src/__tests__/package-manager.test.ts +303 -303
  35. package/src/__tests__/pages.test.ts +1160 -563
  36. package/src/__tests__/parse.test.ts +252 -252
  37. package/src/__tests__/publish.test.ts +6344 -5299
  38. package/src/__tests__/pubsub.test.ts +276 -0
  39. package/src/__tests__/r2.test.ts +133 -133
  40. package/src/__tests__/route.test.ts +18 -18
  41. package/src/__tests__/secret.test.ts +382 -377
  42. package/src/__tests__/tail.test.ts +530 -530
  43. package/src/__tests__/user.test.ts +123 -111
  44. package/src/__tests__/whoami.test.tsx +198 -83
  45. package/src/__tests__/worker-namespace.test.ts +327 -0
  46. package/src/abort.d.ts +1 -1
  47. package/src/api/dev.ts +39 -0
  48. package/src/api/index.ts +1 -0
  49. package/src/bundle-reporter.tsx +29 -0
  50. package/src/bundle.ts +158 -146
  51. package/src/cfetch/index.ts +80 -80
  52. package/src/cfetch/internal.ts +92 -88
  53. package/src/cli.ts +21 -7
  54. package/src/config/config.ts +204 -195
  55. package/src/config/diagnostics.ts +61 -61
  56. package/src/config/environment.ts +367 -357
  57. package/src/config/index.ts +193 -193
  58. package/src/config/validation-helpers.ts +366 -357
  59. package/src/config/validation.ts +1521 -1367
  60. package/src/config-cache.ts +24 -25
  61. package/src/create-worker-preview.ts +206 -136
  62. package/src/create-worker-upload-form.ts +238 -238
  63. package/src/dev/dev-vars.ts +13 -13
  64. package/src/dev/dev.tsx +334 -336
  65. package/src/dev/local.tsx +304 -272
  66. package/src/dev/remote.tsx +351 -211
  67. package/src/dev/use-esbuild.ts +126 -94
  68. package/src/dev.tsx +526 -0
  69. package/src/dialogs.tsx +97 -97
  70. package/src/durable.ts +87 -87
  71. package/src/entry.ts +234 -228
  72. package/src/environment-variables.ts +23 -23
  73. package/src/errors.ts +6 -6
  74. package/src/generate.ts +33 -0
  75. package/src/git-client.ts +42 -0
  76. package/src/https-options.ts +79 -79
  77. package/src/index.tsx +1775 -2752
  78. package/src/init.ts +549 -0
  79. package/src/inspect.ts +593 -593
  80. package/src/intl-polyfill.d.ts +123 -123
  81. package/src/kv.ts +277 -277
  82. package/src/logger.ts +46 -39
  83. package/src/miniflare-cli/enum-keys.ts +8 -8
  84. package/src/miniflare-cli/index.ts +42 -31
  85. package/src/miniflare-cli/request-context.ts +18 -18
  86. package/src/module-collection.ts +212 -212
  87. package/src/open-in-browser.ts +4 -6
  88. package/src/package-manager.ts +123 -123
  89. package/src/pages/build.tsx +202 -0
  90. package/src/pages/constants.ts +7 -0
  91. package/src/pages/deployments.tsx +101 -0
  92. package/src/pages/dev.tsx +964 -0
  93. package/src/pages/functions/buildPlugin.ts +105 -0
  94. package/src/pages/functions/buildWorker.ts +151 -0
  95. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  96. package/src/pages/functions/filepath-routing.ts +189 -0
  97. package/src/pages/functions/identifiers.ts +78 -0
  98. package/src/pages/functions/routes.ts +151 -0
  99. package/src/pages/index.tsx +84 -0
  100. package/src/pages/projects.tsx +157 -0
  101. package/src/pages/publish.tsx +335 -0
  102. package/src/pages/types.ts +40 -0
  103. package/src/pages/upload.tsx +384 -0
  104. package/src/pages/utils.ts +12 -0
  105. package/src/parse.ts +209 -125
  106. package/src/paths.ts +6 -6
  107. package/src/preview.ts +31 -0
  108. package/src/proxy.ts +400 -389
  109. package/src/publish.ts +688 -505
  110. package/src/pubsub/index.ts +286 -0
  111. package/src/pubsub/pubsub-commands.tsx +594 -0
  112. package/src/r2.ts +19 -19
  113. package/src/selfsigned.d.ts +23 -23
  114. package/src/sites.tsx +278 -201
  115. package/src/tail/filters.ts +108 -108
  116. package/src/tail/index.ts +217 -217
  117. package/src/tail/printing.ts +45 -45
  118. package/src/update-check.ts +11 -11
  119. package/src/user/choose-account.tsx +60 -0
  120. package/src/user/env-vars.ts +46 -0
  121. package/src/user/generate-auth-url.ts +33 -0
  122. package/src/user/generate-random-state.ts +16 -0
  123. package/src/user/index.ts +3 -0
  124. package/src/user/user.tsx +1130 -0
  125. package/src/whoami.tsx +61 -41
  126. package/src/worker-namespace.ts +190 -0
  127. package/src/worker.ts +104 -99
  128. package/src/zones.ts +76 -0
  129. package/templates/checked-fetch.js +17 -0
  130. package/templates/new-worker-scheduled.js +4 -4
  131. package/templates/new-worker-scheduled.ts +16 -16
  132. package/templates/new-worker.js +3 -3
  133. package/templates/new-worker.ts +15 -15
  134. package/templates/no-op-worker.js +10 -0
  135. package/templates/pages-template-plugin.ts +155 -0
  136. package/templates/pages-template-worker.ts +161 -0
  137. package/templates/static-asset-facade.js +32 -36
  138. package/templates/tsconfig.json +95 -95
  139. package/wrangler-dist/cli.js +40620 -39223
  140. package/pages/functions/buildPlugin.ts +0 -105
  141. package/pages/functions/buildWorker.ts +0 -151
  142. package/pages/functions/filepath-routing.ts +0 -189
  143. package/pages/functions/identifiers.ts +0 -78
  144. package/pages/functions/routes.ts +0 -156
  145. package/pages/functions/template-plugin.ts +0 -147
  146. package/pages/functions/template-worker.ts +0 -143
  147. package/src/pages.tsx +0 -2027
  148. package/src/user.tsx +0 -1203
  149. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  150. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  151. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  152. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  153. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  154. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  155. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  156. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  157. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  158. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  159. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  160. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  161. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  162. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  163. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  164. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  165. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  166. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  167. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  168. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  169. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  170. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  171. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  172. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  173. package/vendor/wrangler-mime/LICENSE +0 -21
  174. package/vendor/wrangler-mime/Mime.js +0 -97
  175. package/vendor/wrangler-mime/README.md +0 -187
  176. package/vendor/wrangler-mime/cli.js +0 -46
  177. package/vendor/wrangler-mime/index.js +0 -4
  178. package/vendor/wrangler-mime/lite.js +0 -4
  179. package/vendor/wrangler-mime/package.json +0 -52
  180. package/vendor/wrangler-mime/types/other.js +0 -1
  181. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -3,10 +3,11 @@ import os from "node:os";
3
3
  import path from "node:path";
4
4
  import fetchMock from "jest-fetch-mock";
5
5
  import {
6
- readAuthConfigFile,
7
- requireAuth,
8
- USER_AUTH_CONFIG_FILE,
9
- writeAuthConfigFile,
6
+ loginOrRefreshIfRequired,
7
+ readAuthConfigFile,
8
+ requireAuth,
9
+ USER_AUTH_CONFIG_FILE,
10
+ writeAuthConfigFile,
10
11
  } from "../user";
11
12
  import { mockConsoleMethods } from "./helpers/mock-console";
12
13
  import { useMockIsTTY } from "./helpers/mock-istty";
@@ -17,115 +18,126 @@ import type { Config } from "../config";
17
18
  import type { UserAuthConfig } from "../user";
18
19
 
19
20
  describe("User", () => {
20
- runInTempDir({ homedir: "./home" });
21
- const std = mockConsoleMethods();
22
- const {
23
- mockOAuthServerCallback,
24
- mockGrantAccessToken,
25
- mockGrantAuthorization,
26
- mockRevokeAuthorization,
27
- mockExchangeRefreshTokenForAccessToken,
28
- } = mockOAuthFlow();
29
-
30
- const { setIsTTY } = useMockIsTTY();
31
-
32
- describe("login", () => {
33
- it("should login a user when `wrangler login` is run", async () => {
34
- mockOAuthServerCallback();
35
- const accessTokenRequest = mockGrantAccessToken({ respondWith: "ok" });
36
- mockGrantAuthorization({ respondWith: "success" });
37
-
38
- await runWrangler("login");
39
-
40
- expect(accessTokenRequest.actual.url).toEqual(
41
- accessTokenRequest.expected.url
42
- );
43
- expect(accessTokenRequest.actual.method).toEqual(
44
- accessTokenRequest.expected.method
45
- );
46
-
47
- expect(std.out).toMatchInlineSnapshot(`
21
+ runInTempDir({ homedir: "./home" });
22
+ const std = mockConsoleMethods();
23
+ const {
24
+ mockOAuthServerCallback,
25
+ mockGrantAccessToken,
26
+ mockGrantAuthorization,
27
+ mockRevokeAuthorization,
28
+ mockExchangeRefreshTokenForAccessToken,
29
+ } = mockOAuthFlow();
30
+
31
+ const { setIsTTY } = useMockIsTTY();
32
+
33
+ describe("login", () => {
34
+ it("should login a user when `wrangler login` is run", async () => {
35
+ mockOAuthServerCallback();
36
+ const accessTokenRequest = mockGrantAccessToken({ respondWith: "ok" });
37
+ mockGrantAuthorization({ respondWith: "success" });
38
+
39
+ await runWrangler("login");
40
+
41
+ expect(accessTokenRequest.actual.url).toEqual(
42
+ accessTokenRequest.expected.url
43
+ );
44
+ expect(accessTokenRequest.actual.method).toEqual(
45
+ accessTokenRequest.expected.method
46
+ );
47
+
48
+ expect(std.out).toMatchInlineSnapshot(`
48
49
  "Attempting to login via OAuth...
50
+ 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%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
49
51
  Successfully logged in."
50
52
  `);
51
53
 
52
- expect(readAuthConfigFile()).toEqual<UserAuthConfig>({
53
- api_token: undefined,
54
- oauth_token: "test-access-token",
55
- refresh_token: "test-refresh-token",
56
- expiration_time: expect.any(String),
57
- });
58
- });
59
- });
60
-
61
- describe("logout", () => {
62
- it("should exit with a message stating the user is not logged in", async () => {
63
- await runWrangler("logout");
64
- expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
65
- });
66
-
67
- it("should logout user that has been properly logged in", async () => {
68
- writeAuthConfigFile({
69
- oauth_token: "some-oauth-tok",
70
- refresh_token: "some-refresh-tok",
71
- });
72
- const outcome = mockRevokeAuthorization();
73
-
74
- await runWrangler("logout");
75
-
76
- expect(outcome.actual.url).toEqual(
77
- "https://dash.cloudflare.com/oauth2/revoke"
78
- );
79
- expect(outcome.actual.method).toEqual("POST");
80
-
81
- expect(std.out).toMatchInlineSnapshot(`"Successfully logged out."`);
82
-
83
- // Make sure that we made the request to logout.
84
- expect(fetchMock).toHaveBeenCalledTimes(1);
85
-
86
- // Make sure that logout removed the config file containing the auth tokens.
87
- const config = path.join(os.homedir(), USER_AUTH_CONFIG_FILE);
88
- expect(fs.existsSync(config)).toBeFalsy();
89
- });
90
- });
91
-
92
- // TODO: Improve OAuth mocking to handle `/token` endpoints from different calls
93
- it("should handle errors for failed token refresh", async () => {
94
- setIsTTY(false);
95
- mockOAuthServerCallback();
96
- writeAuthConfigFile({
97
- oauth_token: "hunter2",
98
- refresh_token: "Order 66",
99
- });
100
- mockGrantAuthorization({ respondWith: "success" });
101
-
102
- mockExchangeRefreshTokenForAccessToken({
103
- respondWith: "badResponse",
104
- });
105
-
106
- // Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
107
- await expect(
108
- requireAuth({} as Config)
109
- ).rejects.toThrowErrorMatchingInlineSnapshot(
110
- `"Did not login, quitting..."`
111
- );
112
- });
113
-
114
- it("should confirm no error message when refresh is successful", async () => {
115
- setIsTTY(false);
116
- mockOAuthServerCallback();
117
- writeAuthConfigFile({
118
- oauth_token: "hunter2",
119
- refresh_token: "Order 66",
120
- });
121
- mockGrantAuthorization({ respondWith: "success" });
122
-
123
- mockExchangeRefreshTokenForAccessToken({
124
- respondWith: "refreshSuccess",
125
- });
126
-
127
- // Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
128
- await expect(requireAuth({} as Config)).rejects.toThrowError();
129
- expect(std.err).toContain("");
130
- });
54
+ expect(readAuthConfigFile()).toEqual<UserAuthConfig>({
55
+ api_token: undefined,
56
+ oauth_token: "test-access-token",
57
+ refresh_token: "test-refresh-token",
58
+ expiration_time: expect.any(String),
59
+ });
60
+ });
61
+ });
62
+
63
+ describe("logout", () => {
64
+ it("should exit with a message stating the user is not logged in", async () => {
65
+ await runWrangler("logout");
66
+ expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
67
+ });
68
+
69
+ it("should logout user that has been properly logged in", async () => {
70
+ writeAuthConfigFile({
71
+ oauth_token: "some-oauth-tok",
72
+ refresh_token: "some-refresh-tok",
73
+ });
74
+ const outcome = mockRevokeAuthorization();
75
+
76
+ await runWrangler("logout");
77
+
78
+ expect(outcome.actual.url).toEqual(
79
+ "https://dash.cloudflare.com/oauth2/revoke"
80
+ );
81
+ expect(outcome.actual.method).toEqual("POST");
82
+
83
+ expect(std.out).toMatchInlineSnapshot(`"Successfully logged out."`);
84
+
85
+ // Make sure that we made the request to logout.
86
+ expect(fetchMock).toHaveBeenCalledTimes(1);
87
+
88
+ // Make sure that logout removed the config file containing the auth tokens.
89
+ const config = path.join(os.homedir(), USER_AUTH_CONFIG_FILE);
90
+ expect(fs.existsSync(config)).toBeFalsy();
91
+ });
92
+ });
93
+
94
+ // TODO: Improve OAuth mocking to handle `/token` endpoints from different calls
95
+ it("should handle errors for failed token refresh", async () => {
96
+ setIsTTY(false);
97
+ mockOAuthServerCallback();
98
+ writeAuthConfigFile({
99
+ oauth_token: "hunter2",
100
+ refresh_token: "Order 66",
101
+ });
102
+ mockGrantAuthorization({ respondWith: "success" });
103
+
104
+ mockExchangeRefreshTokenForAccessToken({
105
+ respondWith: "badResponse",
106
+ });
107
+
108
+ // Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
109
+ await expect(
110
+ requireAuth({} as Config)
111
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
112
+ `"Did not login, quitting..."`
113
+ );
114
+ });
115
+
116
+ it("should confirm no error message when refresh is successful", async () => {
117
+ setIsTTY(false);
118
+ mockOAuthServerCallback();
119
+ writeAuthConfigFile({
120
+ oauth_token: "hunter2",
121
+ refresh_token: "Order 66",
122
+ });
123
+ mockGrantAuthorization({ respondWith: "success" });
124
+
125
+ mockExchangeRefreshTokenForAccessToken({
126
+ respondWith: "refreshSuccess",
127
+ });
128
+
129
+ // Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
130
+ await expect(requireAuth({} as Config)).rejects.toThrowError();
131
+ expect(std.err).toContain("");
132
+ });
133
+
134
+ it("should revert to non-interactive mode if isTTY throws an error", async () => {
135
+ setIsTTY({
136
+ stdin() {
137
+ throw new Error("stdin is not tty");
138
+ },
139
+ stdout: true,
140
+ });
141
+ await expect(loginOrRefreshIfRequired()).resolves.toEqual(false);
142
+ });
131
143
  });
@@ -2,64 +2,179 @@ import { render } from "ink-testing-library";
2
2
  import React from "react";
3
3
  import { writeAuthConfigFile } from "../user";
4
4
  import { getUserInfo, WhoAmI } from "../whoami";
5
- import { setMockResponse } from "./helpers/mock-cfetch";
5
+ import {
6
+ createFetchResult,
7
+ setMockRawResponse,
8
+ setMockResponse,
9
+ unsetAllMocks,
10
+ } from "./helpers/mock-cfetch";
6
11
  import { mockConsoleMethods } from "./helpers/mock-console";
7
12
  import { useMockIsTTY } from "./helpers/mock-istty";
8
13
  import { runInTempDir } from "./helpers/run-in-tmp";
9
14
  import type { UserInfo } from "../whoami";
10
15
 
11
16
  describe("getUserInfo()", () => {
12
- runInTempDir({ homedir: "./home" });
13
- const std = mockConsoleMethods();
14
- const { setIsTTY } = useMockIsTTY();
15
-
16
- beforeEach(() => {
17
- setIsTTY(true);
18
- });
19
-
20
- it("should return undefined if there is no config file", async () => {
21
- const userInfo = await getUserInfo();
22
- expect(userInfo).toBeUndefined();
23
- });
24
-
25
- it("should return undefined if there is an empty config file", async () => {
26
- writeAuthConfigFile({});
27
- const userInfo = await getUserInfo();
28
- expect(userInfo).toBeUndefined();
29
- });
30
-
31
- it("should return the user's email and accounts if authenticated via config token", async () => {
32
- writeAuthConfigFile({ oauth_token: "some-oauth-token" });
33
-
34
- setMockResponse("/user", () => {
35
- return { email: "user@example.com" };
36
- });
37
- setMockResponse("/accounts", () => {
38
- return [
39
- { name: "Account One", id: "account-1" },
40
- { name: "Account Two", id: "account-2" },
41
- { name: "Account Three", id: "account-3" },
42
- ];
43
- });
44
-
45
- const userInfo = await getUserInfo();
46
-
47
- expect(userInfo).toEqual({
48
- authType: "OAuth",
49
- apiToken: "some-oauth-token",
50
- email: "user@example.com",
51
- accounts: [
52
- { name: "Account One", id: "account-1" },
53
- { name: "Account Two", id: "account-2" },
54
- { name: "Account Three", id: "account-3" },
55
- ],
56
- });
57
- });
58
-
59
- it("should display a warning message if the config file contains a legacy api_token field", async () => {
60
- writeAuthConfigFile({ api_token: "API_TOKEN" });
61
- await getUserInfo();
62
- expect(std.warn).toMatchInlineSnapshot(`
17
+ const ENV_COPY = process.env;
18
+
19
+ runInTempDir({ homedir: "./home" });
20
+ const std = mockConsoleMethods();
21
+ const { setIsTTY } = useMockIsTTY();
22
+
23
+ beforeEach(() => {
24
+ setIsTTY(true);
25
+ });
26
+
27
+ afterEach(() => {
28
+ process.env = ENV_COPY;
29
+ unsetAllMocks();
30
+ });
31
+
32
+ it("should return undefined if there is no config file", async () => {
33
+ const userInfo = await getUserInfo();
34
+ expect(userInfo).toBeUndefined();
35
+ });
36
+
37
+ it("should return undefined if there is an empty config file", async () => {
38
+ writeAuthConfigFile({});
39
+ const userInfo = await getUserInfo();
40
+ expect(userInfo).toBeUndefined();
41
+ });
42
+
43
+ it("should return undefined for email if the user settings API request fails with 9109", async () => {
44
+ process.env = {
45
+ CLOUDFLARE_API_TOKEN: "123456789",
46
+ };
47
+ setMockRawResponse("/user", () =>
48
+ createFetchResult(undefined, false, [
49
+ { code: 9109, message: "Uauthorized to access requested resource" },
50
+ ])
51
+ );
52
+ setMockResponse("/accounts", () => []);
53
+ const userInfo = await getUserInfo();
54
+ expect(userInfo?.email).toBeUndefined();
55
+ });
56
+
57
+ it("should say it's using an API token when one is set", async () => {
58
+ process.env = {
59
+ CLOUDFLARE_API_TOKEN: "123456789",
60
+ };
61
+ setMockResponse("/user", () => {
62
+ return { email: "user@example.com" };
63
+ });
64
+ setMockResponse("/accounts", () => {
65
+ return [
66
+ { name: "Account One", id: "account-1" },
67
+ { name: "Account Two", id: "account-2" },
68
+ { name: "Account Three", id: "account-3" },
69
+ ];
70
+ });
71
+
72
+ const userInfo = await getUserInfo();
73
+ expect(userInfo).toEqual({
74
+ authType: "API Token",
75
+ apiToken: "123456789",
76
+ email: "user@example.com",
77
+ accounts: [
78
+ { name: "Account One", id: "account-1" },
79
+ { name: "Account Two", id: "account-2" },
80
+ { name: "Account Three", id: "account-3" },
81
+ ],
82
+ });
83
+ });
84
+
85
+ it("should say it's using a Global API Key when one is set", async () => {
86
+ process.env = {
87
+ CLOUDFLARE_API_KEY: "123456789",
88
+ CLOUDFLARE_EMAIL: "user@example.com",
89
+ };
90
+ setMockResponse("/accounts", () => {
91
+ return [
92
+ { name: "Account One", id: "account-1" },
93
+ { name: "Account Two", id: "account-2" },
94
+ { name: "Account Three", id: "account-3" },
95
+ ];
96
+ });
97
+
98
+ const userInfo = await getUserInfo();
99
+ expect(userInfo).toEqual({
100
+ authType: "Global API Key",
101
+ apiToken: "123456789",
102
+ email: "user@example.com",
103
+ accounts: [
104
+ { name: "Account One", id: "account-1" },
105
+ { name: "Account Two", id: "account-2" },
106
+ { name: "Account Three", id: "account-3" },
107
+ ],
108
+ });
109
+ });
110
+
111
+ it("should use a Global API Key in preference to an API token", async () => {
112
+ process.env = {
113
+ CLOUDFLARE_API_KEY: "123456789",
114
+ CLOUDFLARE_EMAIL: "user@example.com",
115
+ CLOUDFLARE_API_TOKEN: "123456789",
116
+ };
117
+ setMockResponse("/accounts", () => {
118
+ return [
119
+ { name: "Account One", id: "account-1" },
120
+ { name: "Account Two", id: "account-2" },
121
+ { name: "Account Three", id: "account-3" },
122
+ ];
123
+ });
124
+
125
+ const userInfo = await getUserInfo();
126
+ expect(userInfo).toEqual({
127
+ authType: "Global API Key",
128
+ apiToken: "123456789",
129
+ email: "user@example.com",
130
+ accounts: [
131
+ { name: "Account One", id: "account-1" },
132
+ { name: "Account Two", id: "account-2" },
133
+ { name: "Account Three", id: "account-3" },
134
+ ],
135
+ });
136
+ });
137
+
138
+ it("should return undefined only a Global API Key, but not Email, is set", async () => {
139
+ process.env = {
140
+ CLOUDFLARE_API_KEY: "123456789",
141
+ };
142
+ const userInfo = await getUserInfo();
143
+ expect(userInfo).toEqual(undefined);
144
+ });
145
+
146
+ it("should return the user's email and accounts if authenticated via config token", async () => {
147
+ writeAuthConfigFile({ oauth_token: "some-oauth-token" });
148
+
149
+ setMockResponse("/user", () => {
150
+ return { email: "user@example.com" };
151
+ });
152
+ setMockResponse("/accounts", () => {
153
+ return [
154
+ { name: "Account One", id: "account-1" },
155
+ { name: "Account Two", id: "account-2" },
156
+ { name: "Account Three", id: "account-3" },
157
+ ];
158
+ });
159
+
160
+ const userInfo = await getUserInfo();
161
+
162
+ expect(userInfo).toEqual({
163
+ authType: "OAuth Token",
164
+ apiToken: "some-oauth-token",
165
+ email: "user@example.com",
166
+ accounts: [
167
+ { name: "Account One", id: "account-1" },
168
+ { name: "Account Two", id: "account-2" },
169
+ { name: "Account Three", id: "account-3" },
170
+ ],
171
+ });
172
+ });
173
+
174
+ it("should display a warning message if the config file contains a legacy api_token field", async () => {
175
+ writeAuthConfigFile({ api_token: "API_TOKEN" });
176
+ await getUserInfo();
177
+ expect(std.warn).toMatchInlineSnapshot(`
63
178
  "â–² [WARNING] It looks like you have used Wrangler 1's \`config\` command to login with an API token.
64
179
 
65
180
  This is no longer supported in the current version of Wrangler.
@@ -68,38 +183,38 @@ describe("getUserInfo()", () => {
68
183
 
69
184
  "
70
185
  `);
71
- });
186
+ });
72
187
  });
73
188
 
74
189
  describe("WhoAmI component", () => {
75
- it("should return undefined if there is no user", async () => {
76
- const { lastFrame } = render(<WhoAmI user={undefined}></WhoAmI>);
77
-
78
- expect(lastFrame()).toMatchInlineSnapshot(
79
- `"You are not authenticated. Please run \`wrangler login\`."`
80
- );
81
- });
82
-
83
- it("should display the user's email and accounts", async () => {
84
- const user: UserInfo = {
85
- authType: "OAuth",
86
- apiToken: "some-oauth-token",
87
- email: "user@example.com",
88
- accounts: [
89
- { name: "Account One", id: "account-1" },
90
- { name: "Account Two", id: "account-2" },
91
- { name: "Account Three", id: "account-3" },
92
- ],
93
- };
94
-
95
- const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
96
-
97
- expect(lastFrame()).toContain(
98
- "You are logged in with an OAuth Token, associated with the email 'user@example.com'!"
99
- );
100
- expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
101
- expect(lastFrame()).toMatch(/Account One .+ account-1/);
102
- expect(lastFrame()).toMatch(/Account Two .+ account-2/);
103
- expect(lastFrame()).toMatch(/Account Three .+ account-3/);
104
- });
190
+ it("should return undefined if there is no user", async () => {
191
+ const { lastFrame } = render(<WhoAmI user={undefined}></WhoAmI>);
192
+
193
+ expect(lastFrame()).toMatchInlineSnapshot(
194
+ `"You are not authenticated. Please run \`wrangler login\`."`
195
+ );
196
+ });
197
+
198
+ it("should display the user's email and accounts", async () => {
199
+ const user: UserInfo = {
200
+ authType: "OAuth Token",
201
+ apiToken: "some-oauth-token",
202
+ email: "user@example.com",
203
+ accounts: [
204
+ { name: "Account One", id: "account-1" },
205
+ { name: "Account Two", id: "account-2" },
206
+ { name: "Account Three", id: "account-3" },
207
+ ],
208
+ };
209
+
210
+ const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
211
+
212
+ expect(lastFrame()).toContain(
213
+ "You are logged in with an OAuth Token, associated with the email 'user@example.com'!"
214
+ );
215
+ expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
216
+ expect(lastFrame()).toMatch(/Account One .+ account-1/);
217
+ expect(lastFrame()).toMatch(/Account Two .+ account-2/);
218
+ expect(lastFrame()).toMatch(/Account Three .+ account-3/);
219
+ });
105
220
  });