fix: updated getEmailForUserId and postinit callback

Author: sattvikc

recipe/thirdparty/recipe.go

@@ -20,6 +20,8 @@ import (
 	"net/http"
 
 	"github.com/supertokens/supertokens-golang/ingredients/emaildelivery"
+	"github.com/supertokens/supertokens-golang/recipe/emailverification"
+	"github.com/supertokens/supertokens-golang/recipe/emailverification/evmodels"
 	"github.com/supertokens/supertokens-golang/recipe/thirdparty/api"
 	"github.com/supertokens/supertokens-golang/recipe/thirdparty/tpmodels"
 	"github.com/supertokens/supertokens-golang/supertokens"
@@ -55,6 +57,13 @@ func MakeRecipe(recipeId string, appInfo supertokens.NormalisedAppinfo, config *
 	r.RecipeImpl = verifiedConfig.Override.Functions(MakeRecipeImplementation(*querierInstance))
 	r.Providers = config.SignInAndUpFeature.Providers
 
+	supertokens.AddPostInitCallback(func() {
+		evRecipe := emailverification.GetRecipeInstance()
+		if evRecipe != nil {
+			evRecipe.AddGetEmailForUserIdFunc(r.getEmailForUserId)
+		}
+	})
+
 	return *r, nil
 }
 
@@ -141,15 +150,21 @@ func (r *Recipe) handleError(err error, req *http.Request, res http.ResponseWrit
 	return false, err
 }
 
-func (r *Recipe) getEmailForUserId(userID string, userContext supertokens.UserContext) (string, error) {
+func (r *Recipe) getEmailForUserId(userID string, userContext supertokens.UserContext) (evmodels.TypeEmailInfo, error) {
 	userInfo, err := (*r.RecipeImpl.GetUserByID)(userID, userContext)
 	if err != nil {
-		return "", err
+		return evmodels.TypeEmailInfo{}, err
 	}
 	if userInfo == nil {
-		return "", errors.New("unknown User ID provided")
+		return evmodels.TypeEmailInfo{
+			UnknownUserIDError: &struct{}{},
+		}, nil
 	}
-	return userInfo.Email, nil
+	return evmodels.TypeEmailInfo{
+		OK: &struct{ Email string }{
+			Email: userInfo.Email,
+		},
+	}, nil
 }
 
 func ResetForTest() {

recipe/thirdpartyemailpassword/recipe.go

@@ -23,6 +23,7 @@ import (
 	"github.com/supertokens/supertokens-golang/recipe/emailpassword"
 	"github.com/supertokens/supertokens-golang/recipe/emailpassword/epmodels"
 	"github.com/supertokens/supertokens-golang/recipe/emailverification"
+	"github.com/supertokens/supertokens-golang/recipe/emailverification/evmodels"
 	"github.com/supertokens/supertokens-golang/recipe/thirdparty"
 	"github.com/supertokens/supertokens-golang/recipe/thirdparty/tpmodels"
 	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword/api"
@@ -124,6 +125,13 @@ func MakeRecipe(recipeId string, appInfo supertokens.NormalisedAppinfo, config *
 		}
 	}
 
+	supertokens.AddPostInitCallback(func() {
+		evRecipe := emailverification.GetRecipeInstance()
+		if evRecipe != nil {
+			evRecipe.AddGetEmailForUserIdFunc(r.getEmailForUserId)
+		}
+	})
+
 	return *r, nil
 }
 
@@ -208,15 +216,21 @@ func (r *Recipe) handleError(err error, req *http.Request, res http.ResponseWrit
 	return false, err
 }
 
-func (r *Recipe) getEmailForUserId(userID string, userContext supertokens.UserContext) (string, error) {
+func (r *Recipe) getEmailForUserId(userID string, userContext supertokens.UserContext) (evmodels.TypeEmailInfo, error) {
 	userInfo, err := (*r.RecipeImpl.GetUserByID)(userID, userContext)
 	if err != nil {
-		return "", err
+		return evmodels.TypeEmailInfo{}, err
 	}
 	if userInfo == nil {
-		return "", errors.New("Unknown User ID provided")
-	}
-	return userInfo.Email, nil
+		return evmodels.TypeEmailInfo{
+			UnknownUserIDError: &struct{}{},
+		}, nil
+	}
+	return evmodels.TypeEmailInfo{
+		OK: &struct{ Email string }{
+			Email: userInfo.Email,
+		},
+	}, nil
 }
 
 func ResetForTest() {

recipe/thirdpartypasswordless/recipe.go

@@ -21,6 +21,8 @@ import (
 
 	"github.com/supertokens/supertokens-golang/ingredients/emaildelivery"
 	"github.com/supertokens/supertokens-golang/ingredients/smsdelivery"
+	"github.com/supertokens/supertokens-golang/recipe/emailverification"
+	"github.com/supertokens/supertokens-golang/recipe/emailverification/evmodels"
 	"github.com/supertokens/supertokens-golang/recipe/passwordless"
 	"github.com/supertokens/supertokens-golang/recipe/passwordless/plessmodels"
 	"github.com/supertokens/supertokens-golang/recipe/thirdparty"
@@ -133,6 +135,13 @@ func MakeRecipe(recipeId string, appInfo supertokens.NormalisedAppinfo, config t
 		}
 	}
 
+	supertokens.AddPostInitCallback(func() {
+		evRecipe := emailverification.GetRecipeInstance()
+		if evRecipe != nil {
+			evRecipe.AddGetEmailForUserIdFunc(r.getEmailForUserId)
+		}
+	})
+
 	return *r, nil
 }
 
@@ -217,25 +226,37 @@ func (r *Recipe) handleError(err error, req *http.Request, res http.ResponseWrit
 	return false, err
 }
 
-func (r *Recipe) getEmailForUserIdForEmailVerification(userID string, userContext supertokens.UserContext) (string, error) {
+func (r *Recipe) getEmailForUserId(userID string, userContext supertokens.UserContext) (evmodels.TypeEmailInfo, error) {
 	userInfo, err := (*r.RecipeImpl.GetUserByID)(userID, userContext)
 	if err != nil {
-		return "", err
+		return evmodels.TypeEmailInfo{}, err
 	}
 	if userInfo == nil {
-		return "", errors.New("Unknown User ID provided")
+		return evmodels.TypeEmailInfo{
+			UnknownUserIDError: &struct{}{},
+		}, nil
 	}
 	if userInfo.ThirdParty == nil {
 		if userInfo.Email != nil {
-			return *userInfo.Email, nil
+			return evmodels.TypeEmailInfo{
+				OK: &struct{ Email string }{
+					Email: *userInfo.Email,
+				},
+			}, nil
 		}
 		// this is a passwordless user with only a phone number.
 		// returning an empty string here is not a problem since
 		// we override the email verification functions above to
 		// send that the email is already verified for passwordless users.
-		return "", nil
+		return evmodels.TypeEmailInfo{
+			EmailDoesNotExistError: &struct{}{},
+		}, nil
 	}
-	return *userInfo.Email, nil
+	return evmodels.TypeEmailInfo{
+		OK: &struct{ Email string }{
+			Email: *userInfo.Email,
+		},
+	}, nil
 }
 
 func ResetForTest() {