minor extrensibility updates

Author: github-actions[bot]

framework/configstore/migrations.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/maximhq/bifrost/framework/configstore/internal/migration"
+	"github.com/maximhq/bifrost/framework/configstore/migrator"
 	"gorm.io/gorm"
 )
 
@@ -34,12 +34,15 @@ func triggerMigrations(ctx context.Context, db *gorm.DB) error {
 	if err := migrationAddEnableLiteLLMFallbacksColumn(ctx, db); err != nil {
 		return err
 	}
+	if err := migrationAddUserAndTeamTables(ctx, db); err != nil {
+		return err
+	}
 	return nil
 }
 
 // migrationInit is the first migration
 func migrationInit(ctx context.Context, db *gorm.DB) error {
-	m := migration.New(db, migration.DefaultOptions, []*migration.Migration{{
+	m := migrator.New(db, migrator.DefaultOptions, []*migrator.Migration{{
 		ID: "init",
 		Migrate: func(tx *gorm.DB) error {
 			tx = tx.WithContext(ctx)
@@ -203,7 +206,7 @@ func migrationInit(ctx context.Context, db *gorm.DB) error {
 
 // createMany2ManyJoinTable creates a many-to-many join table for the given tables.
 func migrationMany2ManyJoinTable(ctx context.Context, db *gorm.DB) error {
-	m := migration.New(db, migration.DefaultOptions, []*migration.Migration{{
+	m := migrator.New(db, migrator.DefaultOptions, []*migrator.Migration{{
 		ID: "many2manyjoin",
 		Migrate: func(tx *gorm.DB) error {
 			tx = tx.WithContext(ctx)
@@ -243,7 +246,7 @@ func migrationMany2ManyJoinTable(ctx context.Context, db *gorm.DB) error {
 
 // migrationAddCustomProviderConfigJSONColumn adds the custom_provider_config_json column to the provider table
 func migrationAddCustomProviderConfigJSONColumn(ctx context.Context, db *gorm.DB) error {
-	m := migration.New(db, migration.DefaultOptions, []*migration.Migration{{
+	m := migrator.New(db, migrator.DefaultOptions, []*migrator.Migration{{
 		ID: "addcustomproviderconfigjsoncolumn",
 		Migrate: func(tx *gorm.DB) error {
 			tx = tx.WithContext(ctx)
@@ -266,7 +269,7 @@ func migrationAddCustomProviderConfigJSONColumn(ctx context.Context, db *gorm.DB
 
 // migrationAddVirtualKeyProviderConfigTable adds the virtual_key_provider_config table
 func migrationAddVirtualKeyProviderConfigTable(ctx context.Context, db *gorm.DB) error {
-	m := migration.New(db, migration.DefaultOptions, []*migration.Migration{{
+	m := migrator.New(db, migrator.DefaultOptions, []*migrator.Migration{{
 		ID: "addvirtualkeyproviderconfig",
 		Migrate: func(tx *gorm.DB) error {
 			tx = tx.WithContext(ctx)
@@ -299,7 +302,7 @@ func migrationAddVirtualKeyProviderConfigTable(ctx context.Context, db *gorm.DB)
 
 // migrationAddOpenAIUseResponsesAPIColumn adds the open_ai_use_responses_api column to the key table
 func migrationAddOpenAIUseResponsesAPIColumn(ctx context.Context, db *gorm.DB) error {
-	m := migration.New(db, migration.DefaultOptions, []*migration.Migration{{
+	m := migrator.New(db, migrator.DefaultOptions, []*migrator.Migration{{
 		ID: "add_open_ai_use_responses_api_column",
 		Migrate: func(tx *gorm.DB) error {
 			tx = tx.WithContext(ctx)
@@ -322,7 +325,7 @@ func migrationAddOpenAIUseResponsesAPIColumn(ctx context.Context, db *gorm.DB) e
 
 // migrationAddAllowedOriginsJSONColumn adds the allowed_origins_json column to the client config table
 func migrationAddAllowedOriginsJSONColumn(ctx context.Context, db *gorm.DB) error {
-	m := migration.New(db, migration.DefaultOptions, []*migration.Migration{{
+	m := migrator.New(db, migrator.DefaultOptions, []*migrator.Migration{{
 		ID: "add_allowed_origins_json_column",
 		Migrate: func(tx *gorm.DB) error {
 			tx = tx.WithContext(ctx)
@@ -345,7 +348,7 @@ func migrationAddAllowedOriginsJSONColumn(ctx context.Context, db *gorm.DB) erro
 
 // migrationAddAllowDirectKeysColumn adds the allow_direct_keys column to the client config table
 func migrationAddAllowDirectKeysColumn(ctx context.Context, db *gorm.DB) error {
-	m := migration.New(db, migration.DefaultOptions, []*migration.Migration{{
+	m := migrator.New(db, migrator.DefaultOptions, []*migrator.Migration{{
 		ID: "add_allow_direct_keys_column",
 		Migrate: func(tx *gorm.DB) error {
 			tx = tx.WithContext(ctx)
@@ -368,7 +371,7 @@ func migrationAddAllowDirectKeysColumn(ctx context.Context, db *gorm.DB) error {
 
 // migrationAddEnableLiteLLMFallbacksColumn adds the enable_litellm_fallbacks column to the client config table
 func migrationAddEnableLiteLLMFallbacksColumn(ctx context.Context, db *gorm.DB) error {
-	m := migration.New(db, migration.DefaultOptions, []*migration.Migration{{
+	m := migrator.New(db, migrator.DefaultOptions, []*migrator.Migration{{
 		ID: "add_enable_litellm_fallbacks_column",
 		Migrate: func(tx *gorm.DB) error {
 			tx = tx.WithContext(ctx)
@@ -396,3 +399,40 @@ func migrationAddEnableLiteLLMFallbacksColumn(ctx context.Context, db *gorm.DB)
 	}
 	return nil
 }
+
+// migrationAddUserAndTeamTables adds the user and team tables
+func migrationAddUserAndTeamTables(ctx context.Context, db *gorm.DB) error {
+	m := migrator.New(db, migrator.DefaultOptions, []*migrator.Migration{{
+		ID: "add_user_and_team_tables",
+		Migrate: func(tx *gorm.DB) error {
+			tx = tx.WithContext(ctx)
+			migrator := tx.Migrator()
+			if !migrator.HasTable(&TableUser{}) {
+				if err := migrator.CreateTable(&TableUser{}); err != nil {
+					return err
+				}
+			}
+			if !migrator.HasColumn(&TableTeam{}, "profile") {
+				if err := migrator.AddColumn(&TableTeam{}, "profile"); err != nil {
+					return err
+				}
+			}
+			if !migrator.HasColumn(&TableTeam{}, "config") {
+				if err := migrator.AddColumn(&TableTeam{}, "config"); err != nil {
+					return err
+				}
+			}
+			if !migrator.HasColumn(&TableTeam{}, "claims") {
+				if err := migrator.AddColumn(&TableTeam{}, "claims"); err != nil {
+					return err
+				}
+			}
+			return nil
+		},
+	}})
+	err := m.Migrate()
+	if err != nil {
+		return fmt.Errorf("error while running db migration: %s", err.Error())
+	}
+	return nil
+}

framework/configstore/internal/migration/migrator.go renamed to framework/configstore/migrator/migrator.go

@@ -18,7 +18,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
-package migration
+package migrator
 
 import (
 	"context"

framework/configstore/rdb.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 
 	"github.com/maximhq/bifrost/core/schemas"
+	"github.com/maximhq/bifrost/framework/configstore/migrator"
 	"github.com/maximhq/bifrost/framework/logstore"
 	"github.com/maximhq/bifrost/framework/vectorstore"
 	"gorm.io/gorm"
@@ -41,6 +42,11 @@ func (s *RDBConfigStore) UpdateClientConfig(ctx context.Context, config *ClientC
 	})
 }
 
+// DB returns the underlying database connection.
+func (s *RDBConfigStore) DB() *gorm.DB {
+	return s.db
+}
+
 // GetClientConfig retrieves the client configuration from the database.
 func (s *RDBConfigStore) GetClientConfig(ctx context.Context) (*ClientConfig, error) {
 	var dbConfig TableClientConfig
@@ -183,7 +189,7 @@ func (s *RDBConfigStore) UpdateProvider(ctx context.Context, provider schemas.Mo
 		dbProvider.ProxyConfig = configCopy.ProxyConfig
 		dbProvider.SendBackRawResponse = configCopy.SendBackRawResponse
 		dbProvider.CustomProviderConfig = configCopy.CustomProviderConfig
-		
+
 		// Save the updated provider
 		if err := tx.WithContext(ctx).Save(&dbProvider).Error; err != nil {
 			return err
@@ -1283,6 +1289,12 @@ func (s *RDBConfigStore) removeDuplicateKeysAndNullKeys(ctx context.Context) err
 	return nil
 }
 
+// RunMigration runs a migration.
+func (s *RDBConfigStore) RunMigration(ctx context.Context, migration *migrator.Migration) error {
+	m := migrator.New(s.db, migrator.DefaultOptions, []*migrator.Migration{migration})
+	return m.Migrate()
+}
+
 // Close closes the SQLite config store.
 func (s *RDBConfigStore) Close(ctx context.Context) error {
 	sqlDB, err := s.db.DB()

framework/configstore/store.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/maximhq/bifrost/core/schemas"
+	"github.com/maximhq/bifrost/framework/configstore/migrator"
 	"github.com/maximhq/bifrost/framework/logstore"
 	"github.com/maximhq/bifrost/framework/vectorstore"
 	"gorm.io/gorm"
@@ -106,6 +107,12 @@ type ConfigStore interface {
 	// Generic transaction manager
 	ExecuteTransaction(ctx context.Context, fn func(tx *gorm.DB) error) error
 
+	// DB returns the underlying database connection.
+	DB() *gorm.DB
+
+	// Migration manager
+	RunMigration(ctx context.Context, migration *migrator.Migration) error
+
 	// Cleanup
 	Close(ctx context.Context) error
 }
@@ -115,7 +122,6 @@ func NewConfigStore(ctx context.Context, config *Config, logger schemas.Logger)
 	if config == nil {
 		return nil, fmt.Errorf("config cannot be nil")
 	}
-
 	if !config.Enabled {
 		return nil, nil
 	}

framework/configstore/tables.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"
 
+	bifrost "github.com/maximhq/bifrost/core"
 	"github.com/maximhq/bifrost/core/schemas"
 	"gorm.io/gorm"
 )
@@ -618,6 +619,75 @@ type TableCustomer struct {
 	UpdatedAt time.Time `gorm:"index;not null" json:"updated_at"`
 }
 
+// TableUser represents a user entity with profile and config association
+type TableUser struct {
+	ID   string `gorm:"primaryKey;type:varchar(255)" json:"id"`
+	Name string `gorm:"type:varchar(255);not null" json:"name"`
+
+	Profile       *string                `gorm:"type:text" json:"-"`
+	ParsedProfile map[string]interface{} `gorm:"-" json:"profile"`
+
+	Config       *string                `gorm:"type:text" json:"-"`
+	ParsedConfig map[string]interface{} `gorm:"-" json:"config"`
+
+	Claims       *string                `gorm:"type:text" json:"-"`
+	ParsedClaims map[string]interface{} `gorm:"-" json:"claims"`
+
+	CreatedAt time.Time `gorm:"index;not null" json:"created_at"`
+	UpdatedAt time.Time `gorm:"index;not null" json:"updated_at"`
+}
+
+// TableName for TableUser
+func (TableUser) TableName() string { return "governance_users" }
+
+// GORM Hooks for validation and constraints
+
+// BeforeSave hook for TableUser to serialize JSON fields
+func (u *TableUser) BeforeSave(tx *gorm.DB) error {
+	if u.ParsedProfile != nil {
+		data, err := json.Marshal(u.ParsedProfile)
+		if err != nil {
+			return err
+		}
+		u.Profile = bifrost.Ptr(string(data))
+	}
+	if u.ParsedConfig != nil {
+		data, err := json.Marshal(u.ParsedConfig)
+		if err != nil {
+			return err
+		}
+		u.Config = bifrost.Ptr(string(data))
+	}
+	if u.ParsedClaims != nil {
+		data, err := json.Marshal(u.ParsedClaims)
+		if err != nil {
+			return err
+		}
+		u.Claims = bifrost.Ptr(string(data))
+	}
+	return nil
+}
+
+// AfterFind hook for TableUser to deserialize JSON fields
+func (u *TableUser) AfterFind(tx *gorm.DB) error {
+	if u.Profile != nil {
+		if err := json.Unmarshal([]byte(*u.Profile), &u.ParsedProfile); err != nil {
+			return err
+		}
+	}
+	if u.Config != nil {
+		if err := json.Unmarshal([]byte(*u.Config), &u.ParsedConfig); err != nil {
+			return err
+		}
+	}
+	if u.Claims != nil {
+		if err := json.Unmarshal([]byte(*u.Claims), &u.ParsedClaims); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // TableTeam represents a team entity with budget and customer association
 type TableTeam struct {
 	ID         string  `gorm:"primaryKey;type:varchar(255)" json:"id"`
@@ -630,10 +700,66 @@ type TableTeam struct {
 	Budget      *TableBudget      `gorm:"foreignKey:BudgetID" json:"budget,omitempty"`
 	VirtualKeys []TableVirtualKey `gorm:"foreignKey:TeamID" json:"virtual_keys"`
 
+	Profile       *string                `gorm:"type:text" json:"-"`
+	ParsedProfile map[string]interface{} `gorm:"-" json:"profile"`
+
+	Config       *string                `gorm:"type:text" json:"-"`
+	ParsedConfig map[string]interface{} `gorm:"-" json:"config"`
+
+	Claims       *string                `gorm:"type:text" json:"-"`
+	ParsedClaims map[string]interface{} `gorm:"-" json:"claims"`
+
 	CreatedAt time.Time `gorm:"index;not null" json:"created_at"`
 	UpdatedAt time.Time `gorm:"index;not null" json:"updated_at"`
 }
 
+// GORM Hooks for validation and constraints
+// BeforeSave hook for TableTeam to serialize JSON fields
+func (t *TableTeam) BeforeSave(tx *gorm.DB) error {
+	if t.ParsedProfile != nil {
+		data, err := json.Marshal(t.ParsedProfile)
+		if err != nil {
+			return err
+		}
+		t.Profile = bifrost.Ptr(string(data))
+	}
+	if t.ParsedConfig != nil {
+		data, err := json.Marshal(t.ParsedConfig)
+		if err != nil {
+			return err
+		}
+		t.Config = bifrost.Ptr(string(data))
+	}
+	if t.ParsedClaims != nil {
+		data, err := json.Marshal(t.ParsedClaims)
+		if err != nil {
+			return err
+		}
+		t.Claims = bifrost.Ptr(string(data))
+	}
+	return nil
+}
+
+// AfterFind hook for TableTeam to deserialize JSON fields
+func (t *TableTeam) AfterFind(tx *gorm.DB) error {
+	if t.Profile != nil {
+		if err := json.Unmarshal([]byte(*t.Profile), &t.ParsedProfile); err != nil {
+			return err
+		}
+	}
+	if t.Config != nil {
+		if err := json.Unmarshal([]byte(*t.Config), &t.ParsedConfig); err != nil {
+			return err
+		}
+	}
+	if t.Claims != nil {
+		if err := json.Unmarshal([]byte(*t.Claims), &t.ParsedClaims); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // TableVirtualKey represents a virtual key with budget, rate limits, and team/customer association
 type TableVirtualKey struct {
 	ID              string                          `gorm:"primaryKey;type:varchar(255)" json:"id"`

transports/bifrost-http/handlers/server.go

@@ -556,7 +556,9 @@ func (s *BifrostHTTPServer) Start() error {
 			logger.Info("server gracefully shutdown")
 		}
 		// Cancelling main context
-		s.cancel()
+		if s.cancel != nil {
+			s.cancel()
+		}
 		// Wait for shutdown to complete or timeout
 		done := make(chan struct{})
 		go func() {

ui/app/_fallbacks/enterprise/adaptive-routing/adaptiveRoutingView.tsx renamed to ui/app/_fallbacks/enterprise/components/adaptive-routing/adaptiveRoutingView.tsx

@@ -0,0 +1,14 @@
+"use client";
+import FullPageLoader from "@/components/fullPageLoader";
+import { useRouter } from "next/navigation";
+import { useEffect } from "react";
+
+export default function LoginView() {
+	const router = useRouter();
+
+	useEffect(() => {
+		router.push("/");
+	}, [router]);
+
+	return <FullPageLoader />;
+}