Skip to content

Commit 684e4ae

Browse files
iresharmairesharma
committed
reverted to older method signature, and added new function
1 parent 0f3bc5a commit 684e4ae

File tree

8 files changed

+96
-47
lines changed

8 files changed

+96
-47
lines changed

‎recipe/dashboard/api/usersGet.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,12 @@ func UsersGet(apiImplementation dashboardmodels.APIInterface, options dashboardm
8181
queryParamsObject[i] = strings.Join(s, ";")
8282
}
8383

84-
if timeJoinedOrder == "ASC" {
85-
usersResponse, err = supertokens.GetUsersOldestFirst(paginationTokenPtr, &limit, nil, queryParamsObject)
84+
if len(queryParamsObject) != 0 {
85+
usersResponse, err = supertokens.GetUsersSearchParams(timeJoinedOrder, paginationTokenPtr, &limit, nil, queryParamsObject)
86+
} else if timeJoinedOrder == "ASC" {
87+
usersResponse, err = supertokens.GetUsersOldestFirst(paginationTokenPtr, &limit, nil)
8688
} else {
87-
usersResponse, err = supertokens.GetUsersNewestFirst(paginationTokenPtr, &limit, nil, queryParamsObject)
89+
usersResponse, err = supertokens.GetUsersNewestFirst(paginationTokenPtr, &limit, nil)
8890
}
8991
if err != nil {
9092
return UsersGetResponse{}, err

‎recipe/emailpassword/deleteUser_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func TestDeleteUser(t *testing.T) {
6666
if err != nil {
6767
t.Error(err.Error())
6868
}
69-
reponseBeforeDeletingUser, err := supertokens.GetUsersOldestFirst(nil, nil, nil, nil)
69+
reponseBeforeDeletingUser, err := supertokens.GetUsersOldestFirst(nil, nil, nil)
7070
if err != nil {
7171
t.Error(err.Error())
7272
}
@@ -75,7 +75,7 @@ func TestDeleteUser(t *testing.T) {
7575
if err != nil {
7676
t.Error(err.Error())
7777
}
78-
reponseAfterDeletingUser, err := supertokens.GetUsersOldestFirst(nil, nil, nil, nil)
78+
reponseAfterDeletingUser, err := supertokens.GetUsersOldestFirst(nil, nil, nil)
7979
if err != nil {
8080
t.Error(err.Error())
8181
}

‎recipe/emailpassword/userIdMapping_users_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func TestCreateUserIdMappingAndGetUsers(t *testing.T) {
7171
assert.NotNil(t, createResp.OK)
7272
}
7373

74-
userResult, err := supertokens.GetUsersOldestFirst(nil, nil, nil, nil)
74+
userResult, err := supertokens.GetUsersOldestFirst(nil, nil, nil)
7575
assert.NoError(t, err)
7676
assert.NotNil(t, userResult.Users)
7777

‎recipe/emailpassword/user_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func TestGetUsersOldestFirst(t *testing.T) {
8181
t.Error(err.Error())
8282
}
8383

84-
users, err := supertokens.GetUsersOldestFirst(nil, nil, nil, nil)
84+
users, err := supertokens.GetUsersOldestFirst(nil, nil, nil)
8585
if err != nil {
8686
t.Error(err.Error())
8787
}
@@ -90,7 +90,7 @@ func TestGetUsersOldestFirst(t *testing.T) {
9090
assert.Nil(t, users.NextPaginationToken)
9191

9292
limit := 1
93-
users, err = supertokens.GetUsersOldestFirst(nil, &limit, nil, nil)
93+
users, err = supertokens.GetUsersOldestFirst(nil, &limit, nil)
9494
if err != nil {
9595
t.Error(err.Error())
9696
}
@@ -99,7 +99,7 @@ func TestGetUsersOldestFirst(t *testing.T) {
9999
assert.NotNil(t, users.NextPaginationToken)
100100
assert.Equal(t, "[email protected]", users.Users[0].User["email"])
101101

102-
users, err = supertokens.GetUsersOldestFirst(users.NextPaginationToken, &limit, nil, nil)
102+
users, err = supertokens.GetUsersOldestFirst(users.NextPaginationToken, &limit, nil)
103103
if err != nil {
104104
t.Error(err.Error())
105105
}
@@ -109,7 +109,7 @@ func TestGetUsersOldestFirst(t *testing.T) {
109109
assert.Equal(t, "[email protected]", users.Users[0].User["email"])
110110

111111
limit = 5
112-
users, err = supertokens.GetUsersOldestFirst(users.NextPaginationToken, &limit, nil, nil)
112+
users, err = supertokens.GetUsersOldestFirst(users.NextPaginationToken, &limit, nil)
113113
if err != nil {
114114
t.Error(err.Error())
115115
}
@@ -119,15 +119,15 @@ func TestGetUsersOldestFirst(t *testing.T) {
119119

120120
customPaginationToken := "invalid-pagination-token"
121121
limit = 10
122-
users, err = supertokens.GetUsersOldestFirst(&customPaginationToken, &limit, nil, nil)
122+
users, err = supertokens.GetUsersOldestFirst(&customPaginationToken, &limit, nil)
123123
if err != nil {
124124
assert.Equal(t, "SuperTokens core threw an error for a request to path: '/users' with status code: 400 and message: invalid pagination token\n", err.Error())
125125
} else {
126126
t.Fail()
127127
}
128128

129129
limit = -1
130-
users, err = supertokens.GetUsersOldestFirst(nil, &limit, nil, nil)
130+
users, err = supertokens.GetUsersOldestFirst(nil, &limit, nil)
131131
if err != nil {
132132
assert.Equal(t, "SuperTokens core threw an error for a request to path: '/users' with status code: 400 and message: limit must a positive integer with min value 1\n", err.Error())
133133
} else {
@@ -187,7 +187,7 @@ func TestGetUsersNewestFirst(t *testing.T) {
187187
t.Error(err.Error())
188188
}
189189

190-
users, err := supertokens.GetUsersNewestFirst(nil, nil, nil, nil)
190+
users, err := supertokens.GetUsersNewestFirst(nil, nil, nil)
191191
if err != nil {
192192
t.Error(err.Error())
193193
}
@@ -196,7 +196,7 @@ func TestGetUsersNewestFirst(t *testing.T) {
196196
assert.Nil(t, users.NextPaginationToken)
197197

198198
limit := 1
199-
users, err = supertokens.GetUsersNewestFirst(nil, &limit, nil, nil)
199+
users, err = supertokens.GetUsersNewestFirst(nil, &limit, nil)
200200
if err != nil {
201201
t.Error(err.Error())
202202
}
@@ -205,7 +205,7 @@ func TestGetUsersNewestFirst(t *testing.T) {
205205
assert.NotNil(t, users.NextPaginationToken)
206206
assert.Equal(t, "[email protected]", users.Users[0].User["email"])
207207

208-
users, err = supertokens.GetUsersNewestFirst(users.NextPaginationToken, &limit, nil, nil)
208+
users, err = supertokens.GetUsersNewestFirst(users.NextPaginationToken, &limit, nil)
209209
if err != nil {
210210
t.Error(err.Error())
211211
}
@@ -215,7 +215,7 @@ func TestGetUsersNewestFirst(t *testing.T) {
215215
assert.Equal(t, "[email protected]", users.Users[0].User["email"])
216216

217217
limit = 5
218-
users, err = supertokens.GetUsersNewestFirst(users.NextPaginationToken, &limit, nil, nil)
218+
users, err = supertokens.GetUsersNewestFirst(users.NextPaginationToken, &limit, nil)
219219
if err != nil {
220220
t.Error(err.Error())
221221
}
@@ -225,15 +225,15 @@ func TestGetUsersNewestFirst(t *testing.T) {
225225

226226
customPaginationToken := "invalid-pagination-token"
227227
limit = 10
228-
users, err = supertokens.GetUsersNewestFirst(&customPaginationToken, &limit, nil, nil)
228+
users, err = supertokens.GetUsersNewestFirst(&customPaginationToken, &limit, nil)
229229
if err != nil {
230230
assert.Equal(t, "SuperTokens core threw an error for a request to path: '/users' with status code: 400 and message: invalid pagination token\n", err.Error())
231231
} else {
232232
t.Fail()
233233
}
234234

235235
limit = -1
236-
users, err = supertokens.GetUsersNewestFirst(nil, &limit, nil, nil)
236+
users, err = supertokens.GetUsersNewestFirst(nil, &limit, nil)
237237
if err != nil {
238238
assert.Equal(t, "SuperTokens core threw an error for a request to path: '/users' with status code: 400 and message: limit must a positive integer with min value 1\n", err.Error())
239239
} else {

‎recipe/thirdparty/users_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,23 +76,23 @@ func TestGetUsersOldesFirst(t *testing.T) {
7676
unittesting.SigninupCustomRequest(testServer.URL, "[email protected]", "testPass3")
7777
unittesting.SigninupCustomRequest(testServer.URL, "[email protected]", "testPass4")
7878

79-
userPaginationResult, err := supertokens.GetUsersOldestFirst(nil, nil, nil, nil)
79+
userPaginationResult, err := supertokens.GetUsersOldestFirst(nil, nil, nil)
8080
if err != nil {
8181
t.Error(err.Error())
8282
}
8383
assert.Equal(t, 5, len(userPaginationResult.Users))
8484
assert.Nil(t, userPaginationResult.NextPaginationToken)
8585

8686
customLimit := 1
87-
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil, nil)
87+
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil)
8888
if err != nil {
8989
t.Error(err.Error())
9090
}
9191
assert.Equal(t, 1, len(userPaginationResult.Users))
9292
assert.Equal(t, "[email protected]", userPaginationResult.Users[0].User["email"])
9393
assert.Equal(t, "*string", reflect.TypeOf(userPaginationResult.NextPaginationToken).String())
9494

95-
userPaginationResult, err = supertokens.GetUsersOldestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, nil)
95+
userPaginationResult, err = supertokens.GetUsersOldestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil)
9696
if err != nil {
9797
t.Error(err.Error())
9898
}
@@ -101,22 +101,22 @@ func TestGetUsersOldesFirst(t *testing.T) {
101101
assert.Equal(t, "*string", reflect.TypeOf(userPaginationResult.NextPaginationToken).String())
102102

103103
customLimit = 5
104-
userPaginationResult, err = supertokens.GetUsersOldestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, nil)
104+
userPaginationResult, err = supertokens.GetUsersOldestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil)
105105
if err != nil {
106106
t.Error(err.Error())
107107
}
108108
assert.Equal(t, 3, len(userPaginationResult.Users))
109109

110110
customInvalidPaginationToken := "invalid-pagination-token"
111-
userPaginationResult, err = supertokens.GetUsersOldestFirst(&customInvalidPaginationToken, &customLimit, nil, nil)
111+
userPaginationResult, err = supertokens.GetUsersOldestFirst(&customInvalidPaginationToken, &customLimit, nil)
112112
if err != nil {
113113
assert.Contains(t, err.Error(), "invalid pagination token")
114114
} else {
115115
t.Fail()
116116
}
117117

118118
customLimit = -1
119-
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil, nil)
119+
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil)
120120
if err != nil {
121121
assert.Contains(t, err.Error(), "limit must a positive integer with min value 1")
122122
} else {
@@ -171,23 +171,23 @@ func TestGetUsersNewestFirst(t *testing.T) {
171171
unittesting.SigninupCustomRequest(testServer.URL, "[email protected]", "testPass3")
172172
unittesting.SigninupCustomRequest(testServer.URL, "[email protected]", "testPass4")
173173

174-
userPaginationResult, err := supertokens.GetUsersNewestFirst(nil, nil, nil, nil)
174+
userPaginationResult, err := supertokens.GetUsersNewestFirst(nil, nil, nil)
175175
if err != nil {
176176
t.Error(err.Error())
177177
}
178178
assert.Equal(t, 5, len(userPaginationResult.Users))
179179
assert.Nil(t, userPaginationResult.NextPaginationToken)
180180

181181
customLimit := 1
182-
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil, nil)
182+
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil)
183183
if err != nil {
184184
t.Error(err.Error())
185185
}
186186
assert.Equal(t, 1, len(userPaginationResult.Users))
187187
assert.Equal(t, "[email protected]", userPaginationResult.Users[0].User["email"])
188188
assert.Equal(t, "*string", reflect.TypeOf(userPaginationResult.NextPaginationToken).String())
189189

190-
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, nil)
190+
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil)
191191
if err != nil {
192192
t.Error(err.Error())
193193
}
@@ -196,23 +196,23 @@ func TestGetUsersNewestFirst(t *testing.T) {
196196
assert.Equal(t, "*string", reflect.TypeOf(userPaginationResult.NextPaginationToken).String())
197197

198198
customLimit = 5
199-
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, nil)
199+
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil)
200200
if err != nil {
201201
t.Error(err.Error())
202202
}
203203
assert.Equal(t, 3, len(userPaginationResult.Users))
204204

205205
customInvalidPaginationToken := "invalid-pagination-token"
206206
customLimit = 10
207-
userPaginationResult, err = supertokens.GetUsersNewestFirst(&customInvalidPaginationToken, &customLimit, nil, nil)
207+
userPaginationResult, err = supertokens.GetUsersNewestFirst(&customInvalidPaginationToken, &customLimit, nil)
208208
if err != nil {
209209
assert.Contains(t, err.Error(), "invalid pagination token")
210210
} else {
211211
t.Fail()
212212
}
213213

214214
customLimit = -1
215-
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil, nil)
215+
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil)
216216
if err != nil {
217217
assert.Contains(t, err.Error(), "limit must a positive integer with min value 1")
218218
} else {

‎recipe/thirdpartypasswordless/users_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,23 @@ func TestGetUsersOldesFirst(t *testing.T) {
9393
unittesting.SigninupCustomRequest(testServer.URL, "[email protected]", "testPass3")
9494
unittesting.SigninupCustomRequest(testServer.URL, "[email protected]", "testPass4")
9595

96-
userPaginationResult, err := supertokens.GetUsersOldestFirst(nil, nil, nil, nil)
96+
userPaginationResult, err := supertokens.GetUsersOldestFirst(nil, nil, nil)
9797
if err != nil {
9898
t.Error(err.Error())
9999
}
100100
assert.Equal(t, 5, len(userPaginationResult.Users))
101101
assert.Nil(t, userPaginationResult.NextPaginationToken)
102102

103103
customLimit := 1
104-
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil, nil)
104+
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil)
105105
if err != nil {
106106
t.Error(err.Error())
107107
}
108108
assert.Equal(t, 1, len(userPaginationResult.Users))
109109
assert.Equal(t, "[email protected]", userPaginationResult.Users[0].User["email"])
110110
assert.Equal(t, "*string", reflect.TypeOf(userPaginationResult.NextPaginationToken).String())
111111

112-
userPaginationResult, err = supertokens.GetUsersOldestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, nil)
112+
userPaginationResult, err = supertokens.GetUsersOldestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil)
113113
if err != nil {
114114
t.Error(err.Error())
115115
}
@@ -118,22 +118,22 @@ func TestGetUsersOldesFirst(t *testing.T) {
118118
assert.Equal(t, "*string", reflect.TypeOf(userPaginationResult.NextPaginationToken).String())
119119

120120
customLimit = 5
121-
userPaginationResult, err = supertokens.GetUsersOldestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, nil)
121+
userPaginationResult, err = supertokens.GetUsersOldestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil)
122122
if err != nil {
123123
t.Error(err.Error())
124124
}
125125
assert.Equal(t, 3, len(userPaginationResult.Users))
126126

127127
customInvalidPaginationToken := "invalid-pagination-token"
128-
userPaginationResult, err = supertokens.GetUsersOldestFirst(&customInvalidPaginationToken, &customLimit, nil, nil)
128+
userPaginationResult, err = supertokens.GetUsersOldestFirst(&customInvalidPaginationToken, &customLimit, nil)
129129
if err != nil {
130130
assert.Contains(t, err.Error(), "invalid pagination token")
131131
} else {
132132
t.Fail()
133133
}
134134

135135
customLimit = -1
136-
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil, nil)
136+
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil)
137137
if err != nil {
138138
assert.Contains(t, err.Error(), "limit must a positive integer with min value 1")
139139
} else {
@@ -202,23 +202,23 @@ func TestGetUsersNewestFirst(t *testing.T) {
202202
unittesting.SigninupCustomRequest(testServer.URL, "[email protected]", "testPass3")
203203
unittesting.SigninupCustomRequest(testServer.URL, "[email protected]", "testPass4")
204204

205-
userPaginationResult, err := supertokens.GetUsersNewestFirst(nil, nil, nil, nil)
205+
userPaginationResult, err := supertokens.GetUsersNewestFirst(nil, nil, nil)
206206
if err != nil {
207207
t.Error(err.Error())
208208
}
209209
assert.Equal(t, 5, len(userPaginationResult.Users))
210210
assert.Nil(t, userPaginationResult.NextPaginationToken)
211211

212212
customLimit := 1
213-
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil, nil)
213+
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil)
214214
if err != nil {
215215
t.Error(err.Error())
216216
}
217217
assert.Equal(t, 1, len(userPaginationResult.Users))
218218
assert.Equal(t, "[email protected]", userPaginationResult.Users[0].User["email"])
219219
assert.Equal(t, "*string", reflect.TypeOf(userPaginationResult.NextPaginationToken).String())
220220

221-
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, nil)
221+
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil)
222222
if err != nil {
223223
t.Error(err.Error())
224224
}
@@ -227,23 +227,23 @@ func TestGetUsersNewestFirst(t *testing.T) {
227227
assert.Equal(t, "*string", reflect.TypeOf(userPaginationResult.NextPaginationToken).String())
228228

229229
customLimit = 5
230-
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, nil)
230+
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil)
231231
if err != nil {
232232
t.Error(err.Error())
233233
}
234234
assert.Equal(t, 3, len(userPaginationResult.Users))
235235

236236
customInvalidPaginationToken := "invalid-pagination-token"
237237
customLimit = 10
238-
userPaginationResult, err = supertokens.GetUsersNewestFirst(&customInvalidPaginationToken, &customLimit, nil, nil)
238+
userPaginationResult, err = supertokens.GetUsersNewestFirst(&customInvalidPaginationToken, &customLimit, nil)
239239
if err != nil {
240240
assert.Contains(t, err.Error(), "invalid pagination token")
241241
} else {
242242
t.Fail()
243243
}
244244

245245
customLimit = -1
246-
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil, nil)
246+
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil)
247247
if err != nil {
248248
assert.Contains(t, err.Error(), "limit must a positive integer with min value 1")
249249
} else {

‎supertokens/main.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,16 @@ func GetUserCount(includeRecipeIds *[]string) (float64, error) {
5959
return getUserCount(includeRecipeIds)
6060
}
6161

62-
func GetUsersOldestFirst(paginationToken *string, limit *int, includeRecipeIds *[]string, queryParams map[string]string) (UserPaginationResult, error) {
63-
return getUsers("ASC", paginationToken, limit, includeRecipeIds, queryParams)
62+
func GetUsersSearchParams(order string, paginationToken *string, limit *int, includeRecipeIds *[]string, queryParams map[string]string) (UserPaginationResult, error) {
63+
return getUsersWithSearch(order, paginationToken, limit, includeRecipeIds, queryParams)
6464
}
6565

66-
func GetUsersNewestFirst(paginationToken *string, limit *int, includeRecipeIds *[]string, queryParams map[string]string) (UserPaginationResult, error) {
67-
return getUsers("DESC", paginationToken, limit, includeRecipeIds, queryParams)
66+
func GetUsersOldestFirst(paginationToken *string, limit *int, includeRecipeIds *[]string) (UserPaginationResult, error) {
67+
return getUsers("ASC", paginationToken, limit, includeRecipeIds)
68+
}
69+
70+
func GetUsersNewestFirst(paginationToken *string, limit *int, includeRecipeIds *[]string) (UserPaginationResult, error) {
71+
return getUsers("DESC", paginationToken, limit, includeRecipeIds)
6872
}
6973

7074
func DeleteUser(userId string) error {

0 commit comments

Comments
 (0)