Skip to content

fix(contracts): allow org tokens to create contracts #2748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
migmartri merged 1 commit into from
Feb 18, 2026
Merged

fix(contracts): allow org tokens to create contracts #2748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions app/controlplane/internal/service/workflowcontract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ func (s *WorkflowContractService) Create(ctx context.Context, req *pb.WorkflowCo

// If setting is enabled, only org admins can create contracts (org-level or project-level)
if org.RestrictContractCreationToOrgAdmins {
if !isUserOrgAdmin(ctx) {
return nil, errors.Forbidden("forbidden", "contract creation is restricted to organization administrators. Please contact your administrator")
if !canCreateContractsInRestrictedMode(ctx) {
return nil, errors.Forbidden("forbidden", "contract creation is restricted to organization administrators and service accounts. Please contact your administrator")
}
}

Expand Down Expand Up @@ -170,6 +170,17 @@ func (s *WorkflowContractService) Create(ctx context.Context, req *pb.WorkflowCo
return &pb.WorkflowContractServiceCreateResponse{Result: bizWorkFlowContractToPb(schema)}, nil
}

func canCreateContractsInRestrictedMode(ctx context.Context) bool {
// it's an org-scoped API token
token := entities.CurrentAPIToken(ctx)
if token != nil {
return token.ProjectID == nil
}

// or it's an admin user
return isUserOrgAdmin(ctx)
}

func (s *WorkflowContractService) Update(ctx context.Context, req *pb.WorkflowContractServiceUpdateRequest) (*pb.WorkflowContractServiceUpdateResponse, error) {
currentOrg, err := requireCurrentOrg(ctx)
if err != nil {
Expand Down
Loading