fix: updated userroles claims changes

Author: sattvikc

recipe/userroles/claims.go

@@ -2,16 +2,17 @@ package userroles
 
 import (
 	"github.com/supertokens/supertokens-golang/recipe/session/claims"
-	urclaims "github.com/supertokens/supertokens-golang/recipe/userroles/claims"
+	"github.com/supertokens/supertokens-golang/recipe/userroles/userrolesclaims"
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
 
 func init() {
-	urclaims.UserRoleClaim = NewUserRoleClaim()
-	urclaims.PermissionClaim = NewPermissionClaim()
+	// automatically called when this package is imported
+	userrolesclaims.UserRoleClaim, userrolesclaims.UserRoleClaimValidators = NewUserRoleClaim()
+	userrolesclaims.PermissionClaim, userrolesclaims.PermissionClaimValidators = NewPermissionClaim()
 }
 
-func NewUserRoleClaim() *urclaims.TypeUserRoleClaim {
+func NewUserRoleClaim() (claims.TypeSessionClaim, userrolesclaims.TypeUserRoleClaimValidators) {
 	fetchValue := func(userId string, userContext supertokens.UserContext) (interface{}, error) {
 		recipe, err := getRecipeInstanceOrThrowError()
 		if err != nil {
@@ -29,16 +30,13 @@ func NewUserRoleClaim() *urclaims.TypeUserRoleClaim {
 		return rolesArray, nil
 	}
 
-	primitiveArrayClaim := claims.PrimitiveArrayClaim("st-role", fetchValue, nil)
-	return &urclaims.TypeUserRoleClaim{
-		TypePrimitiveArrayClaim: primitiveArrayClaim,
-		Validators: &urclaims.TypeUserRoleClaimValidators{
-			PrimitiveArrayClaimValidators: primitiveArrayClaim.Validators,
-		},
+	userRoleClaim, primitiveArrayClaimValidators := claims.PrimitiveArrayClaim("st-role", fetchValue, nil)
+	return userRoleClaim, userrolesclaims.TypeUserRoleClaimValidators{
+		PrimitiveArrayClaimValidators: primitiveArrayClaimValidators,
 	}
 }
 
-func NewPermissionClaim() *urclaims.TypePermissionClaim {
+func NewPermissionClaim() (claims.TypeSessionClaim, userrolesclaims.TypePermissionClaimValidators) {
 	fetchValue := func(userId string, userContext supertokens.UserContext) (interface{}, error) {
 		recipe, err := getRecipeInstanceOrThrowError()
 		if err != nil {
@@ -69,11 +67,8 @@ func NewPermissionClaim() *urclaims.TypePermissionClaim {
 		return result, nil
 	}
 
-	primitiveArrayClaim := claims.PrimitiveArrayClaim("st-perm", fetchValue, nil)
-	return &urclaims.TypePermissionClaim{
-		TypePrimitiveArrayClaim: primitiveArrayClaim,
-		Validators: &urclaims.TypePermissionClaimValidators{
-			PrimitiveArrayClaimValidators: primitiveArrayClaim.Validators,
-		},
+	permissionClaim, primitiveArrayClaimValidators := claims.PrimitiveArrayClaim("st-perm", fetchValue, nil)
+	return permissionClaim, userrolesclaims.TypePermissionClaimValidators{
+		PrimitiveArrayClaimValidators: primitiveArrayClaimValidators,
 	}
 }

recipe/userroles/claims/claims.go

@@ -20,7 +20,7 @@ import (
 	"net/http"
 
 	"github.com/supertokens/supertokens-golang/recipe/session"
-	"github.com/supertokens/supertokens-golang/recipe/userroles/claims"
+	"github.com/supertokens/supertokens-golang/recipe/userroles/userrolesclaims"
 	"github.com/supertokens/supertokens-golang/recipe/userroles/userrolesmodels"
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
@@ -69,19 +69,20 @@ func recipeInit(config *userrolesmodels.TypeInput) supertokens.Recipe {
 			}
 			singletonInstance = &recipe
 
-			supertokens.AddPostInitCallback(func() {
+			supertokens.AddPostInitCallback(func() error {
 				sessionRecipe, err := session.GetRecipeInstanceOrThrowError()
 				if err != nil {
-					return
+					return err
 				}
 
 				if !config.SkipAddingRolesToAccessToken {
-					sessionRecipe.AddClaimFromOtherRecipe(claims.UserRoleClaim.TypeSessionClaim)
+					sessionRecipe.AddClaimFromOtherRecipe(userrolesclaims.UserRoleClaim)
 				}
 
 				if !config.SkipAddingPermissionsToAccessToken {
-					sessionRecipe.AddClaimFromOtherRecipe(claims.PermissionClaim.TypeSessionClaim)
+					sessionRecipe.AddClaimFromOtherRecipe(userrolesclaims.PermissionClaim)
 				}
+				return nil
 			})
 
 			return &singletonInstance.RecipeModule, nil

recipe/userroles/recipe.go

@@ -0,0 +1,17 @@
+package userrolesclaims
+
+import "github.com/supertokens/supertokens-golang/recipe/session/claims"
+
+type TypeUserRoleClaimValidators struct {
+	claims.PrimitiveArrayClaimValidators
+}
+
+var UserRoleClaim claims.TypeSessionClaim
+var UserRoleClaimValidators TypeUserRoleClaimValidators
+
+type TypePermissionClaimValidators struct {
+	claims.PrimitiveArrayClaimValidators
+}
+
+var PermissionClaim claims.TypeSessionClaim
+var PermissionClaimValidators TypePermissionClaimValidators