From 5592d4198e7df8013cddf9ebee06e53551942def Mon Sep 17 00:00:00 2001 From: Miguel Martinez Date: Tue, 1 Jul 2025 00:47:00 +0200 Subject: [PATCH 1/2] fix(api-tokens): creation issue Signed-off-by: Miguel Martinez --- app/controlplane/configs/config.devel.yaml | 4 ++++ app/controlplane/internal/service/apitoken.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controlplane/configs/config.devel.yaml b/app/controlplane/configs/config.devel.yaml index a6ed90ff4..3aeb19182 100644 --- a/app/controlplane/configs/config.devel.yaml +++ b/app/controlplane/configs/config.devel.yaml @@ -26,6 +26,10 @@ certificate_authorities: key_path: ${FILE_CA_KEY_PATH:../../devel/devkeys/ca.pem} key_pass: chainloop +onboarding: + - name: auto-onboard-org + role: MEMBERSHIP_ROLE_ORG_OWNER + # - ejbca_ca: # server_url: "https://localhost/ejbca" # key_path: "../../devel/devkeys/superadmin.key" diff --git a/app/controlplane/internal/service/apitoken.go b/app/controlplane/internal/service/apitoken.go index 0ca0b7728..034a70196 100644 --- a/app/controlplane/internal/service/apitoken.go +++ b/app/controlplane/internal/service/apitoken.go @@ -50,7 +50,7 @@ func (s *APITokenService) Create(ctx context.Context, req *pb.APITokenServiceCre *expiresIn = req.ExpiresIn.AsDuration() } - token, err := s.APITokenUseCase.Create(ctx, req.Name, req.Description, expiresIn, currentOrg.ID, nil) + token, err := s.APITokenUseCase.Create(ctx, req.Name, req.Description, expiresIn, currentOrg.ID) if err != nil { return nil, handleUseCaseErr(err, s.log) } From f3466699323e02eecf8182cf58f8d11537a5127e Mon Sep 17 00:00:00 2001 From: Miguel Martinez Date: Tue, 1 Jul 2025 00:48:09 +0200 Subject: [PATCH 2/2] fix(api-tokens): creation issue Signed-off-by: Miguel Martinez --- app/controlplane/configs/config.devel.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/controlplane/configs/config.devel.yaml b/app/controlplane/configs/config.devel.yaml index 3aeb19182..a6ed90ff4 100644 --- a/app/controlplane/configs/config.devel.yaml +++ b/app/controlplane/configs/config.devel.yaml @@ -26,10 +26,6 @@ certificate_authorities: key_path: ${FILE_CA_KEY_PATH:../../devel/devkeys/ca.pem} key_pass: chainloop -onboarding: - - name: auto-onboard-org - role: MEMBERSHIP_ROLE_ORG_OWNER - # - ejbca_ca: # server_url: "https://localhost/ejbca" # key_path: "../../devel/devkeys/superadmin.key"