-
Notifications
You must be signed in to change notification settings - Fork 911
refactor(site): improve minor queries and visuals on external auth #11066
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| import * as API from "api/api"; | ||
| import { ExternalAuth } from "api/typesGenerated"; | ||
| import { QueryClient, UseMutationOptions } from "react-query"; | ||
|
|
||
| // Returns all configured external auths for a given user. | ||
| export const externalAuths = () => { | ||
| return { | ||
| queryKey: ["external-auth"], | ||
| queryFn: () => API.getUserExternalAuthProviders(), | ||
| }; | ||
| }; | ||
|
|
||
| export const externalAuthProvider = (providerId: string) => { | ||
| return { | ||
| queryKey: ["external-auth", providerId], | ||
| queryFn: () => API.getExternalAuthProvider(providerId), | ||
| }; | ||
| }; | ||
|
|
||
| export const externalAuthDevice = (providerId: string) => { | ||
| return { | ||
| queryFn: () => API.getExternalAuthDevice(providerId), | ||
| queryKey: ["external-auth", providerId, "device"], | ||
| }; | ||
| }; | ||
|
|
||
| export const exchangeExternalAuthDevice = ( | ||
| providerId: string, | ||
| deviceCode: string, | ||
| queryClient: QueryClient, | ||
| ) => { | ||
| return { | ||
| queryFn: () => | ||
| API.exchangeExternalAuthDevice(providerId, { | ||
| device_code: deviceCode, | ||
| }), | ||
| queryKey: ["external-auth", providerId, "device", deviceCode], | ||
| onSuccess: async () => { | ||
| // Force a refresh of the Git auth status. | ||
| await queryClient.invalidateQueries(["external-auth", providerId]); | ||
| }, | ||
| }; | ||
| }; | ||
|
|
||
| export const validateExternalAuth = ( | ||
| queryClient: QueryClient, | ||
| ): UseMutationOptions<ExternalAuth, unknown, string> => { | ||
| return { | ||
| mutationFn: API.getExternalAuthProvider, | ||
| onSuccess: (data, providerId) => { | ||
| queryClient.setQueryData(["external-auth", providerId], data); | ||
| }, | ||
| }; | ||
| }; | ||
|
|
||
| export const unlinkExternalAuths = (queryClient: QueryClient) => { | ||
| return { | ||
| mutationFn: API.unlinkExternalAuthProvider, | ||
| onSuccess: async () => { | ||
| await queryClient.invalidateQueries(["external-auth"]); | ||
| }, | ||
| }; | ||
| }; | ||
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know what a good solution would be off the top of my head, but my main worry here is that
onSuccesshas been deprecated foruseQueryin React Query v5, so I feel like we shouldn't become more dependent on that API, even though we can still technically use it in v4https://tkdodo.eu/blog/breaking-react-querys-api-on-purpose
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is absolutely true! Let me remove it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After taking a look into this specific query, I think it is not trivial to remove it right now but we definitely can get back to this when migrating to v5.