Skip to content

Commit 6ab9762

Browse files
sattvikcsattvikc
committed
fix: PR Comments
1 parent 815f61f commit 6ab9762

File tree

18 files changed

+189
-185
lines changed

18 files changed

+189
-185
lines changed

‎recipe/emailverification/emailverificationClaim.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
// key string, fetchValue claims.FetchValueFunc
13-
func NewEmailVerificationClaim() (*claims.TypeSessionClaim, *evclaims.TypeEmailVerificationClaimValidators) {
13+
func NewEmailVerificationClaim() (claims.TypeSessionClaim, evclaims.TypeEmailVerificationClaimValidators) {
1414
fetchValue := func(userId string, userContext supertokens.UserContext) (interface{}, error) {
1515
instance, err := getRecipeInstanceOrThrowError()
1616
if err != nil {
@@ -36,9 +36,9 @@ func NewEmailVerificationClaim() (*claims.TypeSessionClaim, *evclaims.TypeEmailV
3636

3737
evClaim, booleanClaimValidators := claims.BooleanClaim("st-ev", fetchValue, nil)
3838

39-
validators := &evclaims.TypeEmailVerificationClaimValidators{
39+
validators := evclaims.TypeEmailVerificationClaimValidators{
4040
BooleanClaimValidators: booleanClaimValidators,
41-
IsVerified: func(refetchTimeOnFalseInSeconds *int64) *claims.SessionClaimValidator {
41+
IsVerified: func(refetchTimeOnFalseInSeconds *int64) claims.SessionClaimValidator {
4242
if refetchTimeOnFalseInSeconds == nil {
4343
var defaultTimeout int64 = 10
4444
refetchTimeOnFalseInSeconds = &defaultTimeout
@@ -56,5 +56,6 @@ func NewEmailVerificationClaim() (*claims.TypeSessionClaim, *evclaims.TypeEmailV
5656
}
5757

5858
func init() {
59+
// this function is called automatically when the package is imported
5960
evclaims.EmailVerificationClaim, evclaims.EmailVerificationClaimValidators = NewEmailVerificationClaim()
6061
}

‎recipe/emailverification/evclaims/claims.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
)
66

77
type TypeEmailVerificationClaimValidators struct {
8-
*claims.BooleanClaimValidators
9-
IsVerified func(refetchTimeOnFalseInSeconds *int64) *claims.SessionClaimValidator
8+
claims.BooleanClaimValidators
9+
IsVerified func(refetchTimeOnFalseInSeconds *int64) claims.SessionClaimValidator
1010
}
1111

12-
var EmailVerificationClaim *claims.TypeSessionClaim
12+
var EmailVerificationClaim claims.TypeSessionClaim
1313

14-
var EmailVerificationClaimValidators *TypeEmailVerificationClaimValidators
14+
var EmailVerificationClaimValidators TypeEmailVerificationClaimValidators

‎recipe/emailverification/recipe.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func recipeInit(config evmodels.TypeInput) supertokens.Recipe {
133133

134134
if config.Mode == "REQUIRED" {
135135
sessionRecipe.AddClaimValidatorFromOtherRecipe(
136-
*evclaims.EmailVerificationClaimValidators.IsVerified(nil),
136+
evclaims.EmailVerificationClaimValidators.IsVerified(nil),
137137
)
138138
}
139139
})

‎recipe/session/api/implementation.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func MakeAPIImplementation() sessmodels.APIInterface {
6666
}
6767
}
6868

69-
signOutPOST := func(options sessmodels.APIOptions, sessionContainer *sessmodels.SessionContainer, userContext supertokens.UserContext) (sessmodels.SignOutPOSTResponse, error) {
69+
signOutPOST := func(sessionContainer *sessmodels.SessionContainer, options sessmodels.APIOptions, userContext supertokens.UserContext) (sessmodels.SignOutPOSTResponse, error) {
7070
if sessionContainer != nil {
7171
err := sessionContainer.RevokeSessionWithContext(userContext)
7272
if err != nil {

‎recipe/session/api/signout.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func SignOutAPI(apiImplementation sessmodels.APIInterface, options sessmodels.AP
4141
return err
4242
}
4343

44-
resp, err := (*apiImplementation.SignOutPOST)(options, sessionContainer, userContext)
44+
resp, err := (*apiImplementation.SignOutPOST)(sessionContainer, options, userContext)
4545
if err != nil {
4646
return err
4747
}

‎recipe/session/claims/booleanClaim.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package claims
22

3-
func BooleanClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (*TypeSessionClaim, *BooleanClaimValidators) {
3+
func BooleanClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (TypeSessionClaim, BooleanClaimValidators) {
44
claim, primitiveClaimValidators := PrimitiveClaim(key, fetchValue, defaultMaxAgeInSeconds)
55

6-
validators := &BooleanClaimValidators{
6+
validators := BooleanClaimValidators{
77
PrimitiveClaimValidators: primitiveClaimValidators,
88

9-
IsTrue: func(maxAgeInSeconds *int64, id *string) *SessionClaimValidator {
9+
IsTrue: func(maxAgeInSeconds *int64, id *string) SessionClaimValidator {
1010
return primitiveClaimValidators.HasValue(true, maxAgeInSeconds, id)
1111
},
1212

13-
IsFalse: func(maxAgeInSeconds *int64, id *string) *SessionClaimValidator {
13+
IsFalse: func(maxAgeInSeconds *int64, id *string) SessionClaimValidator {
1414
return primitiveClaimValidators.HasValue(false, maxAgeInSeconds, id)
1515
},
1616
}
@@ -19,7 +19,7 @@ func BooleanClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds
1919
}
2020

2121
type BooleanClaimValidators struct {
22-
*PrimitiveClaimValidators
23-
IsTrue func(maxAgeInSeconds *int64, id *string) *SessionClaimValidator
24-
IsFalse func(maxAgeInSeconds *int64, id *string) *SessionClaimValidator
22+
PrimitiveClaimValidators
23+
IsTrue func(maxAgeInSeconds *int64, id *string) SessionClaimValidator
24+
IsFalse func(maxAgeInSeconds *int64, id *string) SessionClaimValidator
2525
}

‎recipe/session/claims/claims.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"github.com/supertokens/supertokens-golang/supertokens"
55
)
66

7-
func SessionClaim(key string, fetchValue FetchValueFunc) *TypeSessionClaim {
8-
sessionClaim := &TypeSessionClaim{
7+
func SessionClaim(key string, fetchValue FetchValueFunc) TypeSessionClaim {
8+
sessionClaim := TypeSessionClaim{
99
Key: key,
1010
FetchValue: fetchValue,
1111
}

‎recipe/session/claims/primitiveArrayClaim.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/supertokens/supertokens-golang/supertokens"
77
)
88

9-
func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (*TypeSessionClaim, *PrimitiveArrayClaimValidators) {
9+
func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (TypeSessionClaim, PrimitiveArrayClaimValidators) {
1010
if defaultMaxAgeInSeconds == nil {
1111
val := int64(300)
1212
defaultMaxAgeInSeconds = &val
@@ -47,7 +47,7 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
4747
return nil
4848
}
4949

50-
validators := &PrimitiveArrayClaimValidators{
50+
validators := PrimitiveArrayClaimValidators{
5151
Includes: func(val interface{}, maxAgeInSeconds *int64, id *string) *SessionClaimValidator {
5252
if maxAgeInSeconds == nil {
5353
maxAgeInSeconds = defaultMaxAgeInSeconds
@@ -58,7 +58,7 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
5858
}
5959
return &SessionClaimValidator{
6060
ID: claimId,
61-
Claim: sessionClaim,
61+
Claim: &sessionClaim,
6262
ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
6363
claimVal, ok := sessionClaim.GetValueFromPayload(payload, userContext).([]interface{})
6464
if !ok || claimVal == nil {
@@ -119,7 +119,7 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
119119
}
120120
return &SessionClaimValidator{
121121
ID: claimId,
122-
Claim: sessionClaim,
122+
Claim: &sessionClaim,
123123
ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
124124
val, ok := sessionClaim.GetValueFromPayload(payload, userContext).([]interface{})
125125
if !ok || val == nil {
@@ -180,7 +180,7 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
180180
}
181181
return &SessionClaimValidator{
182182
ID: claimId,
183-
Claim: sessionClaim,
183+
Claim: &sessionClaim,
184184
ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
185185
val, ok := sessionClaim.GetValueFromPayload(payload, userContext).([]interface{})
186186
if !ok || val == nil {
@@ -242,7 +242,7 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
242242
}
243243
return &SessionClaimValidator{
244244
ID: claimId,
245-
Claim: sessionClaim,
245+
Claim: &sessionClaim,
246246
ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
247247
val, ok := sessionClaim.GetValueFromPayload(payload, userContext).([]interface{})
248248
if !ok || val == nil {

‎recipe/session/claims/primitiveClaim.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/supertokens/supertokens-golang/supertokens"
77
)
88

9-
func PrimitiveClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (*TypeSessionClaim, *PrimitiveClaimValidators) {
9+
func PrimitiveClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSeconds *int64) (TypeSessionClaim, PrimitiveClaimValidators) {
1010
if defaultMaxAgeInSeconds == nil {
1111
val := int64(300)
1212
defaultMaxAgeInSeconds = &val
@@ -47,24 +47,24 @@ func PrimitiveClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSecond
4747
return nil
4848
}
4949

50-
validators := &PrimitiveClaimValidators{
51-
HasValue: func(val interface{}, maxAgeInSeconds *int64, id *string) *SessionClaimValidator {
50+
validators := PrimitiveClaimValidators{
51+
HasValue: func(val interface{}, maxAgeInSeconds *int64, id *string) SessionClaimValidator {
5252
if maxAgeInSeconds == nil {
5353
maxAgeInSeconds = defaultMaxAgeInSeconds
5454
}
5555
validatorId := sessionClaim.Key
5656
if id != nil {
5757
validatorId = *id
5858
}
59-
return &SessionClaimValidator{
59+
return SessionClaimValidator{
6060
ID: validatorId,
61-
Claim: sessionClaim,
61+
Claim: &sessionClaim,
6262
ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
63-
val, ok := sessionClaim.GetValueFromPayload(payload, userContext).(map[string]interface{})
64-
if !ok || val == nil {
63+
val := sessionClaim.GetValueFromPayload(payload, userContext)
64+
if val == nil {
6565
return true
6666
}
67-
return maxAgeInSeconds != nil && val["t"].(int64) < time.Now().UnixMilli()-*maxAgeInSeconds*1000
67+
return maxAgeInSeconds != nil && *sessionClaim.GetLastRefetchTime(payload, userContext) < time.Now().UnixMilli()-*maxAgeInSeconds*1000
6868
},
6969
Validate: func(payload map[string]interface{}, userContext supertokens.UserContext) ClaimValidationResult {
7070
claimVal := sessionClaim.GetValueFromPayload(payload, userContext)
@@ -112,5 +112,5 @@ func PrimitiveClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInSecond
112112
}
113113

114114
type PrimitiveClaimValidators struct {
115-
HasValue func(val interface{}, maxAgeInSeconds *int64, id *string) *SessionClaimValidator
115+
HasValue func(val interface{}, maxAgeInSeconds *int64, id *string) SessionClaimValidator
116116
}

0 commit comments

Comments
 (0)