Merge branch 'claims-emailpassword-changes' into session-claims

Author: sattvikc

recipe/emailpassword/api/implementation.go

@@ -37,6 +37,11 @@ func MakeAPIImplementation() epmodels.APIInterface {
 	}
 
 	generatePasswordResetTokenPOST := func(formFields []epmodels.TypeFormField, options epmodels.APIOptions, userContext supertokens.UserContext) (epmodels.GeneratePasswordResetTokenPOSTResponse, error) {
+		stInstance, err := supertokens.GetInstanceOrThrowError()
+		if err != nil {
+			return epmodels.GeneratePasswordResetTokenPOSTResponse{}, err
+		}
+
 		var email string
 		for _, formField := range formFields {
 			if formField.ID == "email" {
@@ -66,7 +71,13 @@ func MakeAPIImplementation() epmodels.APIInterface {
 			}, nil
 		}
 
-		passwordResetLink, err := options.Config.ResetPasswordUsingTokenFeature.GetResetPasswordURL(*user, userContext)
+		passwordResetLink := fmt.Sprintf(
+			"%s%s/reset-password?token=%s&rid=%s",
+			stInstance.AppInfo.WebsiteDomain.GetAsStringDangerous(),
+			stInstance.AppInfo.WebsiteBasePath.GetAsStringDangerous(),
+			response.OK.Token,
+			options.RecipeID,
+		)
 
 		if err != nil {
 			return epmodels.GeneratePasswordResetTokenPOSTResponse{}, err

recipe/emailpassword/emaildelivery/backwardCompatibilityService/main.go

@@ -21,19 +21,13 @@ import (
 
 	"github.com/supertokens/supertokens-golang/ingredients/emaildelivery"
 	"github.com/supertokens/supertokens-golang/recipe/emailpassword/epmodels"
-	emailVerificationBackwardsCompatibilityService "github.com/supertokens/supertokens-golang/recipe/emailverification/emaildelivery/backwardCompatibilityService"
 	"github.com/supertokens/supertokens-golang/recipe/emailverification/evmodels"
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
 
 func MakeBackwardCompatibilityService(recipeInterfaceImpl epmodels.RecipeInterface, appInfo supertokens.NormalisedAppinfo, sendResetPasswordEmail func(user epmodels.User, passwordResetURLWithToken string, userContext supertokens.UserContext), sendEmailVerificationEmail func(user evmodels.User, emailVerificationURLWithToken string, userContext supertokens.UserContext)) emaildelivery.EmailDeliveryInterface {
-
-	emailVerificationService := emailVerificationBackwardsCompatibilityService.MakeBackwardCompatibilityService(appInfo, sendEmailVerificationEmail)
-
 	sendEmail := func(input emaildelivery.EmailType, userContext supertokens.UserContext) error {
-		if input.EmailVerification != nil {
-			return (*emailVerificationService.SendEmail)(input, userContext)
-		} else if input.PasswordReset != nil {
+		if input.PasswordReset != nil {
 			user, err := (*recipeInterfaceImpl.GetUserByID)(input.PasswordReset.User.ID, userContext)
 			if err != nil {
 				return err

recipe/emailpassword/emaildelivery/smtpService/evServiceImplementation.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 
 	"github.com/supertokens/supertokens-golang/ingredients/emaildelivery"
-	evsmtpService "github.com/supertokens/supertokens-golang/recipe/emailverification/emaildelivery/smtpService"
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
 
@@ -31,16 +30,8 @@ func MakeSMTPService(config emaildelivery.SMTPServiceConfig) *emaildelivery.Emai
 		serviceImpl = config.Override(serviceImpl)
 	}
 
-	emailVerificationServiceImpl := evsmtpService.MakeSMTPService(emaildelivery.SMTPServiceConfig{
-		Settings: config.Settings,
-		Override: makeEmailverificationServiceImplementation(serviceImpl),
-	})
-
 	sendEmail := func(input emaildelivery.EmailType, userContext supertokens.UserContext) error {
-		if input.EmailVerification != nil {
-			return (*emailVerificationServiceImpl.SendEmail)(input, userContext)
-
-		} else if input.PasswordReset != nil {
+		if input.PasswordReset != nil {
 			content, err := (*serviceImpl.GetContent)(input, userContext)
 			if err != nil {
 				return err

recipe/emailpassword/emaildelivery/smtpService/main.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 
 	"github.com/supertokens/supertokens-golang/ingredients/emaildelivery"
-	evsmtpService "github.com/supertokens/supertokens-golang/recipe/emailverification/emaildelivery/smtpService"
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
 
@@ -29,12 +28,8 @@ func MakeServiceImplementation(settings emaildelivery.SMTPSettings) emaildeliver
 		return emaildelivery.SendSMTPEmail(settings, input)
 	}
 
-	evServiceImpl := evsmtpService.MakeServiceImplementation(settings)
-
 	getContent := func(input emaildelivery.EmailType, userContext supertokens.UserContext) (emaildelivery.EmailContent, error) {
-		if input.EmailVerification != nil {
-			return (*evServiceImpl.GetContent)(input, userContext)
-		} else if input.PasswordReset != nil {
+		if input.PasswordReset != nil {
 			return getPasswordResetEmailContent(*input.PasswordReset)
 		} else {
 			return emaildelivery.EmailContent{}, errors.New("should never come here")

recipe/emailpassword/emaildelivery/smtpService/serviceImplementation.go

@@ -58,12 +58,10 @@ type TypeNormalisedInputSignIn struct {
 }
 
 type TypeInputResetPasswordUsingTokenFeature struct {
-	GetResetPasswordURL      func(user User, userContext supertokens.UserContext) (string, error)
 	CreateAndSendCustomEmail func(user User, passwordResetURLWithToken string, userContext supertokens.UserContext) // Deprecated: Use EmailDelivery instead.
 }
 
 type TypeNormalisedInputResetPasswordUsingTokenFeature struct {
-	GetResetPasswordURL            func(user User, userContext supertokens.UserContext) (string, error)
 	FormFieldsForGenerateTokenForm []NormalisedFormField
 	FormFieldsForPasswordResetForm []NormalisedFormField
 }

recipe/emailpassword/epmodels/models.go

@@ -34,12 +34,6 @@ var PasswordResetDataForTest = struct {
 	UserContext               supertokens.UserContext
 }{}
 
-func defaultGetResetPasswordURL(appInfo supertokens.NormalisedAppinfo) func(_ epmodels.User, userContext supertokens.UserContext) (string, error) {
-	return func(_ epmodels.User, userContext supertokens.UserContext) (string, error) {
-		return appInfo.WebsiteDomain.GetAsStringDangerous() + appInfo.WebsiteBasePath.GetAsStringDangerous() + "/reset-password", nil
-	}
-}
-
 func DefaultCreateAndSendCustomPasswordResetEmail(appInfo supertokens.NormalisedAppinfo) func(user epmodels.User, passwordResetURLWithToken string, userContext supertokens.UserContext) {
 	return func(user epmodels.User, passwordResetURLWithToken string, userContext supertokens.UserContext) {
 		if supertokens.IsRunningInTestMode() {

recipe/emailpassword/passwordResetFunctions.go

@@ -33,14 +33,14 @@ func validateAndNormaliseUserInput(recipeInstance *Recipe, appInfo supertokens.N
 
 	if config != nil && config.SignUpFeature != nil {
 		typeNormalisedInput.SignUpFeature = validateAndNormaliseSignupConfig(config.SignUpFeature)
-		typeNormalisedInput.ResetPasswordUsingTokenFeature = validateAndNormaliseResetPasswordUsingTokenConfig(appInfo, typeNormalisedInput.SignUpFeature, nil)
+		typeNormalisedInput.ResetPasswordUsingTokenFeature = validateAndNormaliseResetPasswordUsingTokenConfig(typeNormalisedInput.SignUpFeature)
 	}
 
 	// we must call this after validateAndNormaliseSignupConfig
 	typeNormalisedInput.SignInFeature = validateAndNormaliseSignInConfig(typeNormalisedInput.SignUpFeature)
 
 	if config != nil && config.ResetPasswordUsingTokenFeature != nil {
-		typeNormalisedInput.ResetPasswordUsingTokenFeature = validateAndNormaliseResetPasswordUsingTokenConfig(appInfo, typeNormalisedInput.SignUpFeature, config.ResetPasswordUsingTokenFeature)
+		typeNormalisedInput.ResetPasswordUsingTokenFeature = validateAndNormaliseResetPasswordUsingTokenConfig(typeNormalisedInput.SignUpFeature)
 	}
 
 	typeNormalisedInput.GetEmailDeliveryConfig = func(recipeImpl epmodels.RecipeInterface) emaildelivery.TypeInputWithService {
@@ -82,7 +82,7 @@ func makeTypeNormalisedInput(recipeInstance *Recipe) epmodels.TypeNormalisedInpu
 	return epmodels.TypeNormalisedInput{
 		SignUpFeature:                  signUpConfig,
 		SignInFeature:                  validateAndNormaliseSignInConfig(signUpConfig),
-		ResetPasswordUsingTokenFeature: validateAndNormaliseResetPasswordUsingTokenConfig(recipeInstance.RecipeModule.GetAppInfo(), signUpConfig, nil),
+		ResetPasswordUsingTokenFeature: validateAndNormaliseResetPasswordUsingTokenConfig(signUpConfig),
 		Override: epmodels.OverrideStruct{
 			Functions: func(originalImplementation epmodels.RecipeInterface) epmodels.RecipeInterface {
 				return originalImplementation
@@ -94,11 +94,10 @@ func makeTypeNormalisedInput(recipeInstance *Recipe) epmodels.TypeNormalisedInpu
 	}
 }
 
-func validateAndNormaliseResetPasswordUsingTokenConfig(appInfo supertokens.NormalisedAppinfo, signUpConfig epmodels.TypeNormalisedInputSignUp, config *epmodels.TypeInputResetPasswordUsingTokenFeature) epmodels.TypeNormalisedInputResetPasswordUsingTokenFeature {
+func validateAndNormaliseResetPasswordUsingTokenConfig(signUpConfig epmodels.TypeNormalisedInputSignUp) epmodels.TypeNormalisedInputResetPasswordUsingTokenFeature {
 	normalisedInputResetPasswordUsingTokenFeature := epmodels.TypeNormalisedInputResetPasswordUsingTokenFeature{
 		FormFieldsForGenerateTokenForm: nil,
 		FormFieldsForPasswordResetForm: nil,
-		GetResetPasswordURL:            defaultGetResetPasswordURL(appInfo),
 	}
 
 	if len(signUpConfig.FormFields) > 0 {
@@ -118,10 +117,6 @@ func validateAndNormaliseResetPasswordUsingTokenConfig(appInfo supertokens.Norma
 		normalisedInputResetPasswordUsingTokenFeature.FormFieldsForPasswordResetForm = formFieldsForPasswordResetForm
 	}
 
-	if config != nil && config.GetResetPasswordURL != nil {
-		normalisedInputResetPasswordUsingTokenFeature.GetResetPasswordURL = config.GetResetPasswordURL
-	}
-
 	return normalisedInputResetPasswordUsingTokenFeature
 }
 func validateAndNormaliseSignInConfig(signUpConfig epmodels.TypeNormalisedInputSignUp) epmodels.TypeNormalisedInputSignIn {