fix: differentiate between API and OAuth in whoami

[rozenmd]

Instead of:

rozenmd@QRVX0PWXHR ~ % wrangler logout
 ⛅️ wrangler 2.0.8
-------------------
Not logged in, exiting...
rozenmd@QRVX0PWXHR ~ % CLOUDFLARE_API_TOKEN=xxx wrangler whoami
 ⛅️ wrangler 2.0.8
-------------------
Getting User settings...
👋 You are logged in with an OAuth Token, associated with the email '[email protected]'!
┌───────────────────────────────────┬──────────────────────────────────┐
│ Account Name                      │ Account ID                       │
├───────────────────────────────────┼──────────────────────────────────┤
│ [email protected]'s Account   │ xxx                              │
└───────────────────────────────────┴──────────────────────────────────┘

Folks will now see:

rozenmd@QRVX0PWXHR ~ % CLOUDFLARE_API_TOKEN=xxx wrangler whoami
 ⛅️ wrangler 2.0.8
-------------------
Getting User settings...
👋 You are logged in with an API Token, associated with the email '[email protected]'!
┌───────────────────────────────────┬──────────────────────────────────┐
│ Account Name                      │ Account ID                       │
├───────────────────────────────────┼──────────────────────────────────┤
│ [email protected]'s Account   │ xxx                              │
└───────────────────────────────────┴──────────────────────────────────┘

Closes #1198

[changeset-bot]

🦋 Changeset detected

Latest commit: d2f2271

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package

Name	Type
wrangler	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

[github-actions]

A wrangler prerelease is available for testing. You can install this latest build in your project with:

npm install --save-dev https://prerelease-registry.developers.workers.dev/runs/2467264804/npm-package-wrangler-1203

You can reference the automatically updated head of this PR with:

npm install --save-dev https://prerelease-registry.developers.workers.dev/prs/1203/npm-package-wrangler-1203

Or you can use npx with this latest build directly:

npx https://prerelease-registry.developers.workers.dev/runs/2467264804/npm-package-wrangler-1203 dev path/to/script.js

[petebacondarwin]

This looks good - approving.

But I think we could consider a future clean-up refactoring to move the logic into the getApiToken() function so that instead of just returning a string, it returns an object of the form:

{ type: "API"|"OAuth", value: string }

or something like that.

Then we would not need to expose the internal knowledge about getCloudflareTokenFromEnv() to the outside world.

[petebacondarwin]

I guess this should be a fix?

Suggested change

	differentiate between API and OAuth in whoami
	fix: differentiate between API and OAuth in whoami

[petebacondarwin]

Also worth linking to the original issue in here too.