refactor(controlplane): require licenser via service constructors (#2705)

Author: mekilis

api/handlers/auth.go

@@ -63,17 +63,18 @@ func (h *Handler) InitSSO(w http.ResponseWriter, r *http.Request) {
 	if host == "" {
 		host = configuration.Host
 	}
-	lu := services.LoginUserSSOService{
-		UserRepo:      users.New(h.A.Logger, h.A.DB),
-		OrgRepo:       organisations.New(h.A.Logger, h.A.DB),
-		OrgMemberRepo: organisation_members.New(h.A.Logger, h.A.DB),
-		JWT:           jwt.NewJwt(&configuration.Auth.Jwt, h.A.Cache),
-		ConfigRepo:    h.A.ConfigRepo,
-		LicenseKey:    licenseKey,
-		Host:          host,
-		Licenser:      h.A.Licenser,
-		Logger:        h.A.Logger,
-	}
+	lu := services.NewLoginUserSSOService(
+		users.New(h.A.Logger, h.A.DB),
+		organisations.New(h.A.Logger, h.A.DB),
+		organisation_members.New(h.A.Logger, h.A.DB),
+		jwt.NewJwt(&configuration.Auth.Jwt, h.A.Cache),
+		h.A.ConfigRepo,
+		h.A.Licenser,
+		nil,
+		h.A.Logger,
+		licenseKey,
+		host,
+	)
 
 	resp, err := lu.Run()
 	if err != nil {
@@ -87,16 +88,18 @@ func (h *Handler) InitSSO(w http.ResponseWriter, r *http.Request) {
 
 func (h *Handler) RedeemSSOCallback(w http.ResponseWriter, r *http.Request) {
 	configuration := h.A.Cfg
-	lu := services.LoginUserSSOService{
-		UserRepo:      users.New(h.A.Logger, h.A.DB),
-		OrgRepo:       organisations.New(h.A.Logger, h.A.DB),
-		OrgMemberRepo: organisation_members.New(h.A.Logger, h.A.DB),
-		JWT:           jwt.NewJwt(&configuration.Auth.Jwt, h.A.Cache),
-		ConfigRepo:    h.A.ConfigRepo,
-		LicenseKey:    configuration.LicenseKey,
-		Licenser:      h.A.Licenser,
-		Logger:        h.A.Logger,
-	}
+	lu := services.NewLoginUserSSOService(
+		users.New(h.A.Logger, h.A.DB),
+		organisations.New(h.A.Logger, h.A.DB),
+		organisation_members.New(h.A.Logger, h.A.DB),
+		jwt.NewJwt(&configuration.Auth.Jwt, h.A.Cache),
+		h.A.ConfigRepo,
+		h.A.Licenser,
+		nil,
+		h.A.Logger,
+		configuration.LicenseKey,
+		"",
+	)
 
 	tokenResp, err := lu.RedeemToken(r.URL.Query())
 	if err != nil {
@@ -214,14 +217,14 @@ func (h *Handler) LoginUser(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	lu := services.LoginUserService{
-		UserRepo:      users.New(h.A.Logger, h.A.DB),
-		OrgMemberRepo: organisation_members.New(h.A.Logger, h.A.DB),
-		Cache:         h.A.Cache,
-		JWT:           jwt.NewJwt(&configuration.Auth.Jwt, h.A.Cache),
-		Data:          &newUser,
-		Licenser:      h.A.Licenser,
-	}
+	lu := services.NewLoginUserService(
+		users.New(h.A.Logger, h.A.DB),
+		organisation_members.New(h.A.Logger, h.A.DB),
+		h.A.Cache,
+		jwt.NewJwt(&configuration.Auth.Jwt, h.A.Cache),
+		&newUser,
+		h.A.Licenser,
+	)
 
 	user, token, err := lu.Run(r.Context())
 	if err != nil {

api/handlers/endpoint.go

@@ -94,18 +94,18 @@ func (h *Handler) CreateEndpoint(w http.ResponseWriter, r *http.Request) {
 		e.OwnerID = pLink.OwnerID
 	}
 
-	ce := services.CreateEndpointService{
-		EndpointRepo:               endpointsvc.New(h.A.Logger, h.A.DB),
-		ProjectRepo:                h.projectRepo(),
-		Licenser:                   h.A.Licenser,
-		E:                          e,
-		ProjectID:                  project.UID,
-		FeatureFlag:                h.A.FFlag,
-		FeatureFlagFetcher:         h.A.FeatureFlagFetcher,
-		EarlyAdopterFeatureFetcher: h.A.EarlyAdopterFeatureFetcher,
-		DB:                         h.A.DB,
-		Logger:                     h.A.Logger,
-	}
+	ce := services.NewCreateEndpointService(
+		endpointsvc.New(h.A.Logger, h.A.DB),
+		h.projectRepo(),
+		h.A.Licenser,
+		h.A.FFlag,
+		h.A.FeatureFlagFetcher,
+		h.A.EarlyAdopterFeatureFetcher,
+		h.A.DB,
+		h.A.Logger,
+		e,
+		project.UID,
+	)
 
 	endpoint, err := ce.Run(r.Context())
 	if err != nil {
@@ -477,20 +477,20 @@ func (h *Handler) UpdateEndpoint(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	ce := services.UpdateEndpointService{
-		Cache:                      h.A.Cache,
-		EndpointRepo:               endpointsvc.New(h.A.Logger, h.A.DB),
-		ProjectRepo:                h.projectRepo(),
-		Licenser:                   h.A.Licenser,
-		FeatureFlag:                h.A.FFlag,
-		FeatureFlagFetcher:         h.A.FeatureFlagFetcher,
-		EarlyAdopterFeatureFetcher: h.A.EarlyAdopterFeatureFetcher,
-		DB:                         h.A.DB,
-		Logger:                     h.A.Logger,
-		E:                          e,
-		Endpoint:                   endpoint,
-		Project:                    project,
-	}
+	ce := services.NewUpdateEndpointService(
+		h.A.Cache,
+		endpointsvc.New(h.A.Logger, h.A.DB),
+		h.projectRepo(),
+		h.A.Licenser,
+		h.A.FFlag,
+		h.A.FeatureFlagFetcher,
+		h.A.EarlyAdopterFeatureFetcher,
+		h.A.DB,
+		h.A.Logger,
+		e,
+		endpoint,
+		project,
+	)
 
 	endpoint, err = ce.Run(r.Context())
 	if err != nil {

api/handlers/organisation.go

@@ -124,14 +124,15 @@ func (h *Handler) CreateOrganisation(w http.ResponseWriter, r *http.Request) {
 	}
 
 	orgRepo := organisations.New(h.A.Logger, h.A.DB)
-	co := services.CreateOrganisationService{
-		OrgRepo:       orgRepo,
-		OrgMemberRepo: organisation_members.New(h.A.Logger, h.A.DB),
-		NewOrg:        &newOrg,
-		User:          user,
-		Licenser:      h.A.Licenser,
-		Logger:        h.A.Logger,
-	}
+	co := services.NewCreateOrganisationService(
+		orgRepo,
+		organisation_members.New(h.A.Logger, h.A.DB),
+		&newOrg,
+		user,
+		h.A.Licenser,
+		"",
+		h.A.Logger,
+	)
 
 	organisation, err := co.Run(r.Context())
 	if err != nil {

api/handlers/organisation_invite.go

@@ -53,17 +53,17 @@ func (h *Handler) InviteUserToOrganisation(w http.ResponseWriter, r *http.Reques
 		}
 	}
 
-	inviteService := &services.InviteUserService{
-		Queue:         h.A.Queue,
-		InviteRepo:    organisation_invites.New(h.A.Logger, h.A.DB),
-		OrgMemberRepo: organisation_members.New(h.A.Logger, h.A.DB),
-		InviteeEmail:  newIV.InviteeEmail,
-		Licenser:      h.A.Licenser,
-		Role:          newIV.Role,
-		User:          user,
-		Organisation:  org,
-		Logger:        h.A.Logger,
-	}
+	inviteService := services.NewInviteUserService(
+		h.A.Queue,
+		organisation_invites.New(h.A.Logger, h.A.DB),
+		organisation_members.New(h.A.Logger, h.A.DB),
+		newIV.InviteeEmail,
+		newIV.Role,
+		user,
+		org,
+		h.A.Licenser,
+		h.A.Logger,
+	)
 
 	iv, err := inviteService.Run(r.Context())
 	if err != nil {
@@ -111,18 +111,18 @@ func (h *Handler) ProcessOrganisationMemberInvite(w http.ResponseWriter, r *http
 		return
 	}
 
-	prc := services.ProcessInviteService{
-		Queue:         h.A.Queue,
-		InviteRepo:    organisation_invites.New(h.A.Logger, h.A.DB),
-		UserRepo:      users.New(h.A.Logger, h.A.DB),
-		OrgRepo:       organisations.New(h.A.Logger, h.A.DB),
-		OrgMemberRepo: organisation_members.New(h.A.Logger, h.A.DB),
-		Licenser:      h.A.Licenser,
-		Token:         token,
-		Accepted:      accepted,
-		NewUser:       newUser,
-		Logger:        h.A.Logger,
-	}
+	prc := services.NewProcessInviteService(
+		h.A.Queue,
+		organisation_invites.New(h.A.Logger, h.A.DB),
+		users.New(h.A.Logger, h.A.DB),
+		organisations.New(h.A.Logger, h.A.DB),
+		organisation_members.New(h.A.Logger, h.A.DB),
+		h.A.Licenser,
+		token,
+		accepted,
+		newUser,
+		h.A.Logger,
+	)
 
 	err = prc.Run(r.Context())
 	if err != nil {

api/handlers/project.go

@@ -28,17 +28,15 @@ func createProjectService(h *Handler) *services.ProjectService {
 	eventDeliveryRepo := event_deliveries.New(h.A.Logger, h.A.DB)
 	eventTypesRepo := event_types.New(h.A.Logger, h.A.DB)
 
-	projectService := services.ProjectService{
-		ApiKeyRepo:        apiKeyRepo,
-		ProjectRepo:       projectRepo,
-		EventRepo:         eventRepo,
-		EventDeliveryRepo: eventDeliveryRepo,
-		EventTypesRepo:    eventTypesRepo,
-		Licenser:          h.A.Licenser,
-		Logger:            h.A.Logger,
-	}
-
-	return &projectService
+	return services.NewProjectService(
+		apiKeyRepo,
+		projectRepo,
+		eventRepo,
+		eventDeliveryRepo,
+		eventTypesRepo,
+		h.A.Licenser,
+		h.A.Logger,
+	)
 }
 
 func (h *Handler) GetProject(w http.ResponseWriter, r *http.Request) {

api/handlers/subscription.go

@@ -225,15 +225,15 @@ func (h *Handler) CreateSubscription(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	cs := services.CreateSubscriptionService{
-		SubRepo:         subscriptions.New(h.A.Logger, h.A.DB),
-		EndpointRepo:    endpoints.New(h.A.Logger, h.A.DB),
-		SourceRepo:      sources.New(h.A.Logger, h.A.DB),
-		Licenser:        h.A.Licenser,
-		Project:         project,
-		NewSubscription: &sub,
-		Logger:          h.A.Logger,
-	}
+	cs := services.NewCreateSubscriptionService(
+		subscriptions.New(h.A.Logger, h.A.DB),
+		endpoints.New(h.A.Logger, h.A.DB),
+		sources.New(h.A.Logger, h.A.DB),
+		project,
+		&sub,
+		h.A.Licenser,
+		h.A.Logger,
+	)
 
 	subscription, err := cs.Run(r.Context())
 	if err != nil {
@@ -376,17 +376,17 @@ func (h *Handler) UpdateSubscription(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	us := services.UpdateSubscriptionService{
-		SubRepo:        subscriptions.New(h.A.Logger, h.A.DB),
-		EndpointRepo:   endpoints.New(h.A.Logger, h.A.DB),
-		ProjectRepo:    h.projectRepo(),
-		SourceRepo:     sources.New(h.A.Logger, h.A.DB),
-		Licenser:       h.A.Licenser,
-		ProjectId:      project.UID,
-		SubscriptionId: chi.URLParam(r, "subscriptionID"),
-		Update:         &update,
-		Logger:         h.A.Logger,
-	}
+	us := services.NewUpdateSubscriptionService(
+		subscriptions.New(h.A.Logger, h.A.DB),
+		endpoints.New(h.A.Logger, h.A.DB),
+		h.projectRepo(),
+		sources.New(h.A.Logger, h.A.DB),
+		h.A.Licenser,
+		h.A.Logger,
+		project.UID,
+		chi.URLParam(r, "subscriptionID"),
+		&update,
+	)
 
 	sub, err := us.Run(r.Context())
 	if err != nil {

api/handlers/user.go

@@ -45,19 +45,18 @@ func (h *Handler) RegisterUser(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	rs := services.RegisterUserService{
-		UserRepo:      users.New(h.A.Logger, h.A.DB),
-		OrgRepo:       organisations.New(h.A.Logger, h.A.DB),
-		OrgMemberRepo: organisation_members.New(h.A.Logger, h.A.DB),
-		Queue:         h.A.Queue,
-		JWT:           jwt.NewJwt(&config.Auth.Jwt, h.A.Cache),
-		ConfigRepo:    h.A.ConfigRepo,
-		Licenser:      h.A.Licenser,
-		Logger:        h.A.Logger,
-
-		BaseURL: baseUrl,
-		Data:    &newUser,
-	}
+	rs := services.NewRegisterUserService(
+		users.New(h.A.Logger, h.A.DB),
+		organisations.New(h.A.Logger, h.A.DB),
+		organisation_members.New(h.A.Logger, h.A.DB),
+		h.A.Queue,
+		jwt.NewJwt(&config.Auth.Jwt, h.A.Cache),
+		h.A.ConfigRepo,
+		h.A.Licenser,
+		baseUrl,
+		&newUser,
+		h.A.Logger,
+	)
 
 	user, token, err := rs.Run(r.Context())
 	if err != nil {

cmd/bootstrap/bootstrap.go

@@ -82,14 +82,15 @@ func AddBootstrapCommand(a *cli.App) *cobra.Command {
 				return err
 			}
 
-			co := services.CreateOrganisationService{
-				OrgRepo:       organisations.New(a.Logger, a.DB),
-				OrgMemberRepo: organisation_members.New(a.Logger, a.DB),
-				Licenser:      a.Licenser,
-				Logger:        a.Logger,
-				NewOrg:        &datastore.OrganisationRequest{Name: "Default Organisation"},
-				User:          user,
-			}
+			co := services.NewCreateOrganisationService(
+				organisations.New(a.Logger, a.DB),
+				organisation_members.New(a.Logger, a.DB),
+				&datastore.OrganisationRequest{Name: "Default Organisation"},
+				user,
+				a.Licenser,
+				"",
+				a.Logger,
+			)
 
 			_, err = co.Run(context.Background())
 			if err != nil {

docs/docs.go

@@ -1,4 +1,4 @@
-// Package docs Code generated by swaggo/swag at 2026-07-07 08:12:26.471862 +0100 WAT m=+3.935712293. DO NOT EDIT
+// Package docs Code generated by swaggo/swag at 2026-07-07 08:54:44.860299 +0100 WAT m=+2.321750918. DO NOT EDIT
 package docs
 
 import "github.com/swaggo/swag"