wrangler 0.0.0-e1b8ac4 → 0.0.0-e1c2f5b9

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 (295) hide show
  1. package/README.md +23 -3
  2. package/bin/wrangler.js +170 -62
  3. package/miniflare-dist/index.mjs +1499 -21
  4. package/package.json +193 -156
  5. package/src/__tests__/access.test.ts +25 -0
  6. package/src/__tests__/api-dev.test.ts +238 -0
  7. package/src/__tests__/api-devregistry.test.js +64 -0
  8. package/src/__tests__/api.test.ts +80 -0
  9. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  10. package/src/__tests__/config-cache.test.ts +30 -24
  11. package/src/__tests__/configuration.test.ts +4152 -3537
  12. package/src/__tests__/d1.test.ts +123 -0
  13. package/src/__tests__/delete.test.ts +263 -0
  14. package/src/__tests__/deployments.test.ts +105 -0
  15. package/src/__tests__/dev.test.tsx +1559 -1028
  16. package/src/__tests__/dialogs.test.tsx +40 -0
  17. package/src/__tests__/generate.test.ts +235 -0
  18. package/src/__tests__/get-host-from-url.test.ts +16 -0
  19. package/src/__tests__/guess-worker-format.test.ts +68 -68
  20. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  21. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  22. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  23. package/src/__tests__/helpers/mock-bin.ts +20 -20
  24. package/src/__tests__/helpers/mock-cfetch.ts +165 -99
  25. package/src/__tests__/helpers/mock-console.ts +58 -39
  26. package/src/__tests__/helpers/mock-dialogs.ts +94 -94
  27. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
  28. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  29. package/src/__tests__/helpers/mock-istty.ts +65 -18
  30. package/src/__tests__/helpers/mock-known-routes.ts +7 -0
  31. package/src/__tests__/helpers/mock-kv.ts +27 -27
  32. package/src/__tests__/helpers/mock-oauth-flow.ts +244 -228
  33. package/src/__tests__/helpers/mock-process.ts +23 -13
  34. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  35. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  36. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  37. package/src/__tests__/helpers/msw/handlers/deployments.ts +59 -0
  38. package/src/__tests__/helpers/msw/handlers/namespaces.ts +104 -0
  39. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  40. package/src/__tests__/helpers/msw/handlers/r2.ts +80 -0
  41. package/src/__tests__/helpers/msw/handlers/script.ts +75 -0
  42. package/src/__tests__/helpers/msw/handlers/user.ts +63 -0
  43. package/src/__tests__/helpers/msw/handlers/zones.ts +22 -0
  44. package/src/__tests__/helpers/msw/index.ts +21 -0
  45. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  46. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  47. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  48. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  49. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  50. package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
  51. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  52. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  53. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  54. package/src/__tests__/https-options.test.ts +142 -109
  55. package/src/__tests__/index.test.ts +245 -234
  56. package/src/__tests__/init.test.ts +3027 -1925
  57. package/src/__tests__/jest.setup.ts +157 -61
  58. package/src/__tests__/kv.test.ts +1773 -1507
  59. package/src/__tests__/logger.test.ts +96 -96
  60. package/src/__tests__/logout.test.ts +47 -0
  61. package/src/__tests__/metrics.test.ts +495 -0
  62. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  63. package/src/__tests__/middleware.test.ts +750 -0
  64. package/src/__tests__/package-manager.test.ts +303 -303
  65. package/src/__tests__/pages-deployment-tail.test.ts +884 -0
  66. package/src/__tests__/pages.test.ts +2424 -735
  67. package/src/__tests__/parse.test.ts +252 -252
  68. package/src/__tests__/paths.test.ts +39 -0
  69. package/src/__tests__/publish.test.ts +7621 -5798
  70. package/src/__tests__/pubsub.test.ts +490 -0
  71. package/src/__tests__/queues.test.ts +522 -0
  72. package/src/__tests__/r2.test.ts +388 -228
  73. package/src/__tests__/route.test.ts +18 -18
  74. package/src/__tests__/secret.test.ts +673 -460
  75. package/src/__tests__/tail.test.ts +776 -567
  76. package/src/__tests__/test-old-node-version.js +31 -0
  77. package/src/__tests__/tsconfig-sanity.ts +12 -0
  78. package/src/__tests__/tsconfig.json +8 -0
  79. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  80. package/src/__tests__/type-generation.test.ts +233 -0
  81. package/src/__tests__/user.test.ts +117 -120
  82. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  83. package/src/__tests__/validate-dev-props.test.ts +56 -0
  84. package/src/__tests__/version.test.ts +35 -0
  85. package/src/__tests__/whoami.test.tsx +264 -125
  86. package/src/__tests__/worker-namespace.test.ts +326 -0
  87. package/src/abort.d.ts +1 -1
  88. package/src/api/dev.ts +218 -0
  89. package/src/api/index.ts +2 -0
  90. package/src/bundle-reporter.tsx +68 -0
  91. package/src/bundle.ts +785 -166
  92. package/src/cfetch/index.ts +120 -83
  93. package/src/cfetch/internal.ts +211 -92
  94. package/src/cli.ts +23 -8
  95. package/src/config/config.ts +236 -204
  96. package/src/config/diagnostics.ts +61 -61
  97. package/src/config/environment.ts +514 -357
  98. package/src/config/index.ts +326 -193
  99. package/src/config/validation-helpers.ts +379 -366
  100. package/src/config/validation.ts +1973 -1402
  101. package/src/config-cache.ts +81 -41
  102. package/src/create-worker-preview.ts +239 -142
  103. package/src/create-worker-upload-form.ts +309 -238
  104. package/src/d1/backups.tsx +223 -0
  105. package/src/d1/constants.ts +2 -0
  106. package/src/d1/create.tsx +63 -0
  107. package/src/d1/delete.tsx +56 -0
  108. package/src/d1/execute.tsx +352 -0
  109. package/src/d1/formatTimeAgo.ts +14 -0
  110. package/src/d1/index.ts +101 -0
  111. package/src/d1/list.tsx +48 -0
  112. package/src/d1/migrations/apply.tsx +196 -0
  113. package/src/d1/migrations/create.tsx +77 -0
  114. package/src/d1/migrations/helpers.ts +147 -0
  115. package/src/d1/migrations/index.tsx +3 -0
  116. package/src/d1/migrations/list.tsx +79 -0
  117. package/src/d1/migrations/options.ts +18 -0
  118. package/src/d1/options.ts +22 -0
  119. package/src/d1/types.tsx +24 -0
  120. package/src/d1/utils.ts +48 -0
  121. package/src/delete.ts +108 -0
  122. package/src/deployments.ts +83 -0
  123. package/src/deprecated/index.ts +145 -0
  124. package/src/dev/dev-vars.ts +20 -17
  125. package/src/dev/dev.tsx +544 -329
  126. package/src/dev/get-local-persistence-path.tsx +31 -0
  127. package/src/dev/local.tsx +912 -301
  128. package/src/dev/remote.tsx +591 -230
  129. package/src/dev/start-server.ts +543 -0
  130. package/src/dev/use-esbuild.ts +183 -91
  131. package/src/dev/validate-dev-props.ts +31 -0
  132. package/src/dev-registry.tsx +201 -0
  133. package/src/dev.tsx +949 -0
  134. package/src/dialogs.tsx +132 -99
  135. package/src/dispatch-namespace.ts +207 -0
  136. package/src/docs/index.ts +97 -0
  137. package/src/durable.ts +87 -87
  138. package/src/entry.ts +235 -228
  139. package/src/environment-variables/factory.ts +88 -0
  140. package/src/environment-variables/misc-variables.ts +30 -0
  141. package/src/errors.ts +6 -6
  142. package/src/generate/index.ts +300 -0
  143. package/src/git-client.ts +135 -0
  144. package/src/global-wrangler-config-path.ts +26 -0
  145. package/src/https-options.ts +84 -80
  146. package/src/index.tsx +637 -2850
  147. package/src/init.ts +1025 -0
  148. package/src/inspect.ts +698 -593
  149. package/src/intl-polyfill.d.ts +123 -123
  150. package/src/is-ci.ts +14 -0
  151. package/src/is-interactive.ts +16 -0
  152. package/src/jest.d.ts +4 -0
  153. package/src/kv/helpers.ts +430 -0
  154. package/src/kv/index.ts +596 -0
  155. package/src/logger.ts +64 -45
  156. package/src/metrics/index.ts +5 -0
  157. package/src/metrics/metrics-config.ts +239 -0
  158. package/src/metrics/metrics-dispatcher.ts +96 -0
  159. package/src/metrics/metrics-usage-headers.ts +24 -0
  160. package/src/metrics/send-event.ts +97 -0
  161. package/src/miniflare-cli/assets.ts +250 -0
  162. package/src/miniflare-cli/index.ts +202 -33
  163. package/src/miniflare-cli/request-context.ts +18 -18
  164. package/src/miniflare-cli/tsconfig.json +9 -0
  165. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  166. package/src/miniflare-cli/types.ts +11 -0
  167. package/src/module-collection.ts +221 -212
  168. package/src/open-in-browser.ts +4 -4
  169. package/src/package-manager.ts +173 -128
  170. package/src/pages/build.tsx +270 -0
  171. package/src/pages/constants.ts +18 -0
  172. package/src/pages/deployment-tails.tsx +284 -0
  173. package/src/pages/deployments.tsx +84 -0
  174. package/src/pages/dev.tsx +710 -0
  175. package/src/pages/errors.ts +66 -0
  176. package/src/pages/functions/buildPlugin.ts +107 -0
  177. package/src/pages/functions/buildWorker.ts +166 -0
  178. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  179. package/src/pages/functions/filepath-routing.ts +189 -0
  180. package/src/pages/functions/identifiers.ts +78 -0
  181. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  182. package/src/pages/functions/routes-consolidation.ts +73 -0
  183. package/src/pages/functions/routes-transformation.test.ts +282 -0
  184. package/src/pages/functions/routes-transformation.ts +115 -0
  185. package/src/pages/functions/routes-validation.test.ts +403 -0
  186. package/src/pages/functions/routes-validation.ts +202 -0
  187. package/src/pages/functions/routes.ts +151 -0
  188. package/src/pages/functions/tsconfig.json +8 -0
  189. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  190. package/src/pages/functions.tsx +82 -0
  191. package/src/pages/hash.tsx +13 -0
  192. package/src/pages/index.tsx +102 -0
  193. package/src/pages/projects.tsx +169 -0
  194. package/src/pages/prompt-select-project.tsx +31 -0
  195. package/src/pages/publish.tsx +461 -0
  196. package/src/pages/types.ts +41 -0
  197. package/src/pages/upload.tsx +447 -0
  198. package/src/pages/utils.ts +23 -0
  199. package/src/parse.ts +202 -138
  200. package/src/paths.ts +53 -8
  201. package/src/proxy.ts +623 -405
  202. package/src/publish/index.ts +270 -0
  203. package/src/publish/publish.ts +1036 -0
  204. package/src/pubsub/index.ts +286 -0
  205. package/src/pubsub/pubsub-commands.tsx +624 -0
  206. package/src/queues/cli/commands/consumer/add.ts +71 -0
  207. package/src/queues/cli/commands/consumer/index.ts +22 -0
  208. package/src/queues/cli/commands/consumer/remove.ts +38 -0
  209. package/src/queues/cli/commands/create.ts +25 -0
  210. package/src/queues/cli/commands/delete.ts +26 -0
  211. package/src/queues/cli/commands/index.ts +36 -0
  212. package/src/queues/cli/commands/list.ts +25 -0
  213. package/src/queues/client.ts +135 -0
  214. package/src/queues/utils.ts +18 -0
  215. package/src/r2/constants.ts +4 -0
  216. package/src/r2/helpers.ts +131 -0
  217. package/src/r2/index.ts +289 -0
  218. package/src/routes.ts +140 -0
  219. package/src/secret/index.ts +379 -0
  220. package/src/selfsigned.d.ts +23 -23
  221. package/src/sites.tsx +258 -254
  222. package/src/tail/createTail.ts +379 -0
  223. package/src/tail/filters.ts +108 -110
  224. package/src/tail/index.ts +211 -296
  225. package/src/tail/printing.ts +86 -46
  226. package/src/tsconfig-sanity.ts +16 -0
  227. package/src/type-generation.ts +181 -0
  228. package/src/update-check.ts +11 -11
  229. package/src/user/access.ts +68 -0
  230. package/src/user/auth-variables.ts +113 -0
  231. package/src/user/choose-account.tsx +69 -0
  232. package/src/user/generate-auth-url.ts +33 -0
  233. package/src/user/generate-random-state.ts +16 -0
  234. package/src/user/index.ts +2 -0
  235. package/src/user/user.tsx +1238 -0
  236. package/src/utils/collectKeyValues.ts +14 -0
  237. package/src/whoami.tsx +141 -43
  238. package/src/worker.ts +177 -107
  239. package/src/yargs-types.ts +24 -0
  240. package/src/zones.ts +158 -40
  241. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  242. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  243. package/templates/__tests__/tsconfig.json +8 -0
  244. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  245. package/templates/checked-fetch.js +17 -0
  246. package/templates/d1-beta-facade.js +205 -0
  247. package/templates/facade.d.ts +14 -0
  248. package/templates/first-party-worker-module-facade.ts +19 -0
  249. package/templates/format-dev-errors.ts +33 -0
  250. package/templates/init-tests/test-jest-new-worker.js +23 -0
  251. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  252. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  253. package/templates/middleware/common.ts +62 -0
  254. package/templates/middleware/loader-modules.ts +82 -0
  255. package/templates/middleware/loader-sw.ts +233 -0
  256. package/templates/middleware/middleware-miniflare3-json-error.ts +20 -0
  257. package/templates/middleware/middleware-pretty-error.ts +40 -0
  258. package/templates/middleware/middleware-scheduled.ts +15 -0
  259. package/templates/new-worker-scheduled.js +3 -3
  260. package/templates/new-worker-scheduled.ts +15 -15
  261. package/templates/new-worker.js +3 -3
  262. package/templates/new-worker.ts +15 -15
  263. package/templates/no-op-worker.js +10 -0
  264. package/templates/pages-dev-pipeline.ts +31 -0
  265. package/templates/pages-dev-util.ts +52 -0
  266. package/templates/pages-shim.ts +12 -0
  267. package/templates/pages-template-plugin.ts +171 -0
  268. package/templates/pages-template-worker.ts +189 -0
  269. package/templates/serve-static-assets.ts +65 -0
  270. package/templates/service-bindings-module-facade.js +54 -0
  271. package/templates/service-bindings-sw-facade.js +42 -0
  272. package/templates/tsconfig-sanity.ts +11 -0
  273. package/templates/tsconfig.init.json +106 -0
  274. package/templates/tsconfig.json +6 -103
  275. package/templates/tsconfig.tsbuildinfo +1 -0
  276. package/wrangler-dist/cli.d.ts +906 -0
  277. package/wrangler-dist/cli.js +147920 -108883
  278. package/pages/functions/buildPlugin.ts +0 -105
  279. package/pages/functions/buildWorker.ts +0 -151
  280. package/pages/functions/filepath-routing.ts +0 -189
  281. package/pages/functions/identifiers.ts +0 -78
  282. package/pages/functions/routes.ts +0 -156
  283. package/pages/functions/template-plugin.ts +0 -147
  284. package/pages/functions/template-worker.ts +0 -143
  285. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  286. package/src/environment-variables.ts +0 -35
  287. package/src/generate-auth-url.ts +0 -33
  288. package/src/generate-random-state.ts +0 -16
  289. package/src/kv.ts +0 -408
  290. package/src/miniflare-cli/enum-keys.ts +0 -17
  291. package/src/pages.tsx +0 -2093
  292. package/src/publish.ts +0 -726
  293. package/src/r2.ts +0 -50
  294. package/src/user.tsx +0 -1202
  295. package/templates/static-asset-facade.js +0 -43
@@ -1,139 +1,278 @@
1
1
  import { render } from "ink-testing-library";
2
+ import { rest } from "msw";
2
3
  import React from "react";
3
4
  import { writeAuthConfigFile } from "../user";
4
5
  import { getUserInfo, WhoAmI } from "../whoami";
5
- import { setMockResponse } from "./helpers/mock-cfetch";
6
6
  import { mockConsoleMethods } from "./helpers/mock-console";
7
7
  import { useMockIsTTY } from "./helpers/mock-istty";
8
+ import {
9
+ msw,
10
+ mswSuccessOauthHandlers,
11
+ mswSuccessUserHandlers,
12
+ } from "./helpers/msw";
8
13
  import { runInTempDir } from "./helpers/run-in-tmp";
9
14
  import type { UserInfo } from "../whoami";
10
15
 
11
16
  describe("getUserInfo()", () => {
12
- const ENV_COPY = process.env;
13
-
14
- runInTempDir({ homedir: "./home" });
15
- const std = mockConsoleMethods();
16
- const { setIsTTY } = useMockIsTTY();
17
-
18
- beforeEach(() => {
19
- setIsTTY(true);
20
- });
21
-
22
- afterEach(() => {
23
- process.env = ENV_COPY;
24
- });
25
-
26
- it("should return undefined if there is no config file", async () => {
27
- const userInfo = await getUserInfo();
28
- expect(userInfo).toBeUndefined();
29
- });
30
-
31
- it("should return undefined if there is an empty config file", async () => {
32
- writeAuthConfigFile({});
33
- const userInfo = await getUserInfo();
34
- expect(userInfo).toBeUndefined();
35
- });
36
-
37
- it("should say it's using an API token when one is set", async () => {
38
- process.env = {
39
- CLOUDFLARE_API_TOKEN: "123456789",
40
- };
41
- setMockResponse("/user", () => {
42
- return { email: "user@example.com" };
43
- });
44
- setMockResponse("/accounts", () => {
45
- return [
46
- { name: "Account One", id: "account-1" },
47
- { name: "Account Two", id: "account-2" },
48
- { name: "Account Three", id: "account-3" },
49
- ];
50
- });
51
-
52
- const userInfo = await getUserInfo();
53
- expect(userInfo).toEqual({
54
- authType: "API",
55
- apiToken: "123456789",
56
- email: "user@example.com",
57
- accounts: [
58
- { name: "Account One", id: "account-1" },
59
- { name: "Account Two", id: "account-2" },
60
- { name: "Account Three", id: "account-3" },
61
- ],
62
- });
63
- });
64
-
65
- it("should return the user's email and accounts if authenticated via config token", async () => {
66
- writeAuthConfigFile({ oauth_token: "some-oauth-token" });
67
-
68
- setMockResponse("/user", () => {
69
- return { email: "user@example.com" };
70
- });
71
- setMockResponse("/accounts", () => {
72
- return [
73
- { name: "Account One", id: "account-1" },
74
- { name: "Account Two", id: "account-2" },
75
- { name: "Account Three", id: "account-3" },
76
- ];
77
- });
78
-
79
- const userInfo = await getUserInfo();
80
-
81
- expect(userInfo).toEqual({
82
- authType: "OAuth",
83
- apiToken: "some-oauth-token",
84
- email: "user@example.com",
85
- accounts: [
86
- { name: "Account One", id: "account-1" },
87
- { name: "Account Two", id: "account-2" },
88
- { name: "Account Three", id: "account-3" },
89
- ],
90
- });
91
- });
92
-
93
- it("should display a warning message if the config file contains a legacy api_token field", async () => {
94
- writeAuthConfigFile({ api_token: "API_TOKEN" });
95
- await getUserInfo();
96
- expect(std.warn).toMatchInlineSnapshot(`
97
- "â–² [WARNING] It looks like you have used Wrangler 1's \`config\` command to login with an API token.
98
-
99
- This is no longer supported in the current version of Wrangler.
100
- If you wish to authenticate via an API token then please set the \`CLOUDFLARE_API_TOKEN\`
101
- environment variable.
102
-
103
- "
104
- `);
105
- });
17
+ const ENV_COPY = process.env;
18
+
19
+ runInTempDir();
20
+ const std = mockConsoleMethods();
21
+ const { setIsTTY } = useMockIsTTY();
22
+
23
+ beforeEach(() => {
24
+ msw.use(...mswSuccessOauthHandlers, ...mswSuccessUserHandlers);
25
+ setIsTTY(true);
26
+ });
27
+
28
+ afterEach(() => {
29
+ process.env = ENV_COPY;
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
+ msw.use(
48
+ rest.get("*/user", (_, res, ctx) => {
49
+ return res.once(
50
+ ctx.status(200),
51
+ ctx.json({
52
+ success: false,
53
+ errors: [
54
+ {
55
+ code: 9109,
56
+ message: "Uauthorized to access requested resource",
57
+ },
58
+ ],
59
+ messages: [],
60
+ result: {},
61
+ })
62
+ );
63
+ }),
64
+ rest.get("*/accounts", (request, res, ctx) => {
65
+ const headersObject = request.headers.all();
66
+ delete headersObject["user-agent"];
67
+
68
+ expect(headersObject).toMatchInlineSnapshot(`
69
+ Object {
70
+ "accept": "*/*",
71
+ "accept-encoding": "gzip,deflate",
72
+ "authorization": "Bearer 123456789",
73
+ "connection": "close",
74
+ "host": "api.cloudflare.com",
75
+ }
76
+ `);
77
+ return res.once(
78
+ ctx.status(200),
79
+ ctx.json({
80
+ success: true,
81
+ errors: [],
82
+ messages: [],
83
+ result: [],
84
+ })
85
+ );
86
+ })
87
+ );
88
+ const userInfo = await getUserInfo();
89
+ expect(userInfo?.email).toBeUndefined();
90
+ });
91
+ it("should say it's using an API token when one is set", async () => {
92
+ process.env = {
93
+ CLOUDFLARE_API_TOKEN: "123456789",
94
+ };
95
+
96
+ const userInfo = await getUserInfo();
97
+ expect(userInfo).toEqual({
98
+ authType: "API Token",
99
+ apiToken: "123456789",
100
+ email: "user@example.com",
101
+ accounts: [
102
+ { name: "Account One", id: "account-1" },
103
+ { name: "Account Two", id: "account-2" },
104
+ { name: "Account Three", id: "account-3" },
105
+ ],
106
+ });
107
+ });
108
+
109
+ it("should say it's using a Global API Key when one is set", async () => {
110
+ process.env = {
111
+ CLOUDFLARE_API_KEY: "123456789",
112
+ CLOUDFLARE_EMAIL: "user@example.com",
113
+ };
114
+
115
+ const userInfo = await getUserInfo();
116
+ expect(userInfo).toEqual({
117
+ authType: "Global API Key",
118
+ apiToken: "123456789",
119
+ email: "user@example.com",
120
+ accounts: [
121
+ { name: "Account One", id: "account-1" },
122
+ { name: "Account Two", id: "account-2" },
123
+ { name: "Account Three", id: "account-3" },
124
+ ],
125
+ });
126
+ });
127
+
128
+ it("should use a Global API Key in preference to an API token", async () => {
129
+ process.env = {
130
+ CLOUDFLARE_API_KEY: "123456789",
131
+ CLOUDFLARE_EMAIL: "user@example.com",
132
+ CLOUDFLARE_API_TOKEN: "123456789",
133
+ };
134
+
135
+ const userInfo = await getUserInfo();
136
+ expect(userInfo).toEqual({
137
+ authType: "Global API Key",
138
+ apiToken: "123456789",
139
+ email: "user@example.com",
140
+ accounts: [
141
+ { name: "Account One", id: "account-1" },
142
+ { name: "Account Two", id: "account-2" },
143
+ { name: "Account Three", id: "account-3" },
144
+ ],
145
+ });
146
+ });
147
+
148
+ it("should return undefined only a Global API Key, but not Email, is set", async () => {
149
+ process.env = {
150
+ CLOUDFLARE_API_KEY: "123456789",
151
+ };
152
+ const userInfo = await getUserInfo();
153
+ expect(userInfo).toEqual(undefined);
154
+ });
155
+
156
+ it("should return the user's email and accounts if authenticated via config token", async () => {
157
+ writeAuthConfigFile({ oauth_token: "some-oauth-token" });
158
+ const userInfo = await getUserInfo();
159
+
160
+ expect(userInfo).toEqual({
161
+ authType: "OAuth Token",
162
+ apiToken: "some-oauth-token",
163
+ email: "user@example.com",
164
+ accounts: [
165
+ { name: "Account One", id: "account-1" },
166
+ { name: "Account Two", id: "account-2" },
167
+ { name: "Account Three", id: "account-3" },
168
+ ],
169
+ });
170
+ });
171
+
172
+ it("should display a warning message if the config file contains a legacy api_token field", async () => {
173
+ writeAuthConfigFile({ api_token: "API_TOKEN" });
174
+ await getUserInfo();
175
+
176
+ expect(std.warn).toMatchInlineSnapshot(`
177
+ "â–² [WARNING] It looks like you have used Wrangler 1's \`config\` command to login with an API token.
178
+
179
+ This is no longer supported in the current version of Wrangler.
180
+ If you wish to authenticate via an API token then please set the \`CLOUDFLARE_API_TOKEN\`
181
+ environment variable.
182
+
183
+ "
184
+ `);
185
+ });
106
186
  });
107
187
 
108
188
  describe("WhoAmI component", () => {
109
- it("should return undefined if there is no user", async () => {
110
- const { lastFrame } = render(<WhoAmI user={undefined}></WhoAmI>);
111
-
112
- expect(lastFrame()).toMatchInlineSnapshot(
113
- `"You are not authenticated. Please run \`wrangler login\`."`
114
- );
115
- });
116
-
117
- it("should display the user's email and accounts", async () => {
118
- const user: UserInfo = {
119
- authType: "OAuth",
120
- apiToken: "some-oauth-token",
121
- email: "user@example.com",
122
- accounts: [
123
- { name: "Account One", id: "account-1" },
124
- { name: "Account Two", id: "account-2" },
125
- { name: "Account Three", id: "account-3" },
126
- ],
127
- };
128
-
129
- const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
130
-
131
- expect(lastFrame()).toContain(
132
- "You are logged in with an OAuth Token, associated with the email 'user@example.com'!"
133
- );
134
- expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
135
- expect(lastFrame()).toMatch(/Account One .+ account-1/);
136
- expect(lastFrame()).toMatch(/Account Two .+ account-2/);
137
- expect(lastFrame()).toMatch(/Account Three .+ account-3/);
138
- });
189
+ it("should return undefined if there is no user", async () => {
190
+ const { lastFrame } = render(<WhoAmI user={undefined}></WhoAmI>);
191
+
192
+ expect(lastFrame()).toMatchInlineSnapshot(
193
+ `"You are not authenticated. Please run \`wrangler login\`."`
194
+ );
195
+ });
196
+
197
+ it("should display the user's email, accounts and OAuth scopes", async () => {
198
+ const user: UserInfo = {
199
+ authType: "OAuth Token",
200
+ apiToken: "some-oauth-token",
201
+ email: "user@example.com",
202
+ tokenPermissions: ["scope1:read", "scope2:write", "scope3"],
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
+ expect(lastFrame()).toContain(
220
+ "Token Permissions: If scopes are missing, you may need to logout and re-login."
221
+ );
222
+ expect(lastFrame()).toContain("- scope1 (read)");
223
+ expect(lastFrame()).toContain("- scope2 (write)");
224
+ expect(lastFrame()).toContain("- scope3");
225
+ });
226
+
227
+ // For the case where the cache hasn't updated to include the scopes array
228
+ it("should display the user's email and accounts, but no OAuth scopes if none provided", async () => {
229
+ const user: UserInfo = {
230
+ authType: "OAuth Token",
231
+ apiToken: "some-oauth-token",
232
+ email: "user@example.com",
233
+ tokenPermissions: undefined,
234
+ accounts: [
235
+ { name: "Account One", id: "account-1" },
236
+ { name: "Account Two", id: "account-2" },
237
+ { name: "Account Three", id: "account-3" },
238
+ ],
239
+ };
240
+
241
+ const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
242
+
243
+ expect(lastFrame()).toContain(
244
+ "You are logged in with an OAuth Token, associated with the email 'user@example.com'!"
245
+ );
246
+ expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
247
+ expect(lastFrame()).toMatch(/Account One .+ account-1/);
248
+ expect(lastFrame()).toMatch(/Account Two .+ account-2/);
249
+ expect(lastFrame()).toMatch(/Account Three .+ account-3/);
250
+ });
251
+
252
+ it("should display the user's email, accounts and link to view token permissions for non-OAuth tokens", async () => {
253
+ const user: UserInfo = {
254
+ authType: "API Token",
255
+ apiToken: "some-api-token",
256
+ email: "user@example.com",
257
+ tokenPermissions: undefined,
258
+ accounts: [
259
+ { name: "Account One", id: "account-1" },
260
+ { name: "Account Two", id: "account-2" },
261
+ { name: "Account Three", id: "account-3" },
262
+ ],
263
+ };
264
+
265
+ const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
266
+
267
+ expect(lastFrame()).toContain(
268
+ "You are logged in with an API Token, associated with the email 'user@example.com'!"
269
+ );
270
+ expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
271
+ expect(lastFrame()).toMatch(/Account One .+ account-1/);
272
+ expect(lastFrame()).toMatch(/Account Two .+ account-2/);
273
+ expect(lastFrame()).toMatch(/Account Three .+ account-3/);
274
+ expect(lastFrame()).toContain(
275
+ "To see token permissions visit https://dash.cloudflare.com/profile/api-tokens"
276
+ );
277
+ });
139
278
  });