Address phone input bugs

Author: carmenlau

pkg/auth/handler/webapp/viewmodels/base.go

@@ -84,6 +84,7 @@ type FlashMessage interface {
 }
 
 type BaseViewModeler struct {
+	TrustProxy            config.TrustProxy
 	OAuth                 *config.OAuthConfig
 	AuthUI                *config.UIConfig
 	AuthUIFeatureConfig   *config.UIFeatureConfig
@@ -122,9 +123,12 @@ func (m *BaseViewModeler) ViewModel(r *http.Request, rw http.ResponseWriter) Bas
 	}
 
 	geoipCountryCode := ""
-	geoipInfo, ok := geoip.DefaultDatabase.IPString(r.RemoteAddr)
-	if ok {
-		geoipCountryCode = geoipInfo.CountryCode
+	if !m.AuthUI.PhoneInput.PreselectByIPDisabled {
+		requestIP := httputil.GetIP(r, bool(m.TrustProxy))
+		geoipInfo, ok := geoip.DefaultDatabase.IPString(requestIP)
+		if ok {
+			geoipCountryCode = geoipInfo.CountryCode
+		}
 	}
 
 	model := BaseViewModel{

pkg/auth/wire_gen.go

@@ -35,16 +35,18 @@ var _ = Schema.Add("PhoneInputConfig", `
 	"additionalProperties": false,
 	"properties": {
 		"allowlist": { "type": "array", "items": { "$ref": "#/$defs/ISO31661Alpha2" }, "minItems": 1 },
-		"pinned_list": { "type": "array", "items": { "$ref": "#/$defs/ISO31661Alpha2" } }
+		"pinned_list": { "type": "array", "items": { "$ref": "#/$defs/ISO31661Alpha2" } },
+		"preselect_by_ip_disabled": { "type": "boolean" }
 	}
 }
 `)
 
 var _ = Schema.Add("ISO31661Alpha2", phone.JSONSchemaString)
 
 type PhoneInputConfig struct {
-	AllowList  []string `json:"allowlist,omitempty"`
-	PinnedList []string `json:"pinned_list,omitempty"`
+	AllowList             []string `json:"allowlist,omitempty"`
+	PinnedList            []string `json:"pinned_list,omitempty"`
+	PreselectByIPDisabled bool     `json:"preselect_by_ip_disabled,omitempty"`
 }
 
 func (c *PhoneInputConfig) SetDefaults() {