Deduplicate server JSON structs between publisher and registry

cmd/registry/main.go

@@ -14,9 +14,9 @@ import (
 	"github.com/modelcontextprotocol/registry/internal/api"
 	"github.com/modelcontextprotocol/registry/internal/config"
 	"github.com/modelcontextprotocol/registry/internal/database"
-	"github.com/modelcontextprotocol/registry/internal/model"
 	"github.com/modelcontextprotocol/registry/internal/service"
 	"github.com/modelcontextprotocol/registry/internal/telemetry"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
 func main() {
@@ -46,7 +46,7 @@ func main() {
 	// Initialize services based on environment
 	switch cfg.DatabaseType {
 	case config.DatabaseTypeMemory:
-		db = database.NewMemoryDB(map[string]*model.ServerDetail{})
+		db = database.NewMemoryDB(map[string]*model.ServerJSON{})
 		registryService = service.NewRegistryServiceWithDB(db)
 	case config.DatabaseTypePostgreSQL:
 		// Use PostgreSQL for real registry service

internal/api/handlers/v0/auth/dns.go

@@ -16,7 +16,6 @@ import (
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
 )
 
 // DNSTokenExchangeInput represents the input for DNS-based authentication
@@ -147,7 +146,7 @@ func (h *DNSAuthHandler) ExchangeToken(ctx context.Context, domain, timestamp, s
 
 	// Create JWT claims
 	jwtClaims := auth.JWTClaims{
-		AuthMethod:        model.AuthMethodDNS,
+		AuthMethod:        auth.MethodDNS,
 		AuthMethodSubject: domain,
 		Permissions:       permissions,
 	}

internal/api/handlers/v0/auth/dns_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"
 	intauth "github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
 )
 
 // MockDNSResolver for testing
@@ -174,7 +173,7 @@ func TestDNSAuthHandler_ExchangeToken(t *testing.T) {
 				claims, err := jwtManager.ValidateToken(context.Background(), result.RegistryToken)
 				require.NoError(t, err)
 
-				assert.Equal(t, model.AuthMethodDNS, claims.AuthMethod)
+				assert.Equal(t, intauth.MethodDNS, claims.AuthMethod)
 				assert.Equal(t, tt.domain, claims.AuthMethodSubject)
 				assert.Len(t, claims.Permissions, 2) // domain and subdomain permissions
 

internal/api/handlers/v0/auth/github_at.go

@@ -12,7 +12,6 @@ import (
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
 )
 
 // GitHubTokenExchangeInput represents the input for GitHub token exchange
@@ -86,7 +85,7 @@ func (h *GitHubHandler) ExchangeToken(ctx context.Context, githubToken string) (
 
 	// Create JWT claims with GitHub user info
 	claims := auth.JWTClaims{
-		AuthMethod:        model.AuthMethodGitHubAT,
+		AuthMethod:        auth.MethodGitHubAT,
 		AuthMethodSubject: user.Login,
 		Permissions:       permissions,
 	}

internal/api/handlers/v0/auth/github_at_test.go

@@ -16,7 +16,6 @@ import (
 	v0auth "github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -78,7 +77,7 @@ func TestGitHubHandler_ExchangeToken(t *testing.T) {
 		jwtManager := auth.NewJWTManager(cfg)
 		claims, err := jwtManager.ValidateToken(ctx, response.RegistryToken)
 		require.NoError(t, err)
-		assert.Equal(t, model.AuthMethodGitHubAT, claims.AuthMethod)
+		assert.Equal(t, auth.MethodGitHubAT, claims.AuthMethod)
 		assert.Equal(t, "testuser", claims.AuthMethodSubject)
 		assert.Len(t, claims.Permissions, 1)
 		assert.Equal(t, auth.PermissionActionPublish, claims.Permissions[0].Action)
@@ -333,7 +332,7 @@ func TestJWTTokenValidation(t *testing.T) {
 	t.Run("generate and validate token", func(t *testing.T) {
 		// Create test claims
 		claims := auth.JWTClaims{
-			AuthMethod:        model.AuthMethodGitHubAT,
+			AuthMethod:        auth.MethodGitHubAT,
 			AuthMethodSubject: "testuser",
 			Permissions: []auth.Permission{
 				{
@@ -351,7 +350,7 @@ func TestJWTTokenValidation(t *testing.T) {
 		// Validate token
 		validatedClaims, err := jwtManager.ValidateToken(ctx, tokenResponse.RegistryToken)
 		require.NoError(t, err)
-		assert.Equal(t, model.AuthMethodGitHubAT, validatedClaims.AuthMethod)
+		assert.Equal(t, auth.MethodGitHubAT, validatedClaims.AuthMethod)
 		assert.Equal(t, "testuser", validatedClaims.AuthMethodSubject)
 		assert.Len(t, validatedClaims.Permissions, 1)
 	})
@@ -360,7 +359,7 @@ func TestJWTTokenValidation(t *testing.T) {
 		// Create claims with past expiration
 		pastTime := time.Now().Add(-1 * time.Hour)
 		claims := auth.JWTClaims{
-			AuthMethod:        model.AuthMethodGitHubAT,
+			AuthMethod:        auth.MethodGitHubAT,
 			AuthMethodSubject: "testuser",
 			RegisteredClaims: jwt.RegisteredClaims{
 				ExpiresAt: jwt.NewNumericDate(pastTime),
@@ -381,7 +380,7 @@ func TestJWTTokenValidation(t *testing.T) {
 	t.Run("invalid signature", func(t *testing.T) {
 		// Create test claims
 		claims := auth.JWTClaims{
-			AuthMethod:        model.AuthMethodGitHubAT,
+			AuthMethod:        auth.MethodGitHubAT,
 			AuthMethodSubject: "testuser",
 		}
 

internal/api/handlers/v0/auth/github_oidc.go

@@ -15,7 +15,6 @@ import (
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
 )
 
 // GitHubOIDCTokenExchangeInput represents the input for GitHub OIDC token exchange
@@ -263,7 +262,7 @@ func (h *GitHubOIDCHandler) ExchangeToken(ctx context.Context, oidcToken string)
 
 	// Create JWT claims with GitHub OIDC info
 	jwtClaims := auth.JWTClaims{
-		AuthMethod:        model.AuthMethodGitHubOIDC,
+		AuthMethod:        auth.MethodGitHubOIDC,
 		AuthMethodSubject: claims.Subject, // e.g. "repo:octo-org/octo-repo:environment:prod"
 		Permissions:       permissions,
 	}

internal/api/handlers/v0/auth/github_oidc_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"
 	internalauth "github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -106,7 +105,7 @@ func TestGitHubOIDCHandler_ExchangeToken(t *testing.T) {
 				claims, err := jwtManager.ValidateToken(context.Background(), response.RegistryToken)
 				require.NoError(t, err)
 
-				assert.Equal(t, model.AuthMethodGitHubOIDC, claims.AuthMethod)
+				assert.Equal(t, internalauth.MethodGitHubOIDC, claims.AuthMethod)
 				assert.Equal(t, tt.expectedSubject, claims.AuthMethodSubject)
 				assert.Len(t, claims.Permissions, tt.expectedPerms)
 

internal/api/handlers/v0/auth/http.go

@@ -16,7 +16,6 @@ import (
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
 )
 
 // HTTPTokenExchangeInput represents the input for HTTP-based authentication
@@ -182,7 +181,7 @@ func (h *HTTPAuthHandler) ExchangeToken(ctx context.Context, domain, timestamp,
 
 	// Create JWT claims
 	jwtClaims := auth.JWTClaims{
-		AuthMethod:        model.AuthMethodHTTP,
+		AuthMethod:        auth.MethodHTTP,
 		AuthMethodSubject: domain,
 		Permissions:       permissions,
 	}

internal/api/handlers/v0/auth/http_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"
 	intauth "github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
 )
 
 // MockHTTPKeyFetcher for testing
@@ -210,7 +209,7 @@ func TestHTTPAuthHandler_ExchangeToken(t *testing.T) {
 				claims, err := jwtManager.ValidateToken(context.Background(), result.RegistryToken)
 				require.NoError(t, err)
 
-				assert.Equal(t, model.AuthMethodHTTP, claims.AuthMethod)
+				assert.Equal(t, intauth.MethodHTTP, claims.AuthMethod)
 				assert.Equal(t, tt.domain, claims.AuthMethodSubject)
 				assert.Len(t, claims.Permissions, 1) // domain permissions only
 

internal/api/handlers/v0/auth/none.go

@@ -9,7 +9,6 @@ import (
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
 )
 
 // NoneHandler handles anonymous authentication
@@ -66,7 +65,7 @@ func (h *NoneHandler) GetAnonymousToken(ctx context.Context) (*auth.TokenRespons
 
 	// Create JWT claims for anonymous user
 	claims := auth.JWTClaims{
-		AuthMethod:        model.AuthMethodNone,
+		AuthMethod:        auth.MethodNone,
 		AuthMethodSubject: "anonymous",
 		Permissions:       permissions,
 	}

internal/api/handlers/v0/auth/none_test.go

@@ -10,7 +10,6 @@ import (
 	v0auth "github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -41,7 +40,7 @@ func TestNoneHandler_GetAnonymousToken(t *testing.T) {
 	require.NoError(t, err)
 
 	// Check auth method
-	assert.Equal(t, model.AuthMethodNone, claims.AuthMethod)
+	assert.Equal(t, auth.MethodNone, claims.AuthMethod)
 	assert.Equal(t, "anonymous", claims.AuthMethodSubject)
 
 	// Check permissions

internal/api/handlers/v0/auth/oidc.go

@@ -15,7 +15,6 @@ import (
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
 	"golang.org/x/oauth2"
 )
 
@@ -301,7 +300,7 @@ func (h *OIDCHandler) ExchangeToken(ctx context.Context, oidcToken string) (*aut
 
 	// Create JWT claims
 	jwtClaims := auth.JWTClaims{
-		AuthMethod:        model.AuthMethodOIDC,
+		AuthMethod:        auth.MethodOIDC,
 		AuthMethodSubject: claims.Subject,
 		Permissions:       permissions,
 	}

internal/api/handlers/v0/edit.go

@@ -11,9 +11,10 @@ import (
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
 	"github.com/modelcontextprotocol/registry/internal/database"
-	"github.com/modelcontextprotocol/registry/internal/model"
 	"github.com/modelcontextprotocol/registry/internal/service"
 	"github.com/modelcontextprotocol/registry/internal/validators"
+	apiv1 "github.com/modelcontextprotocol/registry/pkg/api/v1"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
 // EditServerInput represents the input for editing a server
@@ -38,7 +39,7 @@ func RegisterEditEndpoints(api huma.API, registry service.RegistryService, cfg *
 		Security: []map[string][]string{
 			{"bearer": {}},
 		},
-	}, func(ctx context.Context, input *EditServerInput) (*Response[model.ServerResponse], error) {
+	}, func(ctx context.Context, input *EditServerInput) (*Response[apiv1.ServerRecord], error) {
 		// Extract bearer token
 		const bearerPrefix = "Bearer "
 		authHeader := input.Authorization
@@ -54,7 +55,7 @@ func RegisterEditEndpoints(api huma.API, registry service.RegistryService, cfg *
 		}
 
 		// Validate that only allowed extension fields are present
-		if err := model.ValidatePublishRequestExtensions(input.RawBody); err != nil {
+		if err := validators.ValidatePublishRequestExtensions(input.RawBody); err != nil {
 			return nil, huma.Error400BadRequest("Invalid request format", err)
 		}
 
@@ -73,7 +74,7 @@ func RegisterEditEndpoints(api huma.API, registry service.RegistryService, cfg *
 		}
 
 		// Parse the validated request body
-		var editRequest model.PublishRequest
+		var editRequest apiv1.PublishRequest
 		if err := json.Unmarshal(input.RawBody, &editRequest); err != nil {
 			return nil, huma.Error400BadRequest("Invalid JSON format", err)
 		}
@@ -90,7 +91,7 @@ func RegisterEditEndpoints(api huma.API, registry service.RegistryService, cfg *
 		}
 
 		// Prevent undeleting servers - once deleted, they stay deleted
-		if currentServer.Server.Status == model.ServerStatusDeleted && editRequest.Server.Status != model.ServerStatusDeleted {
+		if currentServer.Server.Status == model.StatusDeleted && editRequest.Server.Status != model.StatusDeleted {
 			return nil, huma.Error400BadRequest("Cannot change status of deleted server. Deleted servers cannot be undeleted.")
 		}
 
@@ -103,7 +104,7 @@ func RegisterEditEndpoints(api huma.API, registry service.RegistryService, cfg *
 			return nil, huma.Error400BadRequest("Failed to edit server", err)
 		}
 
-		return &Response[model.ServerResponse]{
+		return &Response[apiv1.ServerRecord]{
 			Body: *updatedServer,
 		}, nil
 	})