cleanup

proxy/pkg/proxy/config.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/caarlos0/env/v11"
 
-	"github.com/netbirdio/netbird/proxy/internal/reverseproxy"
+	"github.com/netbirdio/netbird/proxy/internal/auth/oidc"
 )
 
 var (
@@ -89,7 +89,7 @@ type Config struct {
 	CertCacheDir string `json:"cert_cache_dir"`
 
 	// OIDCConfig is the global OIDC/OAuth configuration for authentication
-	OIDCConfig *reverseproxy.OIDCConfig `json:"oidc_config,omitempty"`
+	OIDCConfig *oidc.Config `json:"oidc_config,omitempty"`
 }
 
 // ParseAndLoad parses configuration from environment variables

proxy/pkg/proxy/server.go

@@ -9,6 +9,8 @@ import (
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
+	"github.com/netbirdio/netbird/proxy/internal/auth"
+	"github.com/netbirdio/netbird/proxy/internal/auth/methods"
 	"github.com/netbirdio/netbird/proxy/internal/reverseproxy"
 	grpcpkg "github.com/netbirdio/netbird/proxy/pkg/grpc"
 	pb "github.com/netbirdio/netbird/proxy/pkg/grpc/proto"
@@ -171,8 +173,8 @@ func (s *Server) Start() error {
 
 	// Enable Bearer authentication for the test route
 	// OIDC configuration is set globally in the proxy config above
-	testAuthConfig := &reverseproxy.AuthConfig{
-		Bearer: &reverseproxy.BearerConfig{
+	testAuthConfig := &auth.Config{
+		Bearer: &methods.BearerConfig{
 			Enabled: true,
 		},
 	}

proxy/pkg/version/version.go

@@ -24,7 +24,7 @@ type Info struct {
 	Version   string `json:"version"`
 	Commit    string `json:"commit"`
 	BuildDate string `json:"build_date"`
-	GoVersion string `json:"go_version"`
+	GoVersion string `json:"NewSingleHostReverseProxygo_version"`
 	OS        string `json:"os"`
 	Arch      string `json:"arch"`
 }