Merge branch 'main' into MLPAB-1733-toggle-mock-one-login-access-on-u…

…r-env

go.mod

@@ -23,7 +23,6 @@ require (
 	github.com/gorilla/sessions v1.2.2
 	github.com/ministryofjustice/opg-go-common v0.0.0-20231128145056-24628fba649c
 	github.com/mitchellh/hashstructure/v2 v2.0.2
-	github.com/nicksnyder/go-i18n/v2 v2.3.0
 	github.com/pact-foundation/pact-go v1.8.0
 	github.com/stretchr/testify v1.8.4
 	github.com/vektra/mockery v1.1.2
@@ -38,7 +37,6 @@ require (
 	go.opentelemetry.io/otel/trace v1.21.0
 	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3
 	golang.org/x/mod v0.14.0
-	golang.org/x/text v0.14.0
 	golang.org/x/tools v0.17.0
 	google.golang.org/grpc v1.60.1
 )
@@ -80,6 +78,7 @@ require (
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect

go.sum

@@ -1,7 +1,5 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
-github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/MicahParks/keyfunc v1.9.0 h1:lhKd5xrFHLNOWrDc4Tyb/Q1AJ4LCzQ48GVJyVIID3+o=
 github.com/MicahParks/keyfunc v1.9.0/go.mod h1:IdnCilugA0O/99dW+/MkvlyrsX8+L8+x95xuVNtM5jw=
 github.com/aws/aws-lambda-go v1.44.0 h1:Xp9PANXKsSJ23IhE4ths592uWTCEewswPhSH9qpAuQQ=
@@ -170,8 +168,6 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/nicksnyder/go-i18n/v2 v2.3.0 h1:2NPsCsNFCVd7i+Su0xYsBrIhS3bE2XMv5gNTft2O+PQ=
-github.com/nicksnyder/go-i18n/v2 v2.3.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/pact-foundation/pact-go v1.8.0 h1:On9JjJZrzwqmT2UICedWqLpcAtqVyd/ktt0SVJFTdL4=
 github.com/pact-foundation/pact-go v1.8.0/go.mod h1:YLt/uSQGo9x5ZUjynLzNy3IiORlA4BtbR9p2yxgD2as=

internal/form/address_form.go

@@ -13,11 +13,18 @@ type AddressForm struct {
 	Action         string
 	LookupPostcode string
 	Address        *place.Address
+	FieldNames     AddressFieldNames
+}
+
+func NewAddressForm() *AddressForm {
+	return &AddressForm{
+		FieldNames: FieldNames.Address,
+	}
 }
 
 func ReadAddressForm(r *http.Request) *AddressForm {
-	f := &AddressForm{}
-	f.Action = r.PostFormValue("action")
+	f := NewAddressForm()
+	f.Action = r.PostFormValue(f.FieldNames.Action)
 
 	switch f.Action {
 	case "postcode-lookup":
@@ -38,11 +45,11 @@ func ReadAddressForm(r *http.Request) *AddressForm {
 
 	case "manual":
 		f.Address = &place.Address{
-			Line1:      PostFormString(r, "address-line-1"),
-			Line2:      PostFormString(r, "address-line-2"),
-			Line3:      PostFormString(r, "address-line-3"),
-			TownOrCity: PostFormString(r, "address-town"),
-			Postcode:   strings.ToUpper(PostFormString(r, "address-postcode")),
+			Line1:      PostFormString(r, FieldNames.Address.Line1),
+			Line2:      PostFormString(r, FieldNames.Address.Line2),
+			Line3:      PostFormString(r, FieldNames.Address.Line3),
+			TownOrCity: PostFormString(r, FieldNames.Address.TownOrCity),
+			Postcode:   strings.ToUpper(PostFormString(r, FieldNames.Address.Postcode)),
 			Country:    "GB",
 		}
 	}
@@ -53,7 +60,7 @@ func ReadAddressForm(r *http.Request) *AddressForm {
 func (f *AddressForm) Validate(useYour bool) validation.List {
 	var errors validation.List
 
-	errors.String("action", "ifUsePreviousAddressOrEnterNew", f.Action,
+	errors.String(f.FieldNames.Action, "ifUsePreviousAddressOrEnterNew", f.Action,
 		validation.Select("reuse", "reuse-select", "postcode", "postcode-lookup", "postcode-select", "manual", "skip"))
 
 	switch f.Action {
@@ -77,29 +84,29 @@ func (f *AddressForm) Validate(useYour bool) validation.List {
 
 	case "manual":
 		if useYour {
-			errors.String("address-line-1", "addressLine1OfYourAddress", f.Address.Line1,
+			errors.String(f.FieldNames.Line1, "addressLine1OfYourAddress", f.Address.Line1,
 				validation.Empty(),
 				validation.StringTooLong(50))
-			errors.String("address-line-2", "addressLine2OfYourAddress", f.Address.Line2,
+			errors.String(f.FieldNames.Line2, "addressLine2OfYourAddress", f.Address.Line2,
 				validation.StringTooLong(50))
-			errors.String("address-line-3", "addressLine3OfYourAddress", f.Address.Line3,
+			errors.String(f.FieldNames.Line3, "addressLine3OfYourAddress", f.Address.Line3,
 				validation.StringTooLong(50))
-			errors.String("address-town", "yourTownOrCity", f.Address.TownOrCity,
+			errors.String(f.FieldNames.TownOrCity, "yourTownOrCity", f.Address.TownOrCity,
 				validation.Empty())
-			errors.String("address-postcode", "yourPostcode", f.Address.Postcode,
+			errors.String(f.FieldNames.Postcode, "yourPostcode", f.Address.Postcode,
 				validation.Empty(),
 				validation.Postcode())
 		} else {
-			errors.String("address-line-1", "addressLine1", f.Address.Line1,
+			errors.String(f.FieldNames.Line1, "addressLine1", f.Address.Line1,
 				validation.Empty(),
 				validation.StringTooLong(50))
-			errors.String("address-line-2", "addressLine2Label", f.Address.Line2,
+			errors.String(f.FieldNames.Line2, "addressLine2Label", f.Address.Line2,
 				validation.StringTooLong(50))
-			errors.String("address-line-3", "addressLine3Label", f.Address.Line3,
+			errors.String(f.FieldNames.Line3, "addressLine3Label", f.Address.Line3,
 				validation.StringTooLong(50))
-			errors.String("address-town", "townOrCity", f.Address.TownOrCity,
+			errors.String(f.FieldNames.TownOrCity, "townOrCity", f.Address.TownOrCity,
 				validation.Empty())
-			errors.String("address-postcode", "aPostcode", f.Address.Postcode,
+			errors.String(f.FieldNames.Postcode, "aPostcode", f.Address.Postcode,
 				validation.Empty(),
 				validation.Postcode())
 		}