Skip to content

Commit 163e277

Browse files
committed
Allow fetching custodial users without an email
1 parent 32b9599 commit 163e277

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

user/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (u *User) Parse(parser structure.ObjectParser) {
7878

7979
func (u *User) Validate(validator structure.Validator) {
8080
validator.String("userid", u.UserID).Exists().Using(IDValidator)
81-
validator.String("username", u.Username).Exists().NotEmpty()
81+
validator.String("username", u.Username).NotEmpty()
8282
validator.String("termsAccepted", u.TermsAccepted).AsTime(time.RFC3339Nano).NotZero()
8383
validator.StringArray("roles", u.Roles).EachOneOf(Roles()...).EachUnique()
8484
}

user/user_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ var _ = Describe("User", func() {
192192
),
193193
Entry("username missing",
194194
func(datum *user.User) { datum.Username = nil },
195-
errorsTest.WithPointerSource(structureValidator.ErrorValueNotExists(), "/username"),
196195
),
197196
Entry("username empty",
198197
func(datum *user.User) { datum.Username = pointer.FromString("") },
@@ -244,7 +243,6 @@ var _ = Describe("User", func() {
244243
datum.Roles = pointer.FromStringArray([]string{user.RoleClinic, "invalid"})
245244
},
246245
errorsTest.WithPointerSource(structureValidator.ErrorValueNotExists(), "/userid"),
247-
errorsTest.WithPointerSource(structureValidator.ErrorValueNotExists(), "/username"),
248246
errorsTest.WithPointerSource(structureValidator.ErrorValueStringAsTimeNotValid("", time.RFC3339Nano), "/termsAccepted"),
249247
errorsTest.WithPointerSource(structureValidator.ErrorValueStringNotOneOf("invalid", user.Roles()), "/roles/1"),
250248
),

0 commit comments

Comments
 (0)