fix some conflicts regression

management/internals/modules/reverseproxy/manager/manager.go

@@ -180,6 +180,8 @@ func (m *managerImpl) UpdateReverseProxy(ctx context.Context, accountID, userID
 		}
 
 		reverseProxy.Meta = existingReverseProxy.Meta
+		reverseProxy.SessionPrivateKey = existingReverseProxy.SessionPrivateKey
+		reverseProxy.SessionPublicKey = existingReverseProxy.SessionPublicKey
 
 		if err = transaction.UpdateReverseProxy(ctx, reverseProxy); err != nil {
 			return fmt.Errorf("update reverse proxy: %w", err)

management/internals/modules/reverseproxy/reverseproxy.go

@@ -82,15 +82,15 @@ type ReverseProxyMeta struct {
 }
 
 type ReverseProxy struct {
-	ID        string `gorm:"primaryKey"`
-	AccountID string `gorm:"index"`
-	Name      string
-	Domain    string   `gorm:"index"`
-	ProxyCluster string   `gorm:"index"`
-	Targets   []Target `gorm:"serializer:json"`
-	Enabled   bool
-	Auth      AuthConfig       `gorm:"serializer:json"`
-	Meta      ReverseProxyMeta `gorm:"embedded;embeddedPrefix:meta_"`
+	ID                string `gorm:"primaryKey"`
+	AccountID         string `gorm:"index"`
+	Name              string
+	Domain            string   `gorm:"index"`
+	ProxyCluster      string   `gorm:"index"`
+	Targets           []Target `gorm:"serializer:json"`
+	Enabled           bool
+	Auth              AuthConfig       `gorm:"serializer:json"`
+	Meta              ReverseProxyMeta `gorm:"embedded;embeddedPrefix:meta_"`
 	SessionPrivateKey string           `gorm:"column:session_private_key"`
 	SessionPublicKey  string           `gorm:"column:session_public_key"`
 }
@@ -322,6 +322,7 @@ func (r *ReverseProxy) Copy() *ReverseProxy {
 		AccountID:         r.AccountID,
 		Name:              r.Name,
 		Domain:            r.Domain,
+		ProxyCluster:      r.ProxyCluster,
 		Targets:           targets,
 		Enabled:           r.Enabled,
 		Auth:              r.Auth,

management/internals/server/boot.go

@@ -180,8 +180,9 @@ func (s *BaseServer) proxyOIDCConfig() nbgrpc.ProxyOIDCConfig {
 		callbackURL = callbackURL + "/api/oauth/callback"
 
 		return nbgrpc.ProxyOIDCConfig{
-			Issuer:       s.Config.HttpConfig.AuthIssuer,
-			ClientID:     "netbird-dashboard", // Reuse dashboard client
+			Issuer: s.Config.HttpConfig.AuthIssuer,
+			// todo: double check auth clientID value
+			ClientID:     s.Config.HttpConfig.AuthAudience, // Reuse dashboard client
 			Scopes:       []string{"openid", "profile", "email"},
 			CallbackURL:  callbackURL,
 			HMACKey:      []byte(s.Config.DataStoreEncryptionKey), // Use the datastore encryption key for OIDC state HMACs, this should ensure all management instances are using the same key.