Merge pull request #215 from supertokens/sendEmail-bug-emailpassword

fix: sendEmail override issue

Author: rishabhpoddar

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.9.10]
+-   Fixes issue where if SendEmail is overridden with a different email, it will reset that email.
+
 ## [0.9.9] - 2022-11-24
 
 ### Added:

recipe/emailpassword/emaildelivery/backwardCompatibilityService/main.go

@@ -34,6 +34,11 @@ func MakeBackwardCompatibilityService(recipeInterfaceImpl epmodels.RecipeInterfa
 			if user == nil {
 				return errors.New("should never come here")
 			}
+
+			// we add this here cause the user may have overridden the sendEmail function
+			// to change the input email and if we don't do this, the input email
+			// will get reset by the getUserById call above.
+			user.Email = input.PasswordReset.User.Email
 			sendResetPasswordEmail(*user, input.PasswordReset.PasswordResetLink, userContext)
 		} else {
 			return errors.New("should never come here")

recipe/emailpassword/emailpassword_email_test.go

@@ -48,6 +48,39 @@ func TestDefaultBackwardCompatibilityPasswordResetForEmailPasswordUser(t *testin
 	assert.NotEmpty(t, PasswordResetDataForTest.PasswordResetURLWithToken)
 }
 
+func TestDefaultBackwardCompatibilityPasswordResetForEmailPasswordUserWithSendEmailOverride(t *testing.T) {
+	BeforeEach()
+	unittesting.StartUpST("localhost", "8080")
+	defer AfterEach()
+
+	testServer := supertokensInitForTest(t,
+		session.Init(nil),
+		Init(&epmodels.TypeInput{
+			EmailDelivery: &emaildelivery.TypeInput{
+				Override: func(originalImplementation emaildelivery.EmailDeliveryInterface) emaildelivery.EmailDeliveryInterface {
+					oSendEmail := *originalImplementation.SendEmail
+					nSendEmail := func(input emaildelivery.EmailType, userContext supertokens.UserContext) error {
+						input.PasswordReset.User.Email = "[email protected]"
+						return oSendEmail(input, userContext)
+					}
+
+					*originalImplementation.SendEmail = nSendEmail
+					return originalImplementation
+				},
+			},
+		}),
+	)
+	defer testServer.Close()
+
+	SignUp("[email protected]", "1234abcd")
+	resp, err := unittesting.PasswordResetTokenRequest("[email protected]", testServer.URL)
+	assert.NoError(t, err)
+	assert.Equal(t, http.StatusOK, resp.StatusCode)
+	assert.True(t, PasswordResetEmailSentForTest)
+	assert.Equal(t, PasswordResetDataForTest.User.Email, "[email protected]")
+	assert.NotEmpty(t, PasswordResetDataForTest.PasswordResetURLWithToken)
+}
+
 func TestDefaultBackwardCompatibilityPasswordResetForNonExistantUser(t *testing.T) {
 	BeforeEach()
 	unittesting.StartUpST("localhost", "8080")

supertokens/constants.go

@@ -21,7 +21,7 @@ const (
 )
 
 // VERSION current version of the lib
-const VERSION = "0.9.9"
+const VERSION = "0.9.10"
 
 var (
 	cdiSupported = []string{"2.8", "2.9", "2.10", "2.11", "2.12", "2.13", "2.14", "2.15"}