Populate names in device flow status API response #3533
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
dnephin
requested review from
BruceMacD,
jmorganca and
pdevine
as code owners
dnephin
commented
Oct 31, 2022
dnephin
changed the title
BruceMacD
approved these changes
Nov 1, 2022
| @@ -20,12 +20,18 @@ func FindDeviceFlowAuthRequest(ctx RequestContext, deviceCode string) (*models.D | |||
| return nil, err | |||
| } | |||
|
|
|||
| // TODO: do this in the data function | |||
| // TODO: do these lookups in the data function when data.GetDeviceFlowAuthRequest | |||
| // is converted to SQL | |||
| if dfar.AccessKeyID > 0 { | |||
| dfar.AccessKey, err = data.GetAccessKey(ctx.DBTxn, data.GetAccessKeysOptions{ByID: dfar.AccessKeyID}) | |||
There was a problem hiding this comment.
Not part of this change but it seems a bit odd that the DeviceFlowAuthRequest has a separate AccessKeyID and AccessKey
dnephin
force-pushed
the
dnephin/device-flow-names-in-resp
branch
from
8dc124e
to
93c71f3
Compare
dnephin
commented
Nov 10, 2022
| if dfar.AccessKey != nil { | ||
| if dfar.AccessKeyID != 0 { |
There was a problem hiding this comment.
This fixes a bug. AccessKey is always nil because we don't populate it in the query used above.
dnephin
force-pushed
the
dnephin/device-flow-names-in-resp
branch
from
ad46d2f
to
a34b12f
Compare
Populate user name and organization name in the login response
The accessKey field is always null, because we don't populate it in this call.
dnephin
force-pushed
the
dnephin/device-flow-names-in-resp
branch
from
a34b12f
to
82caed0
Compare
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.
Summary
This PR adds the user name and organization name to the device flow login response, so that all the fields in the response are correctly populated.
Previously the
GetAccessKeyoperation did not populate theIssusedForName. This PR fixes the function to populate that field.Also adds a lookup of the organization from the
AccessKey.OrganizationID, so that we can include the name in the response.