structure changed

Author: iresharma

recipe/dashboard/api/usersGet.go

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

recipe/dashboard/api/utils.go

@@ -1,12 +1,17 @@
 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 {
@@ -183,3 +188,48 @@ 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

@@ -59,10 +59,6 @@ func GetUserCount(includeRecipeIds *[]string) (float64, error) {
 	return getUserCount(includeRecipeIds)
 }
 
-func GetUsersSearchParams(order string, paginationToken *string, limit *int, includeRecipeIds *[]string, queryParams map[string]string) (UserPaginationResult, error) {
-	return getUsersWithSearch(order, paginationToken, limit, includeRecipeIds, queryParams)
-}
-
 func GetUsersOldestFirst(paginationToken *string, limit *int, includeRecipeIds *[]string) (UserPaginationResult, error) {
 	return getUsers("ASC", paginationToken, limit, includeRecipeIds)
 }

supertokens/supertokens.go

@@ -362,51 +362,6 @@ func getUsers(timeJoinedOrder string, paginationToken *string, limit *int, inclu
 	return result, nil
 }
 
-// TODO: Add tests
-func getUsersWithSearch(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{}
-	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 UserPaginationResult{}, err
-	}
-
-	temporaryVariable, err := json.Marshal(resp)
-	if err != nil {
-		return UserPaginationResult{}, err
-	}
-
-	var result = UserPaginationResult{}
-
-	err = json.Unmarshal(temporaryVariable, &result)
-
-	if err != nil {
-		return UserPaginationResult{}, err
-	}
-
-	return result, nil
-}
-
 // TODO: Add tests
 func getUserCount(includeRecipeIds *[]string) (float64, error) {