removed duplicate function

Author: iresharma

recipe/dashboard/api/implementation.go

@@ -55,15 +55,15 @@ func MakeAPIImplementation() dashboardmodels.APIInterface {
 		authMode := string(options.Config.AuthMode)
 
 		isSearchEnabled := false
-		querier, err := supertokens.GetNewQuerierInstanceOrThrowError("")
+		querier, err := supertokens.GetNewQuerierInstanceOrThrowError(options.RecipeID)
 		if err != nil {
 			return "", err
 		}
 		cdiVersion, err := querier.GetQuerierAPIVersion()
 		if err != nil {
 			return "", err
 		}
-		if maxVersion(cdiVersion, "2.20") == "2.20" {
+		if supertokens.MaxVersion(cdiVersion, "2.20") == "2.20" {
 			isSearchEnabled = true
 		}
 

recipe/dashboard/api/utils.go

@@ -233,25 +233,3 @@ func getUsersWithSearch(timeJoinedOrder string, paginationToken *string, limit *
 
 	return result, nil
 }
-
-func maxVersion(version1 string, version2 string) string {
-	var splittedv1 = strings.Split(version1, ".")
-	var splittedv2 = strings.Split(version2, ".")
-	var minLength = len(splittedv1)
-	if minLength > len(splittedv2) {
-		minLength = len(splittedv2)
-	}
-	for i := 0; i < minLength; i++ {
-		var v1, _ = strconv.Atoi(splittedv1[i])
-		var v2, _ = strconv.Atoi(splittedv2[i])
-		if v1 > v2 {
-			return version1
-		} else if v2 > v1 {
-			return version2
-		}
-	}
-	if len(splittedv1) >= len(splittedv2) {
-		return version1
-	}
-	return version2
-}

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,
 		})

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")
 	}
 

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)