Merge pull request #177 from supertokens/test-fixes

fix: fixed unit test for null dropped in core

Author: rishabhpoddar

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added `UserRoleClaim` and `PermissionClaim` to user roles recipe.
 
 ### Breaking changes
+- Removes support for FDI < 1.15
 - Changed `SignInUp` third party recipe function to accept an email string instead of an object that takes `{ID: string, IsVerified: boolean}`.
 - The frontend SDK should be updated to a version supporting session claims!
   - supertokens-auth-react: >= 0.25.0

recipe/session/createNewSession_test.go

@@ -200,6 +200,17 @@ func TestMergeClaimsAndPassedAccessTokenPayload(t *testing.T) {
 		t.Error(err.Error())
 	}
 
+	querier, err := supertokens.GetNewQuerierInstanceOrThrowError("")
+	if err != nil {
+		t.Error(err.Error())
+	}
+	cdiVersion, err := querier.GetQuerierAPIVersion()
+	if err != nil {
+		t.Error(err.Error())
+	}
+
+	includesNullInPayload := unittesting.MaxVersion(cdiVersion, "2.14") != "2.14"
+
 	mux := http.NewServeMux()
 	var sessionContainer sessmodels.SessionContainer
 
@@ -223,7 +234,11 @@ func TestMergeClaimsAndPassedAccessTokenPayload(t *testing.T) {
 	assert.Equal(t, 1, len(payloadParam))
 
 	accessTokenPayload := sessionContainer.GetAccessTokenPayload()
-	assert.Equal(t, 5, len(accessTokenPayload))
+	if includesNullInPayload {
+		assert.Equal(t, 5, len(accessTokenPayload))
+	} else {
+		assert.Equal(t, 4, len(accessTokenPayload))
+	}
 
 	// We have the prop from the payload param
 	assert.Equal(t, true, accessTokenPayload["initial"])
@@ -236,5 +251,11 @@ func TestMergeClaimsAndPassedAccessTokenPayload(t *testing.T) {
 	// We have the custom claim
 	// The resulting payload is different from the input: it doesn't container nil values
 	assert.Equal(t, "asdf", accessTokenPayload["user-custom"])
-	assert.Equal(t, custom2, accessTokenPayload["user-custom2"])
+	if includesNullInPayload {
+		assert.Equal(t, custom2, accessTokenPayload["user-custom2"])
+	} else {
+		assert.Equal(t, map[string]interface{}{
+			"inner": "asdf",
+		}, accessTokenPayload["user-custom2"])
+	}
 }