Merge pull request #252 from supertokens/cdi-check

nkshah2 · web-flow · commit 433b317f455b · 2023-03-31T16:39:15.000+05:30
feat: Cdi check
diff --git a/recipe/dashboard/api/implementation.go b/recipe/dashboard/api/implementation.go
@@ -16,6 +16,8 @@
 package api
 
 import (
+	"strconv"
+
 	"github.com/supertokens/supertokens-golang/recipe/dashboard/dashboardmodels"
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
@@ -52,6 +54,19 @@ func MakeAPIImplementation() dashboardmodels.APIInterface {
 
 		authMode := string(options.Config.AuthMode)
 
+		isSearchEnabled := false
+		querier, err := supertokens.GetNewQuerierInstanceOrThrowError(options.RecipeID)
+		if err != nil {
+			return "", err
+		}
+		cdiVersion, err := querier.GetQuerierAPIVersion()
+		if err != nil {
+			return "", err
+		}
+		if supertokens.MaxVersion(cdiVersion, "2.20") == "2.20" {
+			isSearchEnabled = true
+		}
+
 		return `
 		<html>
 		<head>
@@ -61,6 +76,7 @@ func MakeAPIImplementation() dashboardmodels.APIInterface {
 						window.dashboardAppPath = "` + dashboardAppPath + `"
 						window.connectionURI = "` + connectionURI + `"
 						window.authMode = "` + authMode + `"
+						window.isSearchEnabled = "` + strconv.FormatBool(isSearchEnabled) + `"
 				</script>
 				<script defer src="` + bundleDomain + `/static/js/bundle.js"></script></head>
 				<link href="` + bundleDomain + `/static/css/main.css" rel="stylesheet" type="text/css">
diff --git a/supertokens/supertokens.go b/supertokens/supertokens.go
@@ -396,7 +396,7 @@ func deleteUser(userId string) error {
 		return err
 	}
 
-	if maxVersion(cdiVersion, "2.10") == cdiVersion {
+	if MaxVersion(cdiVersion, "2.10") == cdiVersion {
 		_, err = querier.SendPostRequest("/user/remove", map[string]interface{}{
 			"userId": userId,
 		})
diff --git a/supertokens/userIdMapping.go b/supertokens/userIdMapping.go
@@ -30,7 +30,7 @@ func CreateUserIdMapping(supertokensUserId string, externalUserId string, extern
 	if err != nil {
 		return CreateUserIdMappingResult{}, err
 	}
-	if maxVersion(cdiVersion, "2.15") != cdiVersion {
+	if MaxVersion(cdiVersion, "2.15") != cdiVersion {
 		return CreateUserIdMappingResult{}, errors.New("Please upgrade the SuperTokens core to >= 3.15.0")
 	}
 
@@ -88,7 +88,7 @@ func GetUserIdMapping(userId string, userIdType *UserIdType) (GetUserIdMappingRe
 	if err != nil {
 		return GetUserIdMappingResult{}, err
 	}
-	if maxVersion(cdiVersion, "2.15") != cdiVersion {
+	if MaxVersion(cdiVersion, "2.15") != cdiVersion {
 		return GetUserIdMappingResult{}, errors.New("Please upgrade the SuperTokens core to >= 3.15.0")
 	}
 
@@ -140,7 +140,7 @@ func DeleteUserIdMapping(userId string, userIdType *UserIdType, force *bool) (De
 	if err != nil {
 		return DeleteUserIdMappingResult{}, err
 	}
-	if maxVersion(cdiVersion, "2.15") != cdiVersion {
+	if MaxVersion(cdiVersion, "2.15") != cdiVersion {
 		return DeleteUserIdMappingResult{}, errors.New("Please upgrade the SuperTokens core to >= 3.15.0")
 	}
 
@@ -178,7 +178,7 @@ func UpdateOrDeleteUserIdMappingInfo(userId string, userIdType *UserIdType, exte
 	if err != nil {
 		return UpdateOrDeleteUserIdMappingInfoResult{}, err
 	}
-	if maxVersion(cdiVersion, "2.15") != cdiVersion {
+	if MaxVersion(cdiVersion, "2.15") != cdiVersion {
 		return UpdateOrDeleteUserIdMappingInfoResult{}, errors.New("Please upgrade the SuperTokens core to >= 3.15.0")
 	}
 
diff --git a/supertokens/utils.go b/supertokens/utils.go
@@ -123,13 +123,13 @@ func getLargestVersionFromIntersection(v1 []string, v2 []string) *string {
 	}
 	maxVersionSoFar := intersection[0]
 	for i := 1; i < len(intersection); i++ {
-		maxVersionSoFar = maxVersion(intersection[i], maxVersionSoFar)
+		maxVersionSoFar = MaxVersion(intersection[i], maxVersionSoFar)
 	}
 	return &maxVersionSoFar
 }
 
 // MaxVersion returns max of v1 and v2
-func maxVersion(version1 string, version2 string) string {
+func MaxVersion(version1 string, version2 string) string {
 	var splittedv1 = strings.Split(version1, ".")
 	var splittedv2 = strings.Split(version2, ".")
 	var minLength = len(splittedv1)

Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ func deleteUser(userId string) error {`
`396`	`396`	`return err`
`397`	`397`	`}`
`398`	`398`
`399`		`- if maxVersion(cdiVersion, "2.10") == cdiVersion {`
	`399`	`+ if MaxVersion(cdiVersion, "2.10") == cdiVersion {`
`400`	`400`	`_, err = querier.SendPostRequest("/user/remove", map[string]interface{}{`
`401`	`401`	`"userId": userId,`
`402`	`402`	`})`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func CreateUserIdMapping(supertokensUserId string, externalUserId string, extern`
`30`	`30`	`if err != nil {`
`31`	`31`	`return CreateUserIdMappingResult{}, err`
`32`	`32`	`}`
`33`		`- if maxVersion(cdiVersion, "2.15") != cdiVersion {`
	`33`	`+ if MaxVersion(cdiVersion, "2.15") != cdiVersion {`
`34`	`34`	`return CreateUserIdMappingResult{}, errors.New("Please upgrade the SuperTokens core to >= 3.15.0")`
`35`	`35`	`}`
`36`	`36`
`@@ -88,7 +88,7 @@ func GetUserIdMapping(userId string, userIdType *UserIdType) (GetUserIdMappingRe`
`88`	`88`	`if err != nil {`
`89`	`89`	`return GetUserIdMappingResult{}, err`
`90`	`90`	`}`
`91`		`- if maxVersion(cdiVersion, "2.15") != cdiVersion {`
	`91`	`+ if MaxVersion(cdiVersion, "2.15") != cdiVersion {`
`92`	`92`	`return GetUserIdMappingResult{}, errors.New("Please upgrade the SuperTokens core to >= 3.15.0")`
`93`	`93`	`}`
`94`	`94`
`@@ -140,7 +140,7 @@ func DeleteUserIdMapping(userId string, userIdType UserIdType, force bool) (De`
`140`	`140`	`if err != nil {`
`141`	`141`	`return DeleteUserIdMappingResult{}, err`
`142`	`142`	`}`
`143`		`- if maxVersion(cdiVersion, "2.15") != cdiVersion {`
	`143`	`+ if MaxVersion(cdiVersion, "2.15") != cdiVersion {`
`144`	`144`	`return DeleteUserIdMappingResult{}, errors.New("Please upgrade the SuperTokens core to >= 3.15.0")`
`145`	`145`	`}`
`146`	`146`
`@@ -178,7 +178,7 @@ func UpdateOrDeleteUserIdMappingInfo(userId string, userIdType *UserIdType, exte`
`178`	`178`	`if err != nil {`
`179`	`179`	`return UpdateOrDeleteUserIdMappingInfoResult{}, err`
`180`	`180`	`}`
`181`		`- if maxVersion(cdiVersion, "2.15") != cdiVersion {`
	`181`	`+ if MaxVersion(cdiVersion, "2.15") != cdiVersion {`
`182`	`182`	`return UpdateOrDeleteUserIdMappingInfoResult{}, errors.New("Please upgrade the SuperTokens core to >= 3.15.0")`
`183`	`183`	`}`
`184`	`184`
Original file line number	Diff line number	Diff line change
`@@ -123,13 +123,13 @@ func getLargestVersionFromIntersection(v1 []string, v2 []string) *string {`
`123`	`123`	`}`
`124`	`124`	`maxVersionSoFar := intersection[0]`
`125`	`125`	`for i := 1; i < len(intersection); i++ {`
`126`		`- maxVersionSoFar = maxVersion(intersection[i], maxVersionSoFar)`
	`126`	`+ maxVersionSoFar = MaxVersion(intersection[i], maxVersionSoFar)`
`127`	`127`	`}`
`128`	`128`	`return &maxVersionSoFar`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`// MaxVersion returns max of v1 and v2`
`132`		`-func maxVersion(version1 string, version2 string) string {`
	`132`	`+func MaxVersion(version1 string, version2 string) string {`
`133`	`133`	`var splittedv1 = strings.Split(version1, ".")`
`134`	`134`	`var splittedv2 = strings.Split(version2, ".")`
`135`	`135`	`var minLength = len(splittedv1)`