fix get providers API

Author: TimothyYe

internal/server/controllers/provider.go

@@ -57,7 +57,33 @@ func (c *Controller) UpdateProvider(ctx *fiber.Ctx) error {
 }
 
 func (c *Controller) GetMultiProviders(ctx *fiber.Ctx) error {
-	return ctx.JSON(c.config.Providers)
+	// Combine legacy provider config with new multi-provider config
+	result := make(map[string]*settings.ProviderConfig)
+
+	// First, add all providers from the new multi-provider map
+	if c.config.Providers != nil {
+		for name, config := range c.config.Providers {
+			result[name] = config
+		}
+	}
+
+	// Then, add the legacy provider if it exists and isn't already in the map
+	if c.config.Provider != "" {
+		if _, exists := result[c.config.Provider]; !exists {
+			result[c.config.Provider] = &settings.ProviderConfig{
+				Email:          c.config.Email,
+				Password:       c.config.Password,
+				PasswordFile:   c.config.PasswordFile,
+				LoginToken:     c.config.LoginToken,
+				LoginTokenFile: c.config.LoginTokenFile,
+				AppKey:         c.config.AppKey,
+				AppSecret:      c.config.AppSecret,
+				ConsumerKey:    c.config.ConsumerKey,
+			}
+		}
+	}
+
+	return ctx.JSON(result)
 }
 
 func (c *Controller) UpdateMultiProviders(ctx *fiber.Ctx) error {
@@ -66,6 +92,45 @@ func (c *Controller) UpdateMultiProviders(ctx *fiber.Ctx) error {
 		return err
 	}
 
+	// If there's a legacy provider configured, check if it's in the input
+	if c.config.Provider != "" {
+		if legacyConfig, hasLegacy := providers[c.config.Provider]; hasLegacy {
+			// Update the legacy top-level fields
+			c.config.Email = legacyConfig.Email
+			c.config.Password = legacyConfig.Password
+			c.config.PasswordFile = legacyConfig.PasswordFile
+			c.config.LoginToken = legacyConfig.LoginToken
+			c.config.LoginTokenFile = legacyConfig.LoginTokenFile
+			c.config.AppKey = legacyConfig.AppKey
+			c.config.AppSecret = legacyConfig.AppSecret
+			c.config.ConsumerKey = legacyConfig.ConsumerKey
+
+			// Create a new map with only the non-legacy providers
+			nonLegacyProviders := make(map[string]*settings.ProviderConfig)
+			for name, config := range providers {
+				if name != c.config.Provider {
+					nonLegacyProviders[name] = config
+				}
+			}
+
+			// Update the providers map with only non-legacy providers
+			if len(nonLegacyProviders) > 0 {
+				c.config.Providers = nonLegacyProviders
+			} else {
+				// If no other providers, clear the providers map
+				c.config.Providers = nil
+			}
+
+			if err := c.config.SaveSettings(c.configPath); err != nil {
+				log.Errorf("Failed to save settings: %s", err.Error())
+				return ctx.Status(500).SendString("Failed to save settings")
+			}
+
+			return ctx.SendStatus(fiber.StatusOK)
+		}
+	}
+
+	// No legacy provider match, update the entire providers map
 	c.config.Providers = providers
 
 	if err := c.config.SaveSettings(c.configPath); err != nil {

web/components/multi-provider-control.tsx

@@ -180,7 +180,20 @@ export const MultiProviderControl = () => {
 		if (currentProviderSettings?.consumer_key) config.consumer_key = formData.consumerKey;
 
 		if (credentials) {
-			const success = await add_provider_config(credentials, providerName, config);
+			let success = false;
+
+			if (editingProvider) {
+				// For editing, update the entire providers map
+				const updatedProviders = {
+					...providers,
+					[providerName]: config
+				};
+				success = await update_multi_providers(credentials, updatedProviders);
+			} else {
+				// For adding, use add_provider_config
+				success = await add_provider_config(credentials, providerName, config);
+			}
+
 			if (success) {
 				setProviders(prev => ({
 					...prev,