feat: use default org for PostUser #12143
Merged
Conversation
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 stack of pull requests is managed by Graphite. Learn more about stacking. |
01ec5d8 to
bdd0956
Compare
Emyrk
commented
Feb 14, 2024
Comment on lines
-404
to
+423
| // If no organization is provided, add the user to the first | ||
| // organization. | ||
| organizations, err := api.Database.GetOrganizations(ctx) | ||
| // If no organization is provided, add the user to the default | ||
| defaultOrg, err := api.Database.GetDefaultOrganization(ctx) | ||
| if err != nil { | ||
| if httpapi.Is404Error(err) { | ||
| httpapi.Write(ctx, rw, http.StatusNotFound, | ||
| codersdk.Response{ | ||
| Message: "Resource not found or you do not have access to this resource", | ||
| Detail: "Organization not found", | ||
| }, | ||
| ) | ||
| return | ||
| } | ||
| httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{ | ||
| Message: "Internal error fetching orgs.", | ||
| Detail: err.Error(), | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| if len(organizations) > 0 { | ||
| // Add the user to the first organization. Once multi-organization | ||
| // support is added, we should enable a configuration map of user | ||
| // email to organization. | ||
| req.OrganizationID = organizations[0].ID | ||
| } | ||
| req.OrganizationID = defaultOrg.ID |
60775a6 to
04c6149
Compare
0f27fcc to
5bb0ffc
Compare
04c6149 to
7059828
Compare
7059828 to
a25537e
Compare
Instead of assuming only 1 org exists, this uses the is_default org to place a user in if not specified.
aeb29f2 to
8f61a71
Compare
mafredri
approved these changes
Feb 16, 2024
| @@ -1016,6 +1016,12 @@ func (q *querier) GetDERPMeshKey(ctx context.Context) (string, error) { | |||
| return q.db.GetDERPMeshKey(ctx) | |||
| } | |||
|
|
|||
| func (q *querier) GetDefaultOrganization(ctx context.Context) (database.Organization, error) { | |||
| return fetch(q.log, q.auth, func(ctx context.Context, _ any) (database.Organization, error) { | |||
There was a problem hiding this comment.
That does do auth! fetch is the helper function that automatically checks the RBAC on the returned object. So if the caller cannot read the default org, this will fail.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 #11925
What this does
Instead of assuming only 1 org exists, this uses the
is_defaultorg to place a user in if not specified.