Commitfa9d426

committed

fix: do not enqueue notification if user.ID is uuid.Nil

1 parentc4ed205 commitfa9d426Copy full SHA for fa9d426

File tree

+10

-8

lines changed

+10

-8

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -279,10 +279,12 @@ func (api API) postRequestOneTimePasscode(rw http.ResponseWriter, r http.Reque`
`279`	`279`	`auditUser.OneTimePasscodeExpiresAt= sql.NullTime{Time:passcodeExpiresAt,Valid:true}`
`280`	`280`	`aReq.New=auditUser`
`281`	`281`
`282`		`-// Send the one-time passcode to the user.`
`283`		`-err=api.notifyUserRequestedOneTimePasscode(ctx,user,passcode.String())`
`284`		`-iferr!=nil {`
`285`		`-logger.Error(ctx,"unable to notify user about one-time passcode request",slog.Error(err))`
	`282`	`+ifuser.ID!=uuid.Nil {`
	`283`	`+// Send the one-time passcode to the user.`
	`284`	`+err=api.notifyUserRequestedOneTimePasscode(ctx,user,passcode.String())`
	`285`	`+iferr!=nil {`
	`286`	`+logger.Error(ctx,"unable to notify user about one-time passcode request",slog.Error(err))`
	`287`	`+}`
`286`	`288`	`}`
`287`	`289`	`}`
`288`	`290`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1665,7 +1665,7 @@ func TestUserForgotPassword(t *testing.T) {`
`1665`	`1665`	`require.Equal(t,userID,notif.Targets[0])`
`1666`	`1666`	`}`
`1667`	`1667`
`1668`		`-t.Run("CanChangeTheirPassword",func(t*testing.T) {`
	`1668`	`+t.Run("CanChangePassword",func(t*testing.T) {`
`1669`	`1669`	`constnewPassword="SomeNewSecurePassword!"`
`1670`	`1670`
`1671`	`1671`	`t.Parallel()`
`@@ -1813,10 +1813,10 @@ func TestUserForgotPassword(t *testing.T) {`
`1813`	`1813`	`})`
`1814`	`1814`	`require.NoError(t,err)`
`1815`	`1815`
`1816`		`-require.Equal(t,2,len(notifyEnq.Sent))`
	`1816`	`+require.Equal(t,1,len(notifyEnq.Sent))`
`1817`	`1817`
`1818`		`-notif:=notifyEnq.Sent[1]`
`1819`		`-verifyOneTimePasscodeNotification(t,notif,uuid.Nil)`
	`1818`	`+notif:=notifyEnq.Sent[0]`
	`1819`	`+require.NotEqual(t,notifications.TemplateUserRequestedOneTimePasscode,notif.TemplateID)`
`1820`	`1820`	`})`
`1821`	`1821`	`}`
`1822`	`1822`

Comments

(0)