fix: trigger login flow if refreshtoken isn't valid #709
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🦋 Changeset detectedLatest commit: e974c7b The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
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 |
|
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/2044856879/npm-package-wrangler-709You can reference the automatically updated head of this PR with: npm install --save-dev https://prerelease-registry.developers.workers.dev/prs/709/npm-package-wrangler-709Or you can use npx https://prerelease-registry.developers.workers.dev/runs/2044856879/npm-package-wrangler-709 dev path/to/script.js |
petebacondarwin
approved these changes
Mar 26, 2022
packages/wrangler/src/user.tsx
Outdated
Comment on lines
867
to
876
| const didRefresh = await refreshToken(); | ||
| if (didRefresh) { | ||
| return true; | ||
| } else { | ||
| return isInteractive && (await login()); | ||
| } |
There was a problem hiding this comment.
I think this could simply be...
Suggested change
| const didRefresh = await refreshToken(); | |
| if (didRefresh) { | |
| return true; | |
| } else { | |
| return isInteractive && (await login()); | |
| } | |
| return await refreshToken() || isInteractive && (await login()); |
There was a problem hiding this comment.
That was my first take, but I landed on this version because it reads better. I'll add a comment.
| @@ -610,8 +610,8 @@ export async function getAuthURL(scopes = ScopeKeys): Promise<string> { | |||
| `?response_type=code&` + | |||
| `client_id=${encodeURIComponent(CLIENT_ID)}&` + | |||
| `redirect_uri=${encodeURIComponent(CALLBACK_URL)}&` + | |||
| // @ts-expect-error we add offline_access manually | |||
If the auth refresh token isn't valid, then we should trigger the login flow. Reported in #316
threepointone
force-pushed
the
login-on-refresh-fail
branch
from
bad6374 to
e974c7b
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the auth refresh token isn't valid, then we should trigger the login flow. Reported in #316
We don't have any test coverage on this complicated login machinery 😓 We should fix that soon. I wish there was a good npm package for this, but there just isn't (that I could find).