auth overrides

api/default_networks.go

@@ -2,10 +2,9 @@ package api
 
 import (
 	"fmt"
-	"strings"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/status-im/status-go/params"
+	"github.com/status-im/status-go/params/networkhelper"
 	"github.com/status-im/status-go/protocol/requests"
 )
 
@@ -260,47 +259,18 @@ var mainnetGanacheTokenOverrides = params.TokenOverride{
 }
 
 func setRPCs(networks []params.Network, request *requests.WalletSecretsConfig) []params.Network {
-
-	var networksWithRPC []params.Network
-
-	const (
-		infura = "infura.io/"
-		grove  = "grove.city/"
-	)
-
-	appendToken := func(url string) string {
-		if strings.Contains(url, infura) && request.InfuraToken != "" {
-			return url + request.InfuraToken
-		} else if strings.Contains(url, grove) && request.PoktToken != "" {
-			return url + request.PoktToken
-		}
-		return url
+	authTokens := map[string]string{
+		"infura.io":  request.InfuraToken,
+		"grove.city": request.PoktToken,
 	}
 
-	for _, n := range networks {
-		var updatedProviders []params.RpcProvider
-		for _, provider := range n.RpcProviders {
-			updatedProvider := provider
-			updatedProvider.URL = appendToken(provider.URL)
-			// Handle Ganache URL override
-			if request.GanacheURL != "" {
-				updatedProvider.URL = request.GanacheURL
-			}
-			updatedProviders = append(updatedProviders, updatedProvider)
-		}
-
-		// Apply token overrides for Ganache networks
-		if request.GanacheURL != "" && n.ChainID == mainnetChainID {
-			n.TokenOverrides = []params.TokenOverride{
-				mainnetGanacheTokenOverrides,
-			}
-		}
+	updatedNetworks := networkhelper.OverrideDirectProvidersAuth(networks, authTokens)
 
-		n.RpcProviders = updatedProviders
-		networksWithRPC = append(networksWithRPC, n)
+	if request.GanacheURL != "" {
+		updatedNetworks = networkhelper.OverrideGanacheToken(updatedNetworks, request.GanacheURL, mainnetChainID, mainnetGanacheTokenOverrides)
 	}
 
-	return networksWithRPC
+	return networks
 }
 
 func BuildDefaultNetworks(walletSecretsConfig *requests.WalletSecretsConfig) []params.Network {

node/get_status_node.go

@@ -340,14 +340,12 @@ func (n *StatusNode) setupRPCClient() (err error) {
 	// Proxy AuthConfigs should be passed not in wallet secrets config on login
 	// but some other way, as it's not wallet specific and should not be passed with login request
 	// but currently there is no other way to pass it
-	networks, err := networkhelper.UpdateEmbeddedProxyProviders(
+	// (maybe move to default_networks.go)
+	networks := networkhelper.OverrideEmbeddedProxyProviders(
 		n.config.Networks,
 		n.config.WalletConfig.StatusProxyEnabled,
 		n.config.WalletConfig.StatusProxyBlockchainUser,
 		n.config.WalletConfig.StatusProxyBlockchainPassword)
-	if err != nil {
-		return
-	}
 
 	config := rpc.ClientConfig{
 		Client:          gethNodeClient,

rpc/client_test.go

@@ -156,7 +156,7 @@ func TestGetClientsUsingCache(t *testing.T) {
 				Type:         params.EmbeddedProxyProviderType,
 				AuthType:     params.BasicAuth,
 				AuthLogin:    "incorrectUser",
-				AuthPassword: "incorrectPwd", // will be replaced by correct values by UpdateEmbeddedProxyProviders
+				AuthPassword: "incorrectPwd", // will be replaced by correct values by OverrideEmbeddedProxyProviders
 				Enabled:      true,
 			})
 		}
@@ -171,8 +171,7 @@ func TestGetClientsUsingCache(t *testing.T) {
 		},
 	}
 
-	networks, err := networkhelper.UpdateEmbeddedProxyProviders(networks, true, user, password)
-	require.NoError(t, err)
+	networks = networkhelper.OverrideEmbeddedProxyProviders(networks, true, user, password)
 
 	config := ClientConfig{
 		Client:          nil,