fix: fixes to make tests work in ep and ev

sattvikc · sattvikc · commit 2726e5771cdf · 2022-08-30T17:52:36.000+05:30
diff --git a/recipe/emailpassword/emailExistsAndVerificationCheck_test.go b/recipe/emailpassword/emailExistsAndVerificationCheck_test.go
@@ -491,6 +491,9 @@ func TestGenerateTokenAPIWithValidInputNoSessionAndCheckOutput(t *testing.T) {
 			WebsiteDomain: "supertokens.io",
 		},
 		RecipeList: []supertokens.Recipe{
+			emailverification.Init(evmodels.TypeInput{
+				Mode: evmodels.ModeOptional,
+			}),
 			Init(nil),
 			session.Init(&sessmodels.TypeInput{
 				AntiCsrf: &customAntiCsrfVal,
diff --git a/recipe/emailpassword/emailpassword_email_test.go b/recipe/emailpassword/emailpassword_email_test.go
@@ -350,7 +350,7 @@ func TestDefaultBackwardCompatibilityEmailVerifyForEmailPasswordUser(t *testing.
 	unittesting.StartUpST("localhost", "8080")
 	defer AfterEach()
 
-	testServer := supertokensInitForTest(t, session.Init(nil), Init(nil))
+	testServer := supertokensInitForTest(t, session.Init(nil), Init(nil), emailverification.Init(evmodels.TypeInput{Mode: evmodels.ModeOptional}))
 	defer testServer.Close()
 
 	resp, err := unittesting.SignupRequest("test@example.com", "1234abcd", testServer.URL)
@@ -380,6 +380,7 @@ func TestBackwardCompatibilityEmailVerifyForEmailPasswordUser(t *testing.T) {
 		t,
 		session.Init(nil),
 		emailverification.Init(evmodels.TypeInput{
+			Mode: evmodels.ModeOptional,
 			CreateAndSendCustomEmail: func(user evmodels.User, emailVerificationURLWithToken string, userContext supertokens.UserContext) {
 				email = user.Email
 				emailVerifyLink = emailVerificationURLWithToken
@@ -418,22 +419,26 @@ func TestCustomOverrideEmailVerifyForEmailPasswordUser(t *testing.T) {
 	email := ""
 	emailVerifyLink := ""
 
-	tpepConfig := &epmodels.TypeInput{
-		EmailDelivery: &emaildelivery.TypeInput{
-			Override: func(originalImplementation emaildelivery.EmailDeliveryInterface) emaildelivery.EmailDeliveryInterface {
-				*originalImplementation.SendEmail = func(input emaildelivery.EmailType, userContext supertokens.UserContext) error {
-					if input.EmailVerification != nil {
-						customCalled = true
-						email = input.EmailVerification.User.Email
-						emailVerifyLink = input.EmailVerification.EmailVerifyLink
+	testServer := supertokensInitForTest(t,
+		session.Init(nil),
+		Init(nil),
+		emailverification.Init(evmodels.TypeInput{
+			Mode: evmodels.ModeOptional,
+			EmailDelivery: &emaildelivery.TypeInput{
+				Override: func(originalImplementation emaildelivery.EmailDeliveryInterface) emaildelivery.EmailDeliveryInterface {
+					*originalImplementation.SendEmail = func(input emaildelivery.EmailType, userContext supertokens.UserContext) error {
+						if input.EmailVerification != nil {
+							customCalled = true
+							email = input.EmailVerification.User.Email
+							emailVerifyLink = input.EmailVerification.EmailVerifyLink
+						}
+						return nil
 					}
-					return nil
-				}
-				return originalImplementation
+					return originalImplementation
+				},
 			},
-		},
-	}
-	testServer := supertokensInitForTest(t, session.Init(nil), Init(tpepConfig))
+		}),
+	)
 	defer testServer.Close()
 
 	resp, err := unittesting.SignupRequest("test@example.com", "1234abcd", testServer.URL)
@@ -492,12 +497,16 @@ func TestSMTPOverrideEmailVerifyForEmailPasswordUser(t *testing.T) {
 			return originalImplementation
 		},
 	})
-	tpepConfig := &epmodels.TypeInput{
-		EmailDelivery: &emaildelivery.TypeInput{
-			Service: smtpService,
-		},
-	}
-	testServer := supertokensInitForTest(t, session.Init(nil), Init(tpepConfig))
+	testServer := supertokensInitForTest(t,
+		session.Init(nil),
+		Init(nil),
+		emailverification.Init(evmodels.TypeInput{
+			Mode: evmodels.ModeOptional,
+			EmailDelivery: &emaildelivery.TypeInput{
+				Service: smtpService,
+			},
+		}),
+	)
 	defer testServer.Close()
 
 	resp, err := unittesting.SignupRequest("test@example.com", "1234abcd", testServer.URL)
diff --git a/recipe/emailpassword/recipe.go b/recipe/emailpassword/recipe.go
@@ -180,7 +180,7 @@ func (r *Recipe) handleError(err error, req *http.Request, res http.ResponseWrit
 			"formFields": errs.Payload,
 		})
 	}
-	return false, err
+	return false, nil
 }
 
 func (r *Recipe) getEmailForUserId(userID string, userContext supertokens.UserContext) (evmodels.TypeEmailInfo, error) {
diff --git a/recipe/emailverification/emailverificationClaim.go b/recipe/emailverification/emailverificationClaim.go
@@ -10,7 +10,7 @@ import (
 )
 
 // key string, fetchValue claims.FetchValueFunc
-func NewEmailVerificationClaim() (claims.TypeSessionClaim, evclaims.TypeEmailVerificationClaimValidators) {
+func NewEmailVerificationClaim() (*claims.TypeSessionClaim, evclaims.TypeEmailVerificationClaimValidators) {
 	fetchValue := func(userId string, userContext supertokens.UserContext) (interface{}, error) {
 		instance, err := getRecipeInstanceOrThrowError()
 		if err != nil {
diff --git a/recipe/emailverification/emailverification_email_test.go b/recipe/emailverification/emailverification_email_test.go
@@ -37,9 +37,13 @@ func TestBackwardCompatibilityServiceWithoutCustomFunction(t *testing.T) {
 		},
 		RecipeList: []supertokens.Recipe{
 			Init(evmodels.TypeInput{
-				Mode: "OPTIONAL",
+				Mode: evmodels.ModeOptional,
 				GetEmailForUserID: func(userID string, userContext supertokens.UserContext) (evmodels.TypeEmailInfo, error) {
-					return evmodels.TypeEmailInfo{}, nil
+					return evmodels.TypeEmailInfo{
+						OK: &struct{ Email string }{
+							Email: "someEmail",
+						},
+					}, nil
 				},
 			}),
 		},
diff --git a/recipe/emailverification/evclaims/claims.go b/recipe/emailverification/evclaims/claims.go
@@ -9,6 +9,6 @@ type TypeEmailVerificationClaimValidators struct {
 	IsVerified func(refetchTimeOnFalseInSeconds *int64) claims.SessionClaimValidator
 }
 
-var EmailVerificationClaim claims.TypeSessionClaim
+var EmailVerificationClaim *claims.TypeSessionClaim
 
 var EmailVerificationClaimValidators TypeEmailVerificationClaimValidators
diff --git a/recipe/emailverification/recipe.go b/recipe/emailverification/recipe.go
@@ -90,6 +90,9 @@ func MakeRecipe(recipeId string, appInfo supertokens.NormalisedAppinfo, config e
 			if emailRes.UnknownUserIDError != nil {
 				return emailRes, nil
 			}
+			if emailRes.OK != nil {
+				return emailRes, nil
+			}
 		}
 		return evmodels.TypeEmailInfo{
 			UnknownUserIDError: &struct{}{},
@@ -124,17 +127,15 @@ func recipeInit(config evmodels.TypeInput) supertokens.Recipe {
 			singletonInstance = &recipe
 
 			supertokens.AddPostInitCallback(func() error {
-				sessionRecipe, err := session.GetRecipeInstanceOrThrowError()
-				if err != nil {
-					return err
-				}
-
-				sessionRecipe.AddClaimFromOtherRecipe(evclaims.EmailVerificationClaim)
-
-				if config.Mode == "REQUIRED" {
-					sessionRecipe.AddClaimValidatorFromOtherRecipe(
-						evclaims.EmailVerificationClaimValidators.IsVerified(nil),
-					)
+				sessionRecipe := session.GetRecipeInstance()
+				if sessionRecipe != nil {
+					sessionRecipe.AddClaimFromOtherRecipe(evclaims.EmailVerificationClaim)
+
+					if config.Mode == "REQUIRED" {
+						sessionRecipe.AddClaimValidatorFromOtherRecipe(
+							evclaims.EmailVerificationClaimValidators.IsVerified(nil),
+						)
+					}
 				}
 				return nil
 			})
diff --git a/recipe/session/claims/booleanClaim.go b/recipe/session/claims/booleanClaim.go
@@ -1,6 +1,6 @@
 package claims
 
-func BooleanClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (TypeSessionClaim, BooleanClaimValidators) {
+func BooleanClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (*TypeSessionClaim, BooleanClaimValidators) {
 	claim, primitiveClaimValidators := PrimitiveClaim(key, fetchValue, defaultMaxAgeInSeconds)
 
 	validators := BooleanClaimValidators{
diff --git a/recipe/session/claims/claims.go b/recipe/session/claims/claims.go
@@ -4,8 +4,8 @@ import (
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
 
-func SessionClaim(key string, fetchValue FetchValueFunc) TypeSessionClaim {
-	sessionClaim := TypeSessionClaim{
+func SessionClaim(key string, fetchValue FetchValueFunc) *TypeSessionClaim {
+	sessionClaim := &TypeSessionClaim{
 		Key:        key,
 		FetchValue: fetchValue,
 	}
diff --git a/recipe/session/claims/primitiveArrayClaim.go b/recipe/session/claims/primitiveArrayClaim.go
@@ -6,7 +6,7 @@ import (
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
 
-func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (TypeSessionClaim, PrimitiveArrayClaimValidators) {
+func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (*TypeSessionClaim, PrimitiveArrayClaimValidators) {
 	if defaultMaxAgeInSeconds == nil {
 		val := int64(300)
 		defaultMaxAgeInSeconds = &val
@@ -58,7 +58,7 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
 			}
 			return &SessionClaimValidator{
 				ID:    claimId,
-				Claim: &sessionClaim,
+				Claim: sessionClaim,
 				ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
 					claimVal, ok := sessionClaim.GetValueFromPayload(payload, userContext).([]interface{})
 					if !ok || claimVal == nil {
@@ -119,7 +119,7 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
 			}
 			return &SessionClaimValidator{
 				ID:    claimId,
-				Claim: &sessionClaim,
+				Claim: sessionClaim,
 				ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
 					val, ok := sessionClaim.GetValueFromPayload(payload, userContext).([]interface{})
 					if !ok || val == nil {
@@ -180,7 +180,7 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
 			}
 			return &SessionClaimValidator{
 				ID:    claimId,
-				Claim: &sessionClaim,
+				Claim: sessionClaim,
 				ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
 					val, ok := sessionClaim.GetValueFromPayload(payload, userContext).([]interface{})
 					if !ok || val == nil {
@@ -242,7 +242,7 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
 			}
 			return &SessionClaimValidator{
 				ID:    claimId,
-				Claim: &sessionClaim,
+				Claim: sessionClaim,
 				ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
 					val, ok := sessionClaim.GetValueFromPayload(payload, userContext).([]interface{})
 					if !ok || val == nil {
diff --git a/recipe/session/claims/primitiveClaim.go b/recipe/session/claims/primitiveClaim.go
@@ -6,7 +6,7 @@ import (
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
 
-func PrimitiveClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (TypeSessionClaim, PrimitiveClaimValidators) {
+func PrimitiveClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (*TypeSessionClaim, PrimitiveClaimValidators) {
 	if defaultMaxAgeInSeconds == nil {
 		val := int64(300)
 		defaultMaxAgeInSeconds = &val
@@ -58,7 +58,7 @@ func PrimitiveClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSecond
 			}
 			return SessionClaimValidator{
 				ID:    validatorId,
-				Claim: &sessionClaim,
+				Claim: sessionClaim,
 				ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
 					val := sessionClaim.GetValueFromPayload(payload, userContext)
 					if val == nil {
diff --git a/recipe/session/recipe.go b/recipe/session/recipe.go
@@ -37,7 +37,7 @@ type Recipe struct {
 	OpenIdRecipe *openid.Recipe
 	APIImpl      sessmodels.APIInterface
 
-	claimsAddedByOtherRecipes          []claims.TypeSessionClaim
+	claimsAddedByOtherRecipes          []*claims.TypeSessionClaim
 	claimValidatorsAddedByOtherRecipes []claims.SessionClaimValidator
 }
 
@@ -47,7 +47,7 @@ var singletonInstance *Recipe
 
 func MakeRecipe(recipeId string, appInfo supertokens.NormalisedAppinfo, config *sessmodels.TypeInput, onSuperTokensAPIError func(err error, req *http.Request, res http.ResponseWriter)) (Recipe, error) {
 	r := &Recipe{
-		claimsAddedByOtherRecipes:          []claims.TypeSessionClaim{},
+		claimsAddedByOtherRecipes:          []*claims.TypeSessionClaim{},
 		claimValidatorsAddedByOtherRecipes: []claims.SessionClaimValidator{},
 	}
 
@@ -106,6 +106,10 @@ func GetRecipeInstanceOrThrowError() (*Recipe, error) {
 	return getRecipeInstanceOrThrowError()
 }
 
+func GetRecipeInstance() *Recipe {
+	return singletonInstance
+}
+
 func recipeInit(config *sessmodels.TypeInput) supertokens.Recipe {
 	return func(appInfo supertokens.NormalisedAppinfo, onSuperTokensAPIError func(err error, req *http.Request, res http.ResponseWriter)) (*supertokens.RecipeModule, error) {
 		if singletonInstance == nil {
@@ -205,7 +209,7 @@ func (r *Recipe) handleError(err error, req *http.Request, res http.ResponseWrit
 }
 
 // Claim functions
-func (r *Recipe) AddClaimFromOtherRecipe(claim claims.TypeSessionClaim) error {
+func (r *Recipe) AddClaimFromOtherRecipe(claim *claims.TypeSessionClaim) error {
 	for _, existingClaim := range r.claimsAddedByOtherRecipes {
 		if claim.Key == existingClaim.Key {
 			return defaultErrors.New("claim already added by other recipe")
@@ -215,7 +219,7 @@ func (r *Recipe) AddClaimFromOtherRecipe(claim claims.TypeSessionClaim) error {
 	return nil
 }
 
-func (r *Recipe) getClaimsAddedByOtherRecipes() []claims.TypeSessionClaim {
+func (r *Recipe) getClaimsAddedByOtherRecipes() []*claims.TypeSessionClaim {
 	return r.claimsAddedByOtherRecipes
 }
 
diff --git a/recipe/session/session.go b/recipe/session/session.go
@@ -179,24 +179,24 @@ func newSessionContainer(config sessmodels.TypeNormalisedInput, session *Session
 		return nil
 	}
 
-	fetchAndSetClaimWithContext := func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) error {
+	fetchAndSetClaimWithContext := func(claim *claims.TypeSessionClaim, userContext supertokens.UserContext) error {
 		update, err := claim.Build(getUserIDWithContext(userContext), userContext)
 		if err != nil {
 			return err
 		}
 		return mergeIntoAccessTokenPayloadWithContext(update, userContext)
 	}
 
-	setClaimValueWithContext := func(claim claims.TypeSessionClaim, value interface{}, userContext supertokens.UserContext) error {
+	setClaimValueWithContext := func(claim *claims.TypeSessionClaim, value interface{}, userContext supertokens.UserContext) error {
 		update := claim.AddToPayload_internal(map[string]interface{}{}, value, userContext)
 		return mergeIntoAccessTokenPayloadWithContext(update, userContext)
 	}
 
-	getClaimValueWithContext := func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) interface{} {
+	getClaimValueWithContext := func(claim *claims.TypeSessionClaim, userContext supertokens.UserContext) interface{} {
 		return claim.GetValueFromPayload(getAccessTokenPayloadWithContext(userContext), userContext)
 	}
 
-	removeClaimWithContext := func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) error {
+	removeClaimWithContext := func(claim *claims.TypeSessionClaim, userContext supertokens.UserContext) error {
 		update := claim.RemoveFromPayloadByMerge_internal(map[string]interface{}{}, userContext)
 		return mergeIntoAccessTokenPayloadWithContext(update, userContext)
 	}
@@ -257,16 +257,16 @@ func newSessionContainer(config sessmodels.TypeNormalisedInput, session *Session
 		AssertClaims: func(claimValidators []claims.SessionClaimValidator) error {
 			return assertClaimsWithContext(claimValidators, &map[string]interface{}{})
 		},
-		FetchAndSetClaim: func(claim claims.TypeSessionClaim) error {
+		FetchAndSetClaim: func(claim *claims.TypeSessionClaim) error {
 			return fetchAndSetClaimWithContext(claim, &map[string]interface{}{})
 		},
-		SetClaimValue: func(claim claims.TypeSessionClaim, value interface{}) error {
+		SetClaimValue: func(claim *claims.TypeSessionClaim, value interface{}) error {
 			return setClaimValueWithContext(claim, value, &map[string]interface{}{})
 		},
-		GetClaimValue: func(claim claims.TypeSessionClaim) interface{} {
+		GetClaimValue: func(claim *claims.TypeSessionClaim) interface{} {
 			return getClaimValueWithContext(claim, &map[string]interface{}{})
 		},
-		RemoveClaim: func(claim claims.TypeSessionClaim) error {
+		RemoveClaim: func(claim *claims.TypeSessionClaim) error {
 			return removeClaimWithContext(claim, &map[string]interface{}{})
 		},
 	}
diff --git a/recipe/session/sessionwithjwt/sessionContainer.go b/recipe/session/sessionwithjwt/sessionContainer.go
@@ -78,19 +78,19 @@ func newSessionWithJWTContainer(originalSessionClass sessmodels.SessionContainer
 		return originalSessionClass.AssertClaimsWithContext(claimValidators, userContext)
 	}
 
-	fetchAndSetClaimWithContext := func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) error {
+	fetchAndSetClaimWithContext := func(claim *claims.TypeSessionClaim, userContext supertokens.UserContext) error {
 		return originalSessionClass.FetchAndSetClaimWithContext(claim, userContext)
 	}
 
-	setClaimValueWithContext := func(claim claims.TypeSessionClaim, value interface{}, userContext supertokens.UserContext) error {
+	setClaimValueWithContext := func(claim *claims.TypeSessionClaim, value interface{}, userContext supertokens.UserContext) error {
 		return originalSessionClass.SetClaimValueWithContext(claim, value, userContext)
 	}
 
-	getClaimValueWithContext := func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) interface{} {
+	getClaimValueWithContext := func(claim *claims.TypeSessionClaim, userContext supertokens.UserContext) interface{} {
 		return originalSessionClass.GetClaimValueWithContext(claim, userContext)
 	}
 
-	removeClaimWithContext := func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) error {
+	removeClaimWithContext := func(claim *claims.TypeSessionClaim, userContext supertokens.UserContext) error {
 		return originalSessionClass.RemoveClaimWithContext(claim, userContext)
 	}
 
@@ -133,16 +133,16 @@ func newSessionWithJWTContainer(originalSessionClass sessmodels.SessionContainer
 		AssertClaims: func(claimValidators []claims.SessionClaimValidator) error {
 			return assertClaimsWithContext(claimValidators, &map[string]interface{}{})
 		},
-		FetchAndSetClaim: func(claim claims.TypeSessionClaim) error {
+		FetchAndSetClaim: func(claim *claims.TypeSessionClaim) error {
 			return fetchAndSetClaimWithContext(claim, &map[string]interface{}{})
 		},
-		SetClaimValue: func(claim claims.TypeSessionClaim, value interface{}) error {
+		SetClaimValue: func(claim *claims.TypeSessionClaim, value interface{}) error {
 			return setClaimValueWithContext(claim, value, &map[string]interface{}{})
 		},
-		GetClaimValue: func(claim claims.TypeSessionClaim) interface{} {
+		GetClaimValue: func(claim *claims.TypeSessionClaim) interface{} {
 			return getClaimValueWithContext(claim, &map[string]interface{}{})
 		},
-		RemoveClaim: func(claim claims.TypeSessionClaim) error {
+		RemoveClaim: func(claim *claims.TypeSessionClaim) error {
 			return removeClaimWithContext(claim, &map[string]interface{}{})
 		},
 	}
diff --git a/recipe/session/sessmodels/models.go b/recipe/session/sessmodels/models.go

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ func (r Recipe) handleError(err error, req http.Request, res http.ResponseWrit`
`180`	`180`	`"formFields": errs.Payload,`
`181`	`181`	`})`
`182`	`182`	`}`
`183`		`- return false, err`
	`183`	`+ return false, nil`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`func (r *Recipe) getEmailForUserId(userID string, userContext supertokens.UserContext) (evmodels.TypeEmailInfo, error) {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// key string, fetchValue claims.FetchValueFunc`
`13`		`-func NewEmailVerificationClaim() (claims.TypeSessionClaim, evclaims.TypeEmailVerificationClaimValidators) {`
	`13`	`+func NewEmailVerificationClaim() (*claims.TypeSessionClaim, evclaims.TypeEmailVerificationClaimValidators) {`
`14`	`14`	`fetchValue := func(userId string, userContext supertokens.UserContext) (interface{}, error) {`
`15`	`15`	`instance, err := getRecipeInstanceOrThrowError()`
`16`	`16`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ type TypeEmailVerificationClaimValidators struct {`
`9`	`9`	`IsVerified func(refetchTimeOnFalseInSeconds *int64) claims.SessionClaimValidator`
`10`	`10`	`}`
`11`	`11`
`12`		`-var EmailVerificationClaim claims.TypeSessionClaim`
	`12`	`+var EmailVerificationClaim *claims.TypeSessionClaim`
`13`	`13`
`14`	`14`	`var EmailVerificationClaimValidators TypeEmailVerificationClaimValidators`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"github.com/supertokens/supertokens-golang/supertokens"`
`5`	`5`	`)`
`6`	`6`
`7`		`-func SessionClaim(key string, fetchValue FetchValueFunc) TypeSessionClaim {`
`8`		`- sessionClaim := TypeSessionClaim{`
	`7`	`+func SessionClaim(key string, fetchValue FetchValueFunc) *TypeSessionClaim {`
	`8`	`+ sessionClaim := &TypeSessionClaim{`
`9`	`9`	`Key: key,`
`10`	`10`	`FetchValue: fetchValue,`
`11`	`11`	`}`