Fixed adding a Gitlab app via UI #1146
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
josecordaz
added
bug
jpellizzari
approved these changes
Nov 30, 2021
palemtnrider
approved these changes
Nov 30, 2021
| @@ -633,7 +633,7 @@ func (s *applicationServer) AuthorizeGitlab(ctx context.Context, msg *pb.Authori | |||
| return nil, fmt.Errorf("could not exchange code: %w", err) | |||
| } | |||
|
|
|||
| token, err := s.jwtClient.GenerateJWT(time.Duration(tokenState.ExpiresIn), gitproviders.GitProviderGitLab, tokenState.AccessToken) | |||
| token, err := s.jwtClient.GenerateJWT(time.Duration(tokenState.ExpiresIn)*time.Second, gitproviders.GitProviderGitLab, tokenState.AccessToken) | |||
There was a problem hiding this comment.
Nit but multiplying by seconds here makes the code a bit obscure. From looking at the code it appears that only GitLab (today) uses the ExpiresIn field. However, others might. The code is more readable (to me) if we add a function on tokenState to return the expires value in seconds - or another field ExpiresInSeconds. Then the individual providers can provide the conversion - if necessary.
There was a problem hiding this comment.
You don't need the type assertion time.Duration either, because multiplying an integer by time.Duration will get you a time.Duration.
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.
Closes:
What changed?
Interpret integer as seconds
Why?
It was interpreting the integer as milliseconds instead of seconds, causing unauthorized errors as the token only had a few seconds of validity.
How did you test it?
I manually added an app via UI, getting the next message afterwards:
Release notes
Documentation Changes