✨ 454 - Add refresh token logic to Axios client #462
Merged
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
joneubank
approved these changes
Oct 21, 2024
src/jobs/ega/egaClient.ts
Outdated
Comment on lines
148
to
150
| if (currentToken) { | ||
| return currentToken; | ||
| } |
There was a problem hiding this comment.
Idea for future, can check within this block if the stored currentToken is expired, and if so we can start a refresh instead of returning the expired token.
src/jobs/ega/egaClient.ts
Outdated
| // Handle token refresh error | ||
| throw refreshError; | ||
| if (!refreshTokenPromise) { | ||
| resetAccessToken(); |
There was a problem hiding this comment.
👍
might be worth a comment to say "401 indicates that the stored access token is no longer valid"
src/jobs/ega/services/permissions.ts
Outdated
| @@ -44,7 +44,7 @@ export const createRequiredPermissions = async ( | |||
| egaClient: EgaClient, | |||
| approvedUser: EgaDacoUser, | |||
| requests: PermissionRequest[], | |||
| ) => { | |||
| ): Promise<number | undefined> => { | |||
There was a problem hiding this comment.
After reading the descriptio9n and this return type, I don't know what this returns. Why is it a number, why might it be undefined?
| // In practice this means that paging will stop before all unique elements are returned, as some of the total is made up of these duplicate values | ||
| // Temp solution is to subtract 1 from the offset (limit - 1), which "backtracks" the paging to ensure the element that gets missed in the last array position is captured | ||
| offset = offset + DEFAULT_OFFSET - 1; | ||
| offset = offset + DEFAULT_OFFSET; |
🥅 455 - Error handling and retries + job reporting
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.
Adds refresh token logic to EGA Axios client + updates for API pagination fix
EGA Client
getAccessTokento manage current token used in the clientfetchAccessTokenfor clarity. Adds error logs here to track the network connection error that has been occurring intermittently; proper error handling + retry functionality will be added in Add Failure Handling & Retry Mechanism to EGA Integration Flow #455refreshAccessToken- new tokens will be retrieved directly from the/tokenendpoint withfetchAccessTokengetPermissionByDatasetAndUserIdwithgetPermissionsByUserId.Permissions service
processPermissionsForApprovedUsersto usegetPermissionsByUserId. Now that the api pagination bug (mentioned in this TODO) has been fixed, theGET /permissionsendpoint allows querying for all permissions for a user in one request, using parametersuser_idand alimitequal to the total number of datasets in the relevant DAC.offset = offset + DEFAULT_OFFSET - 1incrementing for pagination in same functionMain EGA Job