diff --git a/go.mod b/go.mod index 4041da425..d562190f6 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( github.com/miekg/dns v1.1.59 github.com/mitchellh/hashstructure/v2 v2.0.2 github.com/nadoo/ipset v0.5.0 - github.com/netbirdio/management-integrations/integrations v0.0.0-20250314152438-fccc423d1e7f + github.com/netbirdio/management-integrations/integrations v0.0.0-20250314233615-5be625e48b11 github.com/netbirdio/signal-dispatcher/dispatcher v0.0.0-20241010133937-e0df50df217d github.com/okta/okta-sdk-golang/v2 v2.18.0 github.com/oschwald/maxminddb-golang v1.12.0 diff --git a/go.sum b/go.sum index 240ed849d..6964713c2 100644 --- a/go.sum +++ b/go.sum @@ -529,8 +529,8 @@ github.com/netbirdio/go-netroute v0.0.0-20240611143515-f59b0e1d3944 h1:TDtJKmM6S github.com/netbirdio/go-netroute v0.0.0-20240611143515-f59b0e1d3944/go.mod h1:sHA6TRxjQ6RLbnI+3R4DZo2Eseg/iKiPRfNmcuNySVQ= github.com/netbirdio/ice/v3 v3.0.0-20240315174635-e72a50fcb64e h1:PURA50S8u4mF6RrkYYCAvvPCixhqqEiEy3Ej6avh04c= github.com/netbirdio/ice/v3 v3.0.0-20240315174635-e72a50fcb64e/go.mod h1:YMLU7qbKfVjmEv7EoZPIVEI+kNYxWCdPK3VS0BU+U4Q= -github.com/netbirdio/management-integrations/integrations v0.0.0-20250314152438-fccc423d1e7f h1:pRLvCQ1nMqbkNYfoGxJHbXmvz0yIzvz/93DO81HjFpg= -github.com/netbirdio/management-integrations/integrations v0.0.0-20250314152438-fccc423d1e7f/go.mod h1:a2ThxdXQbLWI9OWfmq1rzmfKgxmUYew65MGxNCDhNuo= +github.com/netbirdio/management-integrations/integrations v0.0.0-20250314233615-5be625e48b11 h1:ilgCLSVRiqiFUrhODy/B9qvHtTGcv5f7et0tONSYTz8= +github.com/netbirdio/management-integrations/integrations v0.0.0-20250314233615-5be625e48b11/go.mod h1:3LvBPnW+i06K9fQr1SYwsbhvnxQHtIC8vvO4PjLmmy0= github.com/netbirdio/service v0.0.0-20240911161631-f62744f42502 h1:3tHlFmhTdX9axERMVN63dqyFqnvuD+EMJHzM7mNGON8= github.com/netbirdio/service v0.0.0-20240911161631-f62744f42502/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM= github.com/netbirdio/signal-dispatcher/dispatcher v0.0.0-20241010133937-e0df50df217d h1:bRq5TKgC7Iq20pDiuC54yXaWnAVeS5PdGpSokFTlR28= diff --git a/management/server/account.go b/management/server/account.go index 9b17603eb..bda8de857 100644 --- a/management/server/account.go +++ b/management/server/account.go @@ -316,12 +316,12 @@ func (am *DefaultAccountManager) UpdateAccountSettings(ctx context.Context, acco return nil, err } - err = am.settingsManager.UpdateExtraSettings(ctx, accountID, userID, newSettings.Extra) + extraSettingsChanged, err := am.settingsManager.UpdateExtraSettings(ctx, accountID, userID, newSettings.Extra) if err != nil { return nil, err } - if updateAccountPeers { + if updateAccountPeers || extraSettingsChanged { go am.UpdateAccountPeers(ctx, accountID) } diff --git a/management/server/integrations/extra_settings/manager.go b/management/server/integrations/extra_settings/manager.go index 464f62327..34763e3dd 100644 --- a/management/server/integrations/extra_settings/manager.go +++ b/management/server/integrations/extra_settings/manager.go @@ -8,5 +8,5 @@ import ( type Manager interface { GetExtraSettings(ctx context.Context, accountID string) (*types.ExtraSettings, error) - UpdateExtraSettings(ctx context.Context, accountID, userID string, extraSettings *types.ExtraSettings) error + UpdateExtraSettings(ctx context.Context, accountID, userID string, extraSettings *types.ExtraSettings) (bool, error) } diff --git a/management/server/settings/manager.go b/management/server/settings/manager.go index 5d529011d..f99778e30 100644 --- a/management/server/settings/manager.go +++ b/management/server/settings/manager.go @@ -16,7 +16,7 @@ type Manager interface { GetExtraSettingsManager() extra_settings.Manager GetSettings(ctx context.Context, accountID string, userID string) (*types.Settings, error) GetExtraSettings(ctx context.Context, accountID string) (*types.ExtraSettings, error) - UpdateExtraSettings(ctx context.Context, accountID, userID string, extraSettings *types.ExtraSettings) error + UpdateExtraSettings(ctx context.Context, accountID, userID string, extraSettings *types.ExtraSettings) (bool, error) } type managerImpl struct { @@ -96,7 +96,7 @@ func (m *managerImpl) GetExtraSettings(ctx context.Context, accountID string) (* return settings.Extra, nil } -func (m *managerImpl) UpdateExtraSettings(ctx context.Context, accountID, userID string, extraSettings *types.ExtraSettings) error { +func (m *managerImpl) UpdateExtraSettings(ctx context.Context, accountID, userID string, extraSettings *types.ExtraSettings) (bool, error) { return m.extraSettingsManager.UpdateExtraSettings(ctx, accountID, userID, extraSettings) } @@ -128,6 +128,6 @@ func (m *ManagerMock) GetExtraSettings(ctx context.Context, accountID string) (* return &types.ExtraSettings{}, nil } -func (m *ManagerMock) UpdateExtraSettings(ctx context.Context, accountID, userID string, extraSettings *types.ExtraSettings) error { - return nil +func (m *ManagerMock) UpdateExtraSettings(ctx context.Context, accountID, userID string, extraSettings *types.ExtraSettings) (bool, error) { + return false, nil }