refactor(api): terraform api

Author: fiftin

api/login.go

@@ -243,8 +243,12 @@ type LoginTotpAuthMethod struct {
 	AllowRecovery bool `json:"allow_recovery"`
 }
 
+type LoginEmailAuthMethod struct {
+}
+
 type LoginAuthMethods struct {
-	Totp *LoginTotpAuthMethod `json:"totp,omitempty"`
+	Totp  *LoginTotpAuthMethod  `json:"totp,omitempty"`
+	Email *LoginEmailAuthMethod `json:"email,omitempty"`
 }
 
 type loginMetadata struct {

api/router.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"embed"
 	"fmt"
+	proApi "github.com/semaphoreui/semaphore/pro/api"
 	proFeatures "github.com/semaphoreui/semaphore/pro/pkg/features"
 	"github.com/semaphoreui/semaphore/services/server"
 	task2 "github.com/semaphoreui/semaphore/services/tasks"
@@ -15,6 +16,7 @@ import (
 
 	"github.com/semaphoreui/semaphore/api/debug"
 	"github.com/semaphoreui/semaphore/pkg/tz"
+	proSubscriptions "github.com/semaphoreui/semaphore/pro/api/subscriptions"
 	log "github.com/sirupsen/logrus"
 
 	"github.com/semaphoreui/semaphore/api/runners"
@@ -97,6 +99,7 @@ func Route(
 	repositoryController := projects.NewRepositoryController(accessKeyInstallationService)
 	keyController := projects.NewKeyController(accessKeyService)
 	projectsController := projects.NewProjectsController(accessKeyService)
+	terraformController := proApi.NewTerraformController(encryptionService)
 
 	r := mux.NewRouter()
 	r.NotFoundHandler = http.HandlerFunc(servePublic)
@@ -153,11 +156,11 @@ func Route(
 		integrationController.ReceiveIntegration).Methods("POST", "GET", "OPTIONS")
 
 	terraformWebhookRouter := publicWebHookRouter.PathPrefix("/terraform").Subrouter()
-	terraformWebhookRouter.Use(TerraformInventoryAliasMiddleware)
-	terraformWebhookRouter.Path("/{alias}").HandlerFunc(getTerraformState).Methods("GET")
-	terraformWebhookRouter.Path("/{alias}").HandlerFunc(addTerraformState).Methods("POST")
-	terraformWebhookRouter.Path("/{alias}").HandlerFunc(lockTerraformState).Methods("LOCK")
-	terraformWebhookRouter.Path("/{alias}").HandlerFunc(unlockTerraformState).Methods("UNLOCK")
+	terraformWebhookRouter.Use(terraformController.TerraformInventoryAliasMiddleware)
+	terraformWebhookRouter.Path("/{alias}").HandlerFunc(terraformController.GetTerraformState).Methods("GET")
+	terraformWebhookRouter.Path("/{alias}").HandlerFunc(terraformController.AddTerraformState).Methods("POST")
+	terraformWebhookRouter.Path("/{alias}").HandlerFunc(terraformController.LockTerraformState).Methods("LOCK")
+	terraformWebhookRouter.Path("/{alias}").HandlerFunc(terraformController.UnlockTerraformState).Methods("UNLOCK")
 
 	authenticatedWS := r.PathPrefix(webPath + "api").Subrouter()
 	authenticatedWS.Use(JSONMiddleware, authenticationWithStore)
@@ -168,6 +171,9 @@ func Route(
 
 	authenticatedAPI.Path("/info").HandlerFunc(getSystemInfo).Methods("GET", "HEAD")
 
+	authenticatedAPI.Path("/subscription").HandlerFunc(proSubscriptions.Activate).Methods("POST")
+	authenticatedAPI.Path("/subscription").HandlerFunc(proSubscriptions.GetSubscription).Methods("GET")
+
 	authenticatedAPI.Path("/projects").HandlerFunc(projects.GetProjects).Methods("GET", "HEAD")
 	authenticatedAPI.Path("/projects").HandlerFunc(projectsController.AddProject).Methods("POST")
 	authenticatedAPI.Path("/projects/restore").HandlerFunc(projects.Restore).Methods("POST")
@@ -599,6 +605,10 @@ func getSystemInfo(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	if util.Config.Auth.Email.Enabled {
+		authMethods.Email = &LoginEmailAuthMethod{}
+	}
+
 	body := map[string]any{
 		"version":           util.Version(),
 		"ansible":           util.AnsibleVersion(),

api/terraform.go

@@ -0,0 +1,16 @@
+package subscriptions
+
+import (
+	"errors"
+	"github.com/semaphoreui/semaphore/api/helpers"
+	"net/http"
+)
+
+func GetSubscription(w http.ResponseWriter, r *http.Request) {
+	helpers.WriteError(w, errors.New("not implemented"))
+
+}
+
+func Activate(w http.ResponseWriter, r *http.Request) {
+	helpers.WriteError(w, errors.New("not implemented"))
+}

pro/api/subscriptions/subscriptions.go

@@ -156,7 +156,7 @@ type FileLogFormat string
 
 const (
 	FileLogJSON FileLogFormat = "json"
-	FileLogRaw  FileLogFormat = "raw"
+	FileLogRaw  FileLogFormat = ""
 )
 
 type TaskLogType struct {

util/config.go

@@ -1,7 +1,19 @@
-//go:build !pro
-
 package util
 
+type RecaptchaConfig struct {
+	Enabled string `json:"enabled,omitempty" env:"SEMAPHORE_RECAPTCHA_ENABLED"`
+	SiteKey string `json:"site_key,omitempty" env:"SEMAPHORE_RECAPTCHA_SITE_KEY"`
+}
+
+type EmailAuthConfig struct {
+	Enabled                  bool     `json:"enabled" env:"SEMAPHORE_EMAIL_2TP_ENABLED"`
+	AllowLoginAsExternalUser bool     `json:"allow_login_as_external_user" env:"SEMAPHORE_EMAIL_2TP_ALLOW_LOGIN_AS_EXTERNAL_USER"`
+	AllowCreateExternalUsers bool     `json:"allow_create_external_user" env:"SEMAPHORE_EMAIL_2TP_ALLOW_CREATE_EXTERNAL_USER"`
+	AllowedDomains           []string `json:"allowed_domains" env:"SEMAPHORE_EMAIL_2TP_ALLOWED_DOMAINS"`
+	DisableForOidc           bool     `json:"disable_for_oidc" env:"SEMAPHORE_EMAIL_2TP_DISABLE_FOR_OIDC"`
+}
+
 type AuthConfig struct {
-	Totp *TotpConfig `json:"totp,omitempty"`
+	Totp  *TotpConfig      `json:"totp,omitempty"`
+	Email *EmailAuthConfig `json:"email,omitempty"`
 }