ncm: fixes to proxy device state

Author: xcolwell

model/network_client_model.go

@@ -99,7 +99,12 @@ type ProxyConfig struct {
 
 	HttpsRequireAuth bool `json:"https_require_auth"`
 
-	InitialDeviceState *ProxyDeviceState `json:"initial_device_state,omitempty"`
+	InitialDeviceState *ExtendedProxyDeviceState `json:"initial_device_state,omitempty"`
+}
+
+type ExtendedProxyDeviceState struct {
+	ProxyDeviceState
+	CountryCode string `json:"country_code,omitempty"`
 }
 
 type AuthNetworkClientResult struct {
@@ -247,12 +252,21 @@ func AuthNetworkClient(
 				}
 			}
 
+			proxyDeviceState := authClient.ProxyConfig.InitialDeviceState.ProxyDeviceState
+			if proxyDeviceState.Location == nil {
+				// try the country code
+				proxyDeviceState.Location = GetConnectLocationForCountryCode(
+					session.Ctx,
+					authClient.ProxyConfig.InitialDeviceState.CountryCode,
+				)
+			}
+
 			proxyDeviceConfig := &ProxyDeviceConfig{
 				ProxyDeviceConnection: ProxyDeviceConnection{
 					ClientId: clientId,
 				},
 				LockSubnets:        lockSubnets,
-				InitialDeviceState: authClient.ProxyConfig.InitialDeviceState,
+				InitialDeviceState: &proxyDeviceState,
 			}
 			err := CreateProxyDeviceConfig(session.Ctx, proxyDeviceConfig)
 			if err == nil {

model/network_client_proxy_model.go

@@ -365,12 +365,15 @@ var countryCodeConnectCountries = sync.OnceValue(func() map[string]*connectCount
 			LocationTypeCountry,
 		)
 		server.WithPgResult(result, err, func() {
-			var c connectCountry
-			server.Raise(result.Scan(
-				&c.LocationId,
-				&c.Country,
-				&c.CountryCode,
-			))
+			for result.Next() {
+				var c connectCountry
+				server.Raise(result.Scan(
+					&c.LocationId,
+					&c.Country,
+					&c.CountryCode,
+				))
+				m[c.CountryCode] = &c
+			}
 		})
 	})