Skip to content

Commit 9f11bb9

Browse files
committed
fix: PR Comments
1 parent 6ab9762 commit 9f11bb9

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

recipe/emailverification/api/implementation.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ func MakeAPIImplementation() evmodels.APIInterface {
5959
return evmodels.IsEmailVerifiedGETResponse{}, err
6060
}
6161

62-
isVerified, err := sessionContainer.GetClaimValueWithContext(evclaims.EmailVerificationClaim, userContext)
63-
if err != nil {
64-
return evmodels.IsEmailVerifiedGETResponse{}, err
65-
}
62+
isVerified := sessionContainer.GetClaimValueWithContext(evclaims.EmailVerificationClaim, userContext)
6663
if isVerified == nil {
6764
return evmodels.IsEmailVerifiedGETResponse{}, errors.New("should never come here: EmailVerificationClaim failed to set value")
6865
}

recipe/session/session.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ func newSessionContainer(config sessmodels.TypeNormalisedInput, session *Session
192192
return mergeIntoAccessTokenPayloadWithContext(update, userContext)
193193
}
194194

195-
getClaimValueWithContext := func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) (interface{}, error) {
196-
return claim.GetValueFromPayload(getAccessTokenPayloadWithContext(userContext), userContext), nil
195+
getClaimValueWithContext := func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) interface{} {
196+
return claim.GetValueFromPayload(getAccessTokenPayloadWithContext(userContext), userContext)
197197
}
198198

199199
removeClaimWithContext := func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) error {
@@ -263,7 +263,7 @@ func newSessionContainer(config sessmodels.TypeNormalisedInput, session *Session
263263
SetClaimValue: func(claim claims.TypeSessionClaim, value interface{}) error {
264264
return setClaimValueWithContext(claim, value, &map[string]interface{}{})
265265
},
266-
GetClaimValue: func(claim claims.TypeSessionClaim) (interface{}, error) {
266+
GetClaimValue: func(claim claims.TypeSessionClaim) interface{} {
267267
return getClaimValueWithContext(claim, &map[string]interface{}{})
268268
},
269269
RemoveClaim: func(claim claims.TypeSessionClaim) error {

recipe/session/sessionwithjwt/sessionContainer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func newSessionWithJWTContainer(originalSessionClass sessmodels.SessionContainer
8686
return originalSessionClass.SetClaimValueWithContext(claim, value, userContext)
8787
}
8888

89-
getClaimValueWithContext := func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) (interface{}, error) {
89+
getClaimValueWithContext := func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) interface{} {
9090
return originalSessionClass.GetClaimValueWithContext(claim, userContext)
9191
}
9292

@@ -139,7 +139,7 @@ func newSessionWithJWTContainer(originalSessionClass sessmodels.SessionContainer
139139
SetClaimValue: func(claim claims.TypeSessionClaim, value interface{}) error {
140140
return setClaimValueWithContext(claim, value, &map[string]interface{}{})
141141
},
142-
GetClaimValue: func(claim claims.TypeSessionClaim) (interface{}, error) {
142+
GetClaimValue: func(claim claims.TypeSessionClaim) interface{} {
143143
return getClaimValueWithContext(claim, &map[string]interface{}{})
144144
},
145145
RemoveClaim: func(claim claims.TypeSessionClaim) error {

recipe/session/sessmodels/models.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,15 @@ type SessionContainer struct {
184184
AssertClaimsWithContext func(claimValidators []claims.SessionClaimValidator, userContext supertokens.UserContext) error
185185
FetchAndSetClaimWithContext func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) error
186186
SetClaimValueWithContext func(claim claims.TypeSessionClaim, value interface{}, userContext supertokens.UserContext) error
187-
GetClaimValueWithContext func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) (interface{}, error)
187+
GetClaimValueWithContext func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) interface{}
188188
RemoveClaimWithContext func(claim claims.TypeSessionClaim, userContext supertokens.UserContext) error
189189

190190
MergeIntoAccessTokenPayload func(accessTokenPayloadUpdate map[string]interface{}) error
191191

192192
AssertClaims func(claimValidators []claims.SessionClaimValidator) error
193193
FetchAndSetClaim func(claim claims.TypeSessionClaim) error
194194
SetClaimValue func(claim claims.TypeSessionClaim, value interface{}) error
195-
GetClaimValue func(claim claims.TypeSessionClaim) (interface{}, error)
195+
GetClaimValue func(claim claims.TypeSessionClaim) interface{}
196196
RemoveClaim func(claim claims.TypeSessionClaim) error
197197
}
198198

0 commit comments

Comments
 (0)