wrangler 0.0.0-e8e684c7 → 0.0.0-e9106dfa5

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 (207) hide show
  1. package/README.md +35 -49
  2. package/bin/wrangler.js +25 -100
  3. package/config-schema.json +2277 -0
  4. package/package.json +182 -174
  5. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  6. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  7. package/templates/__tests__/tsconfig.json +8 -0
  8. package/templates/checked-fetch.js +19 -6
  9. package/templates/facade.d.ts +19 -0
  10. package/templates/gitignore +2 -3
  11. package/templates/init-tests/test-jest-new-worker.js +23 -0
  12. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  13. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  14. package/templates/middleware/common.ts +67 -0
  15. package/templates/middleware/loader-modules.ts +134 -0
  16. package/templates/middleware/loader-sw.ts +229 -0
  17. package/templates/middleware/middleware-ensure-req-body-drained.ts +18 -0
  18. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  19. package/templates/middleware/middleware-mock-analytics-engine.d.ts +3 -0
  20. package/templates/middleware/middleware-mock-analytics-engine.ts +30 -0
  21. package/templates/middleware/middleware-patch-console-prefix.d.ts +3 -0
  22. package/templates/middleware/middleware-patch-console-prefix.ts +21 -0
  23. package/templates/middleware/middleware-pretty-error.ts +40 -0
  24. package/templates/middleware/middleware-scheduled.ts +29 -0
  25. package/templates/modules-watch-stub.js +4 -0
  26. package/templates/new-worker-scheduled.ts +1 -1
  27. package/templates/new-worker.js +1 -1
  28. package/templates/new-worker.ts +4 -1
  29. package/templates/pages-dev-pipeline.ts +33 -0
  30. package/templates/pages-dev-util.ts +55 -0
  31. package/templates/pages-shim.ts +1 -1
  32. package/templates/pages-template-plugin.ts +37 -14
  33. package/templates/pages-template-worker.ts +33 -7
  34. package/templates/startDevWorker/InspectorProxyWorker.ts +679 -0
  35. package/templates/startDevWorker/ProxyWorker.ts +336 -0
  36. package/templates/tsconfig-sanity.ts +11 -0
  37. package/templates/tsconfig.init.json +22 -0
  38. package/templates/tsconfig.json +12 -102
  39. package/templates/tsconfig.tsbuildinfo +1 -0
  40. package/wrangler-dist/InspectorProxyWorker.js +471 -0
  41. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  42. package/wrangler-dist/ProxyWorker.js +238 -0
  43. package/wrangler-dist/ProxyWorker.js.map +6 -0
  44. package/wrangler-dist/cli.d.ts +26527 -172
  45. package/wrangler-dist/cli.js +148646 -148093
  46. package/Cloudflare_CA.pem +0 -18
  47. package/import_meta_url.js +0 -3
  48. package/miniflare-config-stubs/.env.empty +0 -0
  49. package/miniflare-config-stubs/package.empty.json +0 -1
  50. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  51. package/miniflare-dist/index.mjs +0 -5542
  52. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  53. package/src/__tests__/config-cache.test.ts +0 -42
  54. package/src/__tests__/configuration.test.ts +0 -4026
  55. package/src/__tests__/dev.test.tsx +0 -1318
  56. package/src/__tests__/generate.test.ts +0 -91
  57. package/src/__tests__/guess-worker-format.test.ts +0 -85
  58. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  59. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  60. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  61. package/src/__tests__/helpers/mock-bin.ts +0 -36
  62. package/src/__tests__/helpers/mock-cfetch.ts +0 -296
  63. package/src/__tests__/helpers/mock-console.ts +0 -97
  64. package/src/__tests__/helpers/mock-dialogs.ts +0 -153
  65. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -8
  66. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  67. package/src/__tests__/helpers/mock-istty.ts +0 -74
  68. package/src/__tests__/helpers/mock-known-routes.ts +0 -7
  69. package/src/__tests__/helpers/mock-kv.ts +0 -33
  70. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -250
  71. package/src/__tests__/helpers/mock-process.ts +0 -39
  72. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  73. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  74. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  75. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  76. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  77. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  78. package/src/__tests__/https-options.test.ts +0 -163
  79. package/src/__tests__/index.test.ts +0 -245
  80. package/src/__tests__/init.test.ts +0 -2170
  81. package/src/__tests__/jest.setup.ts +0 -157
  82. package/src/__tests__/kv.test.ts +0 -1671
  83. package/src/__tests__/logger.test.ts +0 -141
  84. package/src/__tests__/metrics.test.ts +0 -450
  85. package/src/__tests__/package-manager.test.ts +0 -353
  86. package/src/__tests__/pages.test.ts +0 -1275
  87. package/src/__tests__/parse.test.ts +0 -330
  88. package/src/__tests__/publish.test.ts +0 -6955
  89. package/src/__tests__/pubsub.test.ts +0 -367
  90. package/src/__tests__/r2.test.ts +0 -336
  91. package/src/__tests__/route.test.ts +0 -45
  92. package/src/__tests__/secret.test.ts +0 -492
  93. package/src/__tests__/tail.test.ts +0 -802
  94. package/src/__tests__/test-old-node-version.js +0 -31
  95. package/src/__tests__/user.test.ts +0 -155
  96. package/src/__tests__/validate-dev-props.test.ts +0 -56
  97. package/src/__tests__/version.test.ts +0 -35
  98. package/src/__tests__/whoami.test.tsx +0 -289
  99. package/src/__tests__/worker-namespace.test.ts +0 -329
  100. package/src/abort.d.ts +0 -3
  101. package/src/api/dev.ts +0 -93
  102. package/src/api/index.ts +0 -1
  103. package/src/bundle-reporter.tsx +0 -29
  104. package/src/bundle.ts +0 -473
  105. package/src/cfetch/index.ts +0 -121
  106. package/src/cfetch/internal.ts +0 -298
  107. package/src/cli.ts +0 -27
  108. package/src/config/README.md +0 -107
  109. package/src/config/config.ts +0 -263
  110. package/src/config/diagnostics.ts +0 -80
  111. package/src/config/environment.ts +0 -485
  112. package/src/config/index.ts +0 -251
  113. package/src/config/validation-helpers.ts +0 -597
  114. package/src/config/validation.ts +0 -1862
  115. package/src/config-cache.ts +0 -85
  116. package/src/create-worker-preview.ts +0 -257
  117. package/src/create-worker-upload-form.ts +0 -291
  118. package/src/dev/dev-vars.ts +0 -36
  119. package/src/dev/dev.tsx +0 -545
  120. package/src/dev/local.tsx +0 -449
  121. package/src/dev/remote.tsx +0 -422
  122. package/src/dev/use-esbuild.ts +0 -178
  123. package/src/dev/validate-dev-props.ts +0 -31
  124. package/src/dev-registry.tsx +0 -160
  125. package/src/dev.tsx +0 -696
  126. package/src/dialogs.tsx +0 -135
  127. package/src/dispatch-namespace.ts +0 -206
  128. package/src/durable.ts +0 -102
  129. package/src/entry.ts +0 -328
  130. package/src/environment-variables.ts +0 -35
  131. package/src/errors.ts +0 -11
  132. package/src/faye-websocket.d.ts +0 -6
  133. package/src/generate.ts +0 -131
  134. package/src/git-client.ts +0 -42
  135. package/src/global-wrangler-config-path.ts +0 -26
  136. package/src/https-options.ts +0 -127
  137. package/src/index.tsx +0 -2260
  138. package/src/init.ts +0 -622
  139. package/src/inspect.ts +0 -747
  140. package/src/intl-polyfill.d.ts +0 -139
  141. package/src/is-ci.ts +0 -14
  142. package/src/is-interactive.ts +0 -12
  143. package/src/kv.ts +0 -430
  144. package/src/logger.ts +0 -73
  145. package/src/metrics/index.ts +0 -5
  146. package/src/metrics/metrics-config.ts +0 -239
  147. package/src/metrics/metrics-dispatcher.ts +0 -96
  148. package/src/metrics/metrics-usage-headers.ts +0 -24
  149. package/src/metrics/send-event.ts +0 -92
  150. package/src/miniflare-cli/README.md +0 -30
  151. package/src/miniflare-cli/assets.ts +0 -554
  152. package/src/miniflare-cli/enum-keys.ts +0 -17
  153. package/src/miniflare-cli/index.ts +0 -207
  154. package/src/miniflare-cli/request-context.ts +0 -40
  155. package/src/module-collection.ts +0 -258
  156. package/src/open-in-browser.ts +0 -17
  157. package/src/package-manager.ts +0 -219
  158. package/src/pages/build.tsx +0 -238
  159. package/src/pages/constants.ts +0 -12
  160. package/src/pages/deployments.tsx +0 -106
  161. package/src/pages/dev.tsx +0 -528
  162. package/src/pages/errors.ts +0 -22
  163. package/src/pages/functions/buildPlugin.ts +0 -109
  164. package/src/pages/functions/buildWorker.ts +0 -155
  165. package/src/pages/functions/filepath-routing.test.ts +0 -234
  166. package/src/pages/functions/filepath-routing.ts +0 -189
  167. package/src/pages/functions/identifiers.ts +0 -78
  168. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  169. package/src/pages/functions/routes-consolidation.ts +0 -73
  170. package/src/pages/functions/routes-transformation.test.ts +0 -271
  171. package/src/pages/functions/routes-transformation.ts +0 -122
  172. package/src/pages/functions/routes.ts +0 -151
  173. package/src/pages/functions.tsx +0 -96
  174. package/src/pages/index.tsx +0 -94
  175. package/src/pages/projects.tsx +0 -169
  176. package/src/pages/publish.tsx +0 -391
  177. package/src/pages/types.ts +0 -49
  178. package/src/pages/upload.tsx +0 -413
  179. package/src/pages/utils.ts +0 -12
  180. package/src/parse.ts +0 -286
  181. package/src/paths.ts +0 -26
  182. package/src/preview.ts +0 -31
  183. package/src/proxy.ts +0 -486
  184. package/src/publish.ts +0 -822
  185. package/src/pubsub/index.ts +0 -286
  186. package/src/pubsub/pubsub-commands.tsx +0 -623
  187. package/src/r2.ts +0 -131
  188. package/src/selfsigned.d.ts +0 -29
  189. package/src/sites.tsx +0 -372
  190. package/src/tail/filters.ts +0 -281
  191. package/src/tail/index.ts +0 -312
  192. package/src/tail/printing.ts +0 -107
  193. package/src/update-check.ts +0 -19
  194. package/src/user/choose-account.tsx +0 -69
  195. package/src/user/env-vars.ts +0 -46
  196. package/src/user/generate-auth-url.ts +0 -33
  197. package/src/user/generate-random-state.ts +0 -16
  198. package/src/user/index.ts +0 -3
  199. package/src/user/user.tsx +0 -1191
  200. package/src/whoami.tsx +0 -169
  201. package/src/worker.ts +0 -204
  202. package/src/zones.ts +0 -167
  203. package/templates/first-party-worker-module-facade.ts +0 -18
  204. package/templates/format-dev-errors.ts +0 -32
  205. package/templates/serve-static-assets.ts +0 -63
  206. package/templates/service-bindings-module-facade.js +0 -54
  207. package/templates/service-bindings-sw-facade.js +0 -42
@@ -1,31 +0,0 @@
1
- // this test has to be run with a version of node.js older than 16.13 to pass
2
-
3
- const { spawn } = require("child_process");
4
- const path = require("path");
5
-
6
- const assert = require("assert");
7
-
8
- const wranglerProcess = spawn(
9
- "node",
10
- [path.join(__dirname, "../../bin/wrangler.js")],
11
- { stdio: "pipe" }
12
- );
13
-
14
- const messageToMatch = "Wrangler requires at least node.js v16.13.0";
15
-
16
- wranglerProcess.once("exit", (code) => {
17
- try {
18
- const errorMessage = wranglerProcess.stderr.read().toString();
19
-
20
- assert(code === 1, "Expected exit code 1");
21
- assert(
22
- errorMessage.includes(messageToMatch),
23
- `Expected error message to include "${messageToMatch}"`
24
- );
25
- } catch (err) {
26
- console.error("Error:", err);
27
- throw new Error(
28
- "This test has to be run with a version of node.js under 16.13 to pass"
29
- );
30
- }
31
- });
@@ -1,155 +0,0 @@
1
- import fs from "node:fs";
2
- import path from "node:path";
3
- import fetchMock from "jest-fetch-mock";
4
- import { getGlobalWranglerConfigPath } from "../global-wrangler-config-path";
5
- import { CI } from "../is-ci";
6
- import {
7
- loginOrRefreshIfRequired,
8
- readAuthConfigFile,
9
- requireAuth,
10
- USER_AUTH_CONFIG_FILE,
11
- writeAuthConfigFile,
12
- } from "../user";
13
- import { mockConsoleMethods } from "./helpers/mock-console";
14
- import { useMockIsTTY } from "./helpers/mock-istty";
15
- import { mockOAuthFlow } from "./helpers/mock-oauth-flow";
16
- import { runInTempDir } from "./helpers/run-in-tmp";
17
- import { runWrangler } from "./helpers/run-wrangler";
18
- import type { Config } from "../config";
19
- import type { UserAuthConfig } from "../user";
20
-
21
- describe("User", () => {
22
- let isCISpy: jest.SpyInstance;
23
- runInTempDir();
24
- const std = mockConsoleMethods();
25
- const {
26
- mockOAuthServerCallback,
27
- mockGrantAccessToken,
28
- mockGrantAuthorization,
29
- mockRevokeAuthorization,
30
- mockExchangeRefreshTokenForAccessToken,
31
- } = mockOAuthFlow();
32
-
33
- const { setIsTTY } = useMockIsTTY();
34
-
35
- beforeEach(() => {
36
- isCISpy = jest.spyOn(CI, "isCI").mockReturnValue(false);
37
- });
38
-
39
- describe("login", () => {
40
- it("should login a user when `wrangler login` is run", async () => {
41
- mockOAuthServerCallback();
42
- const accessTokenRequest = mockGrantAccessToken({ respondWith: "ok" });
43
- mockGrantAuthorization({ respondWith: "success" });
44
-
45
- await runWrangler("login");
46
-
47
- expect(accessTokenRequest.actual.url).toEqual(
48
- accessTokenRequest.expected.url
49
- );
50
- expect(accessTokenRequest.actual.method).toEqual(
51
- accessTokenRequest.expected.method
52
- );
53
-
54
- expect(std.out).toMatchInlineSnapshot(`
55
- "Attempting to login via OAuth...
56
- 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
57
- Successfully logged in."
58
- `);
59
-
60
- expect(readAuthConfigFile()).toEqual<UserAuthConfig>({
61
- api_token: undefined,
62
- oauth_token: "test-access-token",
63
- refresh_token: "test-refresh-token",
64
- expiration_time: expect.any(String),
65
- scopes: ["account:read"],
66
- });
67
- });
68
- });
69
-
70
- describe("logout", () => {
71
- it("should exit with a message stating the user is not logged in", async () => {
72
- await runWrangler("logout");
73
- expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
74
- });
75
-
76
- it("should logout user that has been properly logged in", async () => {
77
- writeAuthConfigFile({
78
- oauth_token: "some-oauth-tok",
79
- refresh_token: "some-refresh-tok",
80
- });
81
- const outcome = mockRevokeAuthorization();
82
-
83
- await runWrangler("logout");
84
-
85
- expect(outcome.actual.url).toEqual(
86
- "https://dash.cloudflare.com/oauth2/revoke"
87
- );
88
- expect(outcome.actual.method).toEqual("POST");
89
-
90
- expect(std.out).toMatchInlineSnapshot(`"Successfully logged out."`);
91
-
92
- // Make sure that we made the request to logout.
93
- expect(fetchMock).toHaveBeenCalledTimes(1);
94
-
95
- // Make sure that logout removed the config file containing the auth tokens.
96
- const config = path.join(
97
- getGlobalWranglerConfigPath(),
98
- USER_AUTH_CONFIG_FILE
99
- );
100
- expect(fs.existsSync(config)).toBeFalsy();
101
- });
102
- });
103
-
104
- // TODO: Improve OAuth mocking to handle `/token` endpoints from different calls
105
- it("should handle errors for failed token refresh", async () => {
106
- setIsTTY(false);
107
- writeAuthConfigFile({
108
- oauth_token: "hunter2",
109
- refresh_token: "Order 66",
110
- });
111
- mockExchangeRefreshTokenForAccessToken({
112
- respondWith: "badResponse",
113
- });
114
-
115
- // Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
116
- await expect(
117
- requireAuth({} as Config)
118
- ).rejects.toThrowErrorMatchingInlineSnapshot(
119
- `"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."`
120
- );
121
- });
122
-
123
- it("should confirm no error message when refresh is successful", async () => {
124
- setIsTTY(false);
125
- mockOAuthServerCallback();
126
- writeAuthConfigFile({
127
- oauth_token: "hunter2",
128
- refresh_token: "Order 66",
129
- });
130
- mockGrantAuthorization({ respondWith: "success" });
131
-
132
- mockExchangeRefreshTokenForAccessToken({
133
- respondWith: "refreshSuccess",
134
- });
135
-
136
- // Handles the requireAuth error throw from failed login that is unhandled due to directly calling it here
137
- await expect(requireAuth({} as Config)).rejects.toThrowError();
138
- expect(std.err).toContain("");
139
- });
140
-
141
- it("should revert to non-interactive mode if in CI", async () => {
142
- isCISpy.mockReturnValue(true);
143
- await expect(loginOrRefreshIfRequired()).resolves.toEqual(false);
144
- });
145
-
146
- it("should revert to non-interactive mode if isTTY throws an error", async () => {
147
- setIsTTY({
148
- stdin() {
149
- throw new Error("stdin is not tty");
150
- },
151
- stdout: true,
152
- });
153
- await expect(loginOrRefreshIfRequired()).resolves.toEqual(false);
154
- });
155
- });
@@ -1,56 +0,0 @@
1
- import { validateDevProps } from "../dev/validate-dev-props";
2
- import type { DevProps } from "../dev/dev";
3
-
4
- describe("validateDevProps", () => {
5
- it("should throw if the user tries to use the service-worker format with an `assets` directory", () => {
6
- const props = {
7
- isWorkersSite: false,
8
- assetPaths: ["assets"],
9
- entry: { format: "service-worker" },
10
- bindings: {},
11
- };
12
-
13
- expect(() => validateDevProps(props as unknown as DevProps)).toThrowError(
14
- "You cannot use the service-worker format with an `assets` directory yet. For information on how to migrate to the module-worker format, see: https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"
15
- );
16
- });
17
-
18
- it("should throw if the user tries to configure [wasm_modules] with an ES module worker", () => {
19
- const props = {
20
- isWorkersSite: false,
21
- assetPaths: [],
22
- entry: { format: "modules" },
23
- bindings: { wasm_modules: true },
24
- };
25
-
26
- expect(() => validateDevProps(props as unknown as DevProps)).toThrowError(
27
- "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code"
28
- );
29
- });
30
-
31
- it("should throw if the user tries to configure [text_blobs] with an ES module worker", () => {
32
- const props = {
33
- isWorkersSite: false,
34
- assetPaths: [],
35
- entry: { format: "modules" },
36
- bindings: { text_blobs: true },
37
- };
38
-
39
- expect(() => validateDevProps(props as unknown as DevProps)).toThrowError(
40
- "You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml"
41
- );
42
- });
43
-
44
- it("should throw if the user tries to configure [data_blobs] with an ES module worker", () => {
45
- const props = {
46
- isWorkersSite: false,
47
- assetPaths: [],
48
- entry: { format: "modules" },
49
- bindings: { data_blobs: true },
50
- };
51
-
52
- expect(() => validateDevProps(props as unknown as DevProps)).toThrowError(
53
- "You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml"
54
- );
55
- });
56
- });
@@ -1,35 +0,0 @@
1
- import { version } from "./../../package.json";
2
- import { mockConsoleMethods } from "./helpers/mock-console";
3
- import { useMockIsTTY } from "./helpers/mock-istty";
4
- import { runWrangler } from "./helpers/run-wrangler";
5
-
6
- describe("version", () => {
7
- const std = mockConsoleMethods();
8
- const { setIsTTY } = useMockIsTTY();
9
-
10
- // We cannot test output of version banner,
11
- // as it is disabled in jest environments
12
-
13
- // it("should output version banner", async () => {
14
- // await runWrangler("-v");
15
- // expect(std.out).toMatchInlineSnapshot(`
16
- // " ⛅️ wrangler 2.0.22
17
- // --------------------"
18
- // `);
19
- // });
20
-
21
- it("should output current version if !isTTY calling -v", async () => {
22
- setIsTTY(false);
23
-
24
- await runWrangler("-v");
25
- expect(std.out).toMatch(version);
26
- });
27
-
28
- // This run separately as command handling is different
29
- it("should output current version if !isTTY calling --version", async () => {
30
- setIsTTY(false);
31
-
32
- await runWrangler("--version");
33
- expect(std.out).toMatch(version);
34
- });
35
- });
@@ -1,289 +0,0 @@
1
- import { render } from "ink-testing-library";
2
- import React from "react";
3
- import { writeAuthConfigFile } from "../user";
4
- import { getUserInfo, WhoAmI } from "../whoami";
5
- import {
6
- createFetchResult,
7
- setMockRawResponse,
8
- setMockResponse,
9
- unsetAllMocks,
10
- } from "./helpers/mock-cfetch";
11
- import { mockConsoleMethods } from "./helpers/mock-console";
12
- import { useMockIsTTY } from "./helpers/mock-istty";
13
- import { runInTempDir } from "./helpers/run-in-tmp";
14
- import type { UserInfo } from "../whoami";
15
-
16
- describe("getUserInfo()", () => {
17
- const ENV_COPY = process.env;
18
-
19
- runInTempDir();
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
- setMockResponse("/user", () => {
177
- return { email: "user@example.com" };
178
- });
179
- setMockResponse("/accounts", () => {
180
- return [
181
- { name: "Account One", id: "account-1" },
182
- { name: "Account Two", id: "account-2" },
183
- { name: "Account Three", id: "account-3" },
184
- ];
185
- });
186
- await getUserInfo();
187
- expect(std.warn).toMatchInlineSnapshot(`
188
- "▲ [WARNING] It looks like you have used Wrangler 1's \`config\` command to login with an API token.
189
-
190
- This is no longer supported in the current version of Wrangler.
191
- If you wish to authenticate via an API token then please set the \`CLOUDFLARE_API_TOKEN\`
192
- environment variable.
193
-
194
- "
195
- `);
196
- });
197
- });
198
-
199
- describe("WhoAmI component", () => {
200
- it("should return undefined if there is no user", async () => {
201
- const { lastFrame } = render(<WhoAmI user={undefined}></WhoAmI>);
202
-
203
- expect(lastFrame()).toMatchInlineSnapshot(
204
- `"You are not authenticated. Please run \`wrangler login\`."`
205
- );
206
- });
207
-
208
- it("should display the user's email, accounts and OAuth scopes", async () => {
209
- const user: UserInfo = {
210
- authType: "OAuth Token",
211
- apiToken: "some-oauth-token",
212
- email: "user@example.com",
213
- tokenPermissions: ["scope1:read", "scope2:write", "scope3"],
214
- accounts: [
215
- { name: "Account One", id: "account-1" },
216
- { name: "Account Two", id: "account-2" },
217
- { name: "Account Three", id: "account-3" },
218
- ],
219
- };
220
-
221
- const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
222
-
223
- expect(lastFrame()).toContain(
224
- "You are logged in with an OAuth Token, associated with the email 'user@example.com'!"
225
- );
226
- expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
227
- expect(lastFrame()).toMatch(/Account One .+ account-1/);
228
- expect(lastFrame()).toMatch(/Account Two .+ account-2/);
229
- expect(lastFrame()).toMatch(/Account Three .+ account-3/);
230
- expect(lastFrame()).toContain(
231
- "Token Permissions: If scopes are missing, you may need to logout and re-login."
232
- );
233
- expect(lastFrame()).toContain("- scope1 (read)");
234
- expect(lastFrame()).toContain("- scope2 (write)");
235
- expect(lastFrame()).toContain("- scope3");
236
- });
237
-
238
- // For the case where the cache hasn't updated to include the scopes array
239
- it("should display the user's email and accounts, but no OAuth scopes if none provided", async () => {
240
- const user: UserInfo = {
241
- authType: "OAuth Token",
242
- apiToken: "some-oauth-token",
243
- email: "user@example.com",
244
- tokenPermissions: undefined,
245
- accounts: [
246
- { name: "Account One", id: "account-1" },
247
- { name: "Account Two", id: "account-2" },
248
- { name: "Account Three", id: "account-3" },
249
- ],
250
- };
251
-
252
- const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
253
-
254
- expect(lastFrame()).toContain(
255
- "You are logged in with an OAuth Token, associated with the email 'user@example.com'!"
256
- );
257
- expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
258
- expect(lastFrame()).toMatch(/Account One .+ account-1/);
259
- expect(lastFrame()).toMatch(/Account Two .+ account-2/);
260
- expect(lastFrame()).toMatch(/Account Three .+ account-3/);
261
- });
262
-
263
- it("should display the user's email, accounts and link to view token permissions for non-OAuth tokens", async () => {
264
- const user: UserInfo = {
265
- authType: "API Token",
266
- apiToken: "some-api-token",
267
- email: "user@example.com",
268
- tokenPermissions: undefined,
269
- accounts: [
270
- { name: "Account One", id: "account-1" },
271
- { name: "Account Two", id: "account-2" },
272
- { name: "Account Three", id: "account-3" },
273
- ],
274
- };
275
-
276
- const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
277
-
278
- expect(lastFrame()).toContain(
279
- "You are logged in with an API Token, associated with the email 'user@example.com'!"
280
- );
281
- expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
282
- expect(lastFrame()).toMatch(/Account One .+ account-1/);
283
- expect(lastFrame()).toMatch(/Account Two .+ account-2/);
284
- expect(lastFrame()).toMatch(/Account Three .+ account-3/);
285
- expect(lastFrame()).toContain(
286
- "To see token permissions visit https://dash.cloudflare.com/profile/api-tokens"
287
- );
288
- });
289
- });