Update based on PR comments

Author: nkshah2

recipe/dashboard/api/usersGet.go

@@ -82,7 +82,7 @@ func UsersGet(apiImplementation dashboardmodels.APIInterface, options dashboardm
 	}
 
 	if len(queryParamsObject) != 0 {
-		usersResponse, err = getUsersWithSearch(timeJoinedOrder, paginationTokenPtr, &limit, nil, queryParamsObject)
+		usersResponse, err = supertokens.GetUsersWithSearchParams(timeJoinedOrder, paginationTokenPtr, &limit, nil, queryParamsObject)
 	} else if timeJoinedOrder == "ASC" {
 		usersResponse, err = supertokens.GetUsersOldestFirst(paginationTokenPtr, &limit, nil)
 	} else {

recipe/dashboard/api/utils.go

@@ -1,17 +1,12 @@
 package api
 
 import (
-	"encoding/json"
-	"strconv"
-	"strings"
-
 	"github.com/supertokens/supertokens-golang/recipe/dashboard/dashboardmodels"
 	"github.com/supertokens/supertokens-golang/recipe/emailpassword"
 	"github.com/supertokens/supertokens-golang/recipe/passwordless"
 	"github.com/supertokens/supertokens-golang/recipe/thirdparty"
 	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
 	"github.com/supertokens/supertokens-golang/recipe/thirdpartypasswordless"
-	"github.com/supertokens/supertokens-golang/supertokens"
 )
 
 func IsValidRecipeId(recipeId string) bool {
@@ -188,48 +183,3 @@ func IsRecipeInitialised(recipeId string) bool {
 
 	return isRecipeInitialised
 }
-
-// TODO: Add tests
-func getUsersWithSearch(timeJoinedOrder string, paginationToken *string, limit *int, includeRecipeIds *[]string, searchParams map[string]string) (supertokens.UserPaginationResult, error) {
-
-	querier, err := supertokens.GetNewQuerierInstanceOrThrowError("")
-	if err != nil {
-		return supertokens.UserPaginationResult{}, err
-	}
-
-	requestBody := map[string]string{}
-	if searchParams != nil {
-		requestBody = searchParams
-	}
-	requestBody["timeJoinedOrder"] = timeJoinedOrder
-	if limit != nil {
-		requestBody["limit"] = strconv.Itoa(*limit)
-	}
-	if paginationToken != nil {
-		requestBody["paginationToken"] = *paginationToken
-	}
-	if includeRecipeIds != nil {
-		requestBody["includeRecipeIds"] = strings.Join((*includeRecipeIds)[:], ",")
-	}
-
-	resp, err := querier.SendGetRequest("/users", requestBody)
-
-	if err != nil {
-		return supertokens.UserPaginationResult{}, err
-	}
-
-	temporaryVariable, err := json.Marshal(resp)
-	if err != nil {
-		return supertokens.UserPaginationResult{}, err
-	}
-
-	var result = supertokens.UserPaginationResult{}
-
-	err = json.Unmarshal(temporaryVariable, &result)
-
-	if err != nil {
-		return supertokens.UserPaginationResult{}, err
-	}
-
-	return result, nil
-}

supertokens/main.go

@@ -60,11 +60,11 @@ func GetUserCount(includeRecipeIds *[]string) (float64, error) {
 }
 
 func GetUsersOldestFirst(paginationToken *string, limit *int, includeRecipeIds *[]string) (UserPaginationResult, error) {
-	return getUsers("ASC", paginationToken, limit, includeRecipeIds)
+	return GetUsersWithSearchParams("ASC", paginationToken, limit, includeRecipeIds, nil)
 }
 
 func GetUsersNewestFirst(paginationToken *string, limit *int, includeRecipeIds *[]string) (UserPaginationResult, error) {
-	return getUsers("DESC", paginationToken, limit, includeRecipeIds)
+	return GetUsersWithSearchParams("DESC", paginationToken, limit, includeRecipeIds, nil)
 }
 
 func DeleteUser(userId string) error {

supertokens/supertokens.go

@@ -276,16 +276,19 @@ type UserPaginationResult struct {
 }
 
 // TODO: Add tests
-func getUsers(timeJoinedOrder string, paginationToken *string, limit *int, includeRecipeIds *[]string) (UserPaginationResult, error) {
+func GetUsersWithSearchParams(timeJoinedOrder string, paginationToken *string, limit *int, includeRecipeIds *[]string, searchParams map[string]string) (UserPaginationResult, error) {
 
 	querier, err := GetNewQuerierInstanceOrThrowError("")
 	if err != nil {
 		return UserPaginationResult{}, err
 	}
 
-	requestBody := map[string]string{
-		"timeJoinedOrder": timeJoinedOrder,
+	requestBody := map[string]string{}
+	if searchParams != nil {
+		requestBody = searchParams
 	}
+	requestBody["timeJoinedOrder"] = timeJoinedOrder
+
 	if limit != nil {
 		requestBody["limit"] = strconv.Itoa(*limit)
 	}