Skip to content

Commit c8f620e

Browse files
committed
Merge branch 'session-claims-fixes' into userroles-claims
2 parents 4f61434 + 0b26af9 commit c8f620e

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

recipe/session/claims/primitiveArrayClaim.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
5555
}
5656

5757
validators := PrimitiveArrayClaimValidators{
58-
Includes: func(val interface{}, maxAgeInSeconds *int64, id *string) *SessionClaimValidator {
58+
Includes: func(val interface{}, maxAgeInSeconds *int64, id *string) SessionClaimValidator {
5959
if maxAgeInSeconds == nil {
6060
maxAgeInSeconds = defaultMaxAgeInSeconds
6161
}
6262
claimId := sessionClaim.Key
6363
if id != nil {
6464
claimId = *id
6565
}
66-
return &SessionClaimValidator{
66+
return SessionClaimValidator{
6767
ID: claimId,
6868
Claim: sessionClaim,
6969
ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
@@ -116,15 +116,15 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
116116
},
117117
}
118118
},
119-
Excludes: func(val interface{}, maxAgeInSeconds *int64, id *string) *SessionClaimValidator {
119+
Excludes: func(val interface{}, maxAgeInSeconds *int64, id *string) SessionClaimValidator {
120120
if maxAgeInSeconds == nil {
121121
maxAgeInSeconds = defaultMaxAgeInSeconds
122122
}
123123
claimId := sessionClaim.Key
124124
if id != nil {
125125
claimId = *id
126126
}
127-
return &SessionClaimValidator{
127+
return SessionClaimValidator{
128128
ID: claimId,
129129
Claim: sessionClaim,
130130
ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
@@ -177,15 +177,15 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
177177
},
178178
}
179179
},
180-
IncludesAll: func(vals []interface{}, maxAgeInSeconds *int64, id *string) *SessionClaimValidator {
180+
IncludesAll: func(vals []interface{}, maxAgeInSeconds *int64, id *string) SessionClaimValidator {
181181
if maxAgeInSeconds == nil {
182182
maxAgeInSeconds = defaultMaxAgeInSeconds
183183
}
184184
claimId := sessionClaim.Key
185185
if id != nil {
186186
claimId = *id
187187
}
188-
return &SessionClaimValidator{
188+
return SessionClaimValidator{
189189
ID: claimId,
190190
Claim: sessionClaim,
191191
ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
@@ -239,15 +239,15 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
239239
},
240240
}
241241
},
242-
ExcludesAll: func(vals []interface{}, maxAgeInSeconds *int64, id *string) *SessionClaimValidator {
242+
ExcludesAll: func(vals []interface{}, maxAgeInSeconds *int64, id *string) SessionClaimValidator {
243243
if maxAgeInSeconds == nil {
244244
maxAgeInSeconds = defaultMaxAgeInSeconds
245245
}
246246
claimId := sessionClaim.Key
247247
if id != nil {
248248
claimId = *id
249249
}
250-
return &SessionClaimValidator{
250+
return SessionClaimValidator{
251251
ID: claimId,
252252
Claim: sessionClaim,
253253
ShouldRefetch: func(payload map[string]interface{}, userContext supertokens.UserContext) bool {
@@ -307,8 +307,8 @@ func PrimitiveArrayClaim(key string, fetchValue FetchValueFunc, defaultMaxAgeInS
307307
}
308308

309309
type PrimitiveArrayClaimValidators struct {
310-
Includes func(val interface{}, maxAgeInSeconds *int64, id *string) *SessionClaimValidator
311-
Excludes func(val interface{}, maxAgeInSeconds *int64, id *string) *SessionClaimValidator
312-
IncludesAll func(vals []interface{}, maxAgeInSeconds *int64, id *string) *SessionClaimValidator
313-
ExcludesAll func(vals []interface{}, maxAgeInSeconds *int64, id *string) *SessionClaimValidator
310+
Includes func(val interface{}, maxAgeInSeconds *int64, id *string) SessionClaimValidator
311+
Excludes func(val interface{}, maxAgeInSeconds *int64, id *string) SessionClaimValidator
312+
IncludesAll func(vals []interface{}, maxAgeInSeconds *int64, id *string) SessionClaimValidator
313+
ExcludesAll func(vals []interface{}, maxAgeInSeconds *int64, id *string) SessionClaimValidator
314314
}

0 commit comments

Comments
 (0)