From e7649f2dec8e146779b54627f5efb88f97e3392d Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Tue, 12 Jul 2022 15:24:11 +0200 Subject: State + Server: Ensure the current secure location is re-initialized --- state.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'state.go') diff --git a/state.go b/state.go index 9522396..ef3ea65 100644 --- a/state.go +++ b/state.go @@ -181,12 +181,18 @@ func (state *VPNState) addSecureInternetHomeServer(orgID string) (server.Server, return nil, &types.WrappedErrorMessage{Message: errorMessage, Err: serverErr} } + var locationErr error + if !state.Servers.HasSecureLocation() { - locationErr := state.AskSecureLocation() + locationErr = state.AskSecureLocation() - if locationErr != nil { - return nil, &types.WrappedErrorMessage{Message: errorMessage, Err: locationErr} - } + } else { + // reinitialize + locationErr = state.SetSecureLocation(state.Servers.GetSecureLocation()) + } + + if locationErr != nil { + return nil, &types.WrappedErrorMessage{Message: errorMessage, Err: locationErr} } return server, nil -- cgit v1.2.3