fix: PR comments

Author: sattvikc

recipe/emailpassword/recipe.go

@@ -61,11 +61,12 @@ func MakeRecipe(recipeId string, appInfo supertokens.NormalisedAppinfo, config *
 		r.EmailDelivery = emaildelivery.MakeIngredient(verifiedConfig.GetEmailDeliveryConfig(r.RecipeImpl))
 	}
 
-	supertokens.AddPostInitCallback(func() {
+	supertokens.AddPostInitCallback(func() error {
 		emailVerificationRecipe := emailverification.GetRecipeInstance()
 		if emailVerificationRecipe != nil {
 			emailVerificationRecipe.AddGetEmailForUserIdFunc(r.getEmailForUserId)
 		}
+		return nil
 	})
 
 	return *r, nil

recipe/emailverification/evmodels/models.go

@@ -22,6 +22,13 @@ import (
 
 type TypeGetEmailForUserID func(userID string, userContext supertokens.UserContext) (TypeEmailInfo, error)
 
+type TypeMode string
+
+const (
+	ModeRequired TypeMode = "REQUIRED"
+	ModeOptional TypeMode = "OPTIONAL"
+)
+
 type TypeEmailInfo struct {
 	OK *struct {
 		Email string
@@ -31,15 +38,15 @@ type TypeEmailInfo struct {
 }
 
 type TypeInput struct {
-	Mode                     string
+	Mode                     TypeMode
 	GetEmailForUserID        TypeGetEmailForUserID
 	CreateAndSendCustomEmail func(user User, emailVerificationURLWithToken string, userContext supertokens.UserContext) // Deprecated: Use EmailDelivery instead.
 	Override                 *OverrideStruct
 	EmailDelivery            *emaildelivery.TypeInput
 }
 
 type TypeNormalisedInput struct {
-	Mode                   string
+	Mode                   TypeMode
 	GetEmailForUserID      TypeGetEmailForUserID
 	Override               OverrideStruct
 	GetEmailDeliveryConfig func() emaildelivery.TypeInputWithService

recipe/emailverification/recipe.go

@@ -123,10 +123,10 @@ func recipeInit(config evmodels.TypeInput) supertokens.Recipe {
 			}
 			singletonInstance = &recipe
 
-			supertokens.AddPostInitCallback(func() {
+			supertokens.AddPostInitCallback(func() error {
 				sessionRecipe, err := session.GetRecipeInstanceOrThrowError()
 				if err != nil {
-					return
+					return err
 				}
 
 				sessionRecipe.AddClaimFromOtherRecipe(evclaims.EmailVerificationClaim)
@@ -136,6 +136,7 @@ func recipeInit(config evmodels.TypeInput) supertokens.Recipe {
 						evclaims.EmailVerificationClaimValidators.IsVerified(nil),
 					)
 				}
+				return nil
 			})
 			return &singletonInstance.RecipeModule, nil
 		}

recipe/emailverification/utils.go

@@ -25,8 +25,8 @@ import (
 )
 
 func validateAndNormaliseUserInput(appInfo supertokens.NormalisedAppinfo, config evmodels.TypeInput) (evmodels.TypeNormalisedInput, error) {
-	if config.Mode != "REQUIRED" && config.Mode != "OPTIONAL" {
-		return evmodels.TypeNormalisedInput{}, errors.New("mode must be either REQUIRED or OPTIONAL")
+	if config.Mode != evmodels.ModeRequired && config.Mode != evmodels.ModeOptional {
+		return evmodels.TypeNormalisedInput{}, errors.New("mode must be either ModeRequired or ModeOptional")
 	}
 	typeNormalisedInput := makeTypeNormalisedInput(appInfo)
 

recipe/session/claims/claims.go

@@ -46,10 +46,10 @@ type SessionClaimValidator struct {
 
 type ClaimValidationResult struct {
 	IsValid bool
-	Reason  interface{}
+	Reason  interface{} // This can be nil, add checks when used
 }
 
 type ClaimValidationError struct {
 	ID     string
-	Reason interface{}
+	Reason interface{} // This can be nil, add checks when used
 }

recipe/session/errors/errors.go

@@ -21,6 +21,7 @@ const (
 	UnauthorizedErrorStr       = "UNAUTHORISED"
 	TryRefreshTokenErrorStr    = "TRY_REFRESH_TOKEN"
 	TokenTheftDetectedErrorStr = "TOKEN_THEFT_DETECTED"
+	InvalidClaimsErrorStr      = "INVALID_CLAIMS"
 )
 
 // TryRefreshTokenError used for when the refresh API needs to be called

supertokens/main.go

@@ -24,7 +24,10 @@ func Init(config TypeInput) error {
 	if err != nil {
 		return err
 	}
-	runPostInitCallbacks()
+	err = runPostInitCallbacks()
+	if err != nil {
+		return err
+	}
 	return nil
 }
 

supertokens/postInitCallbacks.go

@@ -1,14 +1,18 @@
 package supertokens
 
-var postInitCallbacks = []func(){}
+var postInitCallbacks = []func() error{}
 
-func AddPostInitCallback(cb func()) {
+func AddPostInitCallback(cb func() error) {
 	postInitCallbacks = append(postInitCallbacks, cb)
 }
 
-func runPostInitCallbacks() {
+func runPostInitCallbacks() error {
 	for _, cb := range postInitCallbacks {
-		cb()
+		err := cb()
+		if err != nil {
+			return err
+		}
 	}
-	postInitCallbacks = []func(){}
+	postInitCallbacks = []func() error{}
+	return nil
 }