fix(api): correctly handle organization_id on creation (#11396)

# Which Problems Are Solved

While moving the some requests from the v2beta organization service to
v2, the `org_id` property of the `AddOrganization` request was
deprecated in favor of `organization_id`. However, the internal logic
was adjusted, resulting in a ingored `organization_id`.

# How the Problems Are Solved

- properly favor `organization_id` over `org_id` and added a note to the
proto.

# Additional Changes

none

# Additional Context

- closes #11269
- requires backport to v4.x
This commit is contained in:
Livio Spring
2026-01-22 06:19:16 +00:00
committed by GitHub
parent 09f67a931a
commit 30d91cde58
4 changed files with 62 additions and 1 deletions
+5 -1
View File
@@ -142,11 +142,15 @@ func addOrganizationRequestToCommand(request *org.AddOrganizationRequest) (*comm
if err != nil {
return nil, err
}
id := request.GetOrganizationId()
if id == "" {
id = request.GetOrgId() //nolint:staticcheck
}
return &command.OrgSetup{
Name: request.GetName(),
CustomDomain: "",
Admins: admins,
OrgID: request.GetOrgId(),
OrgID: id,
}, nil
}