Implement seat-based billing and logging enhancements. Introduce AdminLogsHandler for managing server logs, including listing and downloading logs. Update subscription management to support seat-based billing, ensuring proper validation and error handling. Enhance payment service to include seat quantity in checkout sessions and update subscription seats dynamically. Refactor logging mechanisms to separate application and HTTP logs, improving log management and traceability.

Author: yakuter

cmd/passwall-server/main.go

@@ -6,14 +6,17 @@ import (
 	"log"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 
 	"github.com/passwall/passwall-server/internal/core"
 	"github.com/passwall/passwall-server/pkg/buildvars"
+	"github.com/passwall/passwall-server/pkg/constants"
 	"github.com/passwall/passwall-server/pkg/logger"
 )
 
 func main() {
+	applyWorkDir()
 	logStartupInfo()
 
 	// Create application context with signal handling
@@ -46,6 +49,21 @@ func main() {
 	fmt.Println("✅ Server stopped")
 }
 
+func applyWorkDir() {
+	workDir := strings.TrimSpace(os.Getenv(constants.WorkDirEnv))
+	if workDir == "" {
+		return
+	}
+
+	if err := os.MkdirAll(workDir, 0755); err != nil {
+		log.Fatalf("Failed to create work dir %q: %v", workDir, err)
+	}
+
+	if err := os.Chdir(workDir); err != nil {
+		log.Fatalf("Failed to change work dir to %q: %v", workDir, err)
+	}
+}
+
 func logStartupInfo() {
 	args := os.Args
 	if args == nil {

internal/core/app.go

@@ -239,6 +239,7 @@ func (a *App) Run(ctx context.Context) error {
 		serviceLogger,
 	)
 	adminMailHandler := httpHandler.NewAdminMailHandler(emailSender, userRepo, serviceLogger)
+	adminLogsHandler := httpHandler.NewAdminLogsHandler()
 
 	// Setup router
 	router := SetupRouter(
@@ -266,6 +267,7 @@ func (a *App) Run(ctx context.Context) error {
 		plansHandler,
 		adminSubscriptionsHandler,
 		adminMailHandler,
+		adminLogsHandler,
 	)
 
 	// Create server

internal/core/router.go

@@ -37,6 +37,7 @@ func SetupRouter(
 	plansHandler *httpHandler.PlansHandler,
 	adminSubscriptionsHandler *httpHandler.AdminSubscriptionsHandler,
 	adminMailHandler *httpHandler.AdminMailHandler,
+	adminLogsHandler *httpHandler.AdminLogsHandler,
 ) *gin.Engine {
 	// Create router without default middleware
 	router := gin.New()
@@ -223,6 +224,10 @@ func SetupRouter(
 			// Mail (admin broadcast)
 			adminGroup.POST("/mail", adminMailHandler.CreateJob)
 			adminGroup.GET("/mail/:jobId", adminMailHandler.GetJob)
+			// Server logs (admin)
+			adminGroup.GET("/logs", adminLogsHandler.List)
+			adminGroup.GET("/logs/download", adminLogsHandler.Download)
+			adminGroup.GET("/logs/download-bundle", adminLogsHandler.DownloadBundle)
 
 			// Legacy endpoint (backward compatibility)
 			adminGroup.POST("/bulk-email", adminMailHandler.CreateJob)
@@ -262,6 +267,7 @@ func SetupRouter(
 			// Payment & Billing routes
 			orgsGroup.POST("/:id/checkout", paymentHandler.CreateCheckoutSession)
 			orgsGroup.GET("/:id/billing", paymentHandler.GetBillingInfo)
+			orgsGroup.POST("/:id/subscription/seats", paymentHandler.UpdateSubscriptionSeats)
 			orgsGroup.POST("/:id/subscription/cancel", paymentHandler.CancelSubscription)
 			orgsGroup.POST("/:id/subscription/reactivate", paymentHandler.ReactivateSubscription)
 			orgsGroup.POST("/:id/subscription/sync", paymentHandler.SyncSubscription)

internal/domain/subscription.go

@@ -45,6 +45,10 @@ type Subscription struct {
 	// Stripe integration
 	StripeSubscriptionID *string `json:"stripe_subscription_id,omitempty" gorm:"type:varchar(255);uniqueIndex"`
 
+	// Seat-based billing (quantity-based Stripe subscriptions)
+	// Null means "not seat-based / unknown". When set, it becomes the effective user limit.
+	SeatsPurchased *int `json:"seats_purchased,omitempty" gorm:"index"`
+
 	// Associations
 	Organization *Organization `json:"organization,omitempty" gorm:"foreignKey:OrganizationID"`
 	Plan         *Plan         `json:"plan,omitempty" gorm:"foreignKey:PlanID"`
@@ -111,6 +115,7 @@ type SubscriptionDTO struct {
 	GracePeriodEndsAt    *time.Time        `json:"grace_period_ends_at,omitempty"`
 	TrialEndsAt          *time.Time        `json:"trial_ends_at,omitempty"`
 	StripeSubscriptionID *string           `json:"stripe_subscription_id,omitempty"`
+	SeatsPurchased       *int              `json:"seats_purchased,omitempty"`
 	CreatedAt            time.Time         `json:"created_at"`
 	UpdatedAt            time.Time         `json:"updated_at"`
 }
@@ -148,6 +153,7 @@ func ToSubscriptionDTO(s *Subscription) *SubscriptionDTO {
 		GracePeriodEndsAt:    s.GracePeriodEndsAt,
 		TrialEndsAt:          s.TrialEndsAt,
 		StripeSubscriptionID: s.StripeSubscriptionID,
+		SeatsPurchased:       s.SeatsPurchased,
 		CreatedAt:            s.CreatedAt,
 		UpdatedAt:            s.UpdatedAt,
 	}