Skip to content

Commit 0d74211

Browse files
rishabhpoddarrishabhpoddar
authored
Merge pull request #274 from supertokens/functionSignature
feat: Function signature update
2 parents 6b8112e + e63d9ad commit 0d74211

File tree

9 files changed

+114
-49
lines changed

9 files changed

+114
-49
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [unreleased]
99

10+
## [0.11.0] - 2023-04-28
11+
- Added missing arguments in `GetUsersNewestFirst` and `GetUsersOldestFirst`
12+
1013
## [0.10.8] - 2023-04-18
1114
- Email template for verify email updated
1215

@@ -793,4 +796,4 @@ supertokens.Init(supertokens.TypeInput{
793796
## [0.0.1] - 2021-09-18
794797

795798
### Added
796-
- Initial version of the repo
799+
- Initial version of the repo

‎recipe/dashboard/api/usersGet.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ func UsersGet(apiImplementation dashboardmodels.APIInterface, options dashboardm
8484
if len(queryParamsObject) != 0 {
8585
usersResponse, err = supertokens.GetUsersWithSearchParams(timeJoinedOrder, paginationTokenPtr, &limit, nil, queryParamsObject)
8686
} else if timeJoinedOrder == "ASC" {
87-
usersResponse, err = supertokens.GetUsersOldestFirst(paginationTokenPtr, &limit, nil)
87+
usersResponse, err = supertokens.GetUsersOldestFirst(paginationTokenPtr, &limit, nil, nil)
8888
} else {
89-
usersResponse, err = supertokens.GetUsersNewestFirst(paginationTokenPtr, &limit, nil)
89+
usersResponse, err = supertokens.GetUsersNewestFirst(paginationTokenPtr, &limit, nil, nil)
9090
}
9191
if err != nil {
9292
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)
69+
reponseBeforeDeletingUser, err := supertokens.GetUsersOldestFirst(nil, 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)
78+
reponseAfterDeletingUser, err := supertokens.GetUsersOldestFirst(nil, 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)
74+
userResult, err := supertokens.GetUsersOldestFirst(nil, 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)
84+
users, err := supertokens.GetUsersOldestFirst(nil, 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)
93+
users, err = supertokens.GetUsersOldestFirst(nil, &limit, nil, 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, "test@gmail.com", users.Users[0].User["email"])
101101

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

111111
limit = 5
112-
users, err = supertokens.GetUsersOldestFirst(users.NextPaginationToken, &limit, nil)
112+
users, err = supertokens.GetUsersOldestFirst(users.NextPaginationToken, &limit, nil, 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)
122+
users, err = supertokens.GetUsersOldestFirst(&customPaginationToken, &limit, nil, 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)
130+
users, err = supertokens.GetUsersOldestFirst(nil, &limit, nil, 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)
190+
users, err := supertokens.GetUsersNewestFirst(nil, 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)
199+
users, err = supertokens.GetUsersNewestFirst(nil, &limit, nil, 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, "test4@gmail.com", users.Users[0].User["email"])
207207

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

217217
limit = 5
218-
users, err = supertokens.GetUsersNewestFirst(users.NextPaginationToken, &limit, nil)
218+
users, err = supertokens.GetUsersNewestFirst(users.NextPaginationToken, &limit, nil, 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)
228+
users, err = supertokens.GetUsersNewestFirst(&customPaginationToken, &limit, nil, 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)
236+
users, err = supertokens.GetUsersNewestFirst(nil, &limit, nil, 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: 76 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,27 +72,27 @@ func TestGetUsersOldesFirst(t *testing.T) {
7272

7373
unittesting.SigninupCustomRequest(testServer.URL, "test@gmail.com", "testPass0")
7474
unittesting.SigninupCustomRequest(testServer.URL, "test1@gmail.com", "testPass1")
75-
unittesting.SigninupCustomRequest(testServer.URL, "test2@gmail.com", "testPass2")
75+
unittesting.SigninupCustomRequest(testServer.URL, "john@gmail.com", "testPass2")
7676
unittesting.SigninupCustomRequest(testServer.URL, "test3@gmail.com", "testPass3")
7777
unittesting.SigninupCustomRequest(testServer.URL, "test4@gmail.com", "testPass4")
7878

79-
userPaginationResult, err := supertokens.GetUsersOldestFirst(nil, nil, nil)
79+
userPaginationResult, err := supertokens.GetUsersOldestFirst(nil, 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)
87+
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil, nil)
8888
if err != nil {
8989
t.Error(err.Error())
9090
}
9191
assert.Equal(t, 1, len(userPaginationResult.Users))
9292
assert.Equal(t, "test@gmail.com", 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)
95+
userPaginationResult, err = supertokens.GetUsersOldestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, nil)
9696
if err != nil {
9797
t.Error(err.Error())
9898
}
@@ -101,27 +101,58 @@ 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)
104+
userPaginationResult, err = supertokens.GetUsersOldestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, 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)
111+
userPaginationResult, err = supertokens.GetUsersOldestFirst(&customInvalidPaginationToken, &customLimit, nil, 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)
119+
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil, nil)
120120
if err != nil {
121121
assert.Contains(t, err.Error(), "limit must a positive integer with min value 1")
122122
} else {
123123
t.Fail()
124124
}
125+
126+
querier, err := supertokens.GetNewQuerierInstanceOrThrowError("thirdparty")
127+
if err != nil {
128+
t.Fail()
129+
}
130+
cdiVersion, err := querier.GetQuerierAPIVersion()
131+
if err != nil {
132+
t.Fail()
133+
}
134+
135+
if supertokens.MaxVersion(cdiVersion, "2.20") != cdiVersion {
136+
t.Skip()
137+
}
138+
139+
customLimit = 10
140+
query := make(map[string]string)
141+
query["email"] = "doe"
142+
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil, query)
143+
if err != nil {
144+
t.Fail()
145+
} else {
146+
assert.Equal(t, len(userPaginationResult.Users), 0)
147+
}
148+
149+
query["email"] = "john"
150+
userPaginationResult, err = supertokens.GetUsersOldestFirst(nil, &customLimit, nil, query)
151+
if err != nil {
152+
t.Fail()
153+
} else {
154+
assert.Equal(t, len(userPaginationResult.Users), 1)
155+
}
125156
}
126157

127158
func TestGetUsersNewestFirst(t *testing.T) {
@@ -167,27 +198,27 @@ func TestGetUsersNewestFirst(t *testing.T) {
167198

168199
unittesting.SigninupCustomRequest(testServer.URL, "test@gmail.com", "testPass0")
169200
unittesting.SigninupCustomRequest(testServer.URL, "test1@gmail.com", "testPass1")
170-
unittesting.SigninupCustomRequest(testServer.URL, "test2@gmail.com", "testPass2")
201+
unittesting.SigninupCustomRequest(testServer.URL, "john@gmail.com", "testPass2")
171202
unittesting.SigninupCustomRequest(testServer.URL, "test3@gmail.com", "testPass3")
172203
unittesting.SigninupCustomRequest(testServer.URL, "test4@gmail.com", "testPass4")
173204

174-
userPaginationResult, err := supertokens.GetUsersNewestFirst(nil, nil, nil)
205+
userPaginationResult, err := supertokens.GetUsersNewestFirst(nil, nil, nil, nil)
175206
if err != nil {
176207
t.Error(err.Error())
177208
}
178209
assert.Equal(t, 5, len(userPaginationResult.Users))
179210
assert.Nil(t, userPaginationResult.NextPaginationToken)
180211

181212
customLimit := 1
182-
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil)
213+
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil, nil)
183214
if err != nil {
184215
t.Error(err.Error())
185216
}
186217
assert.Equal(t, 1, len(userPaginationResult.Users))
187218
assert.Equal(t, "test4@gmail.com", userPaginationResult.Users[0].User["email"])
188219
assert.Equal(t, "*string", reflect.TypeOf(userPaginationResult.NextPaginationToken).String())
189220

190-
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil)
221+
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, nil)
191222
if err != nil {
192223
t.Error(err.Error())
193224
}
@@ -196,28 +227,59 @@ func TestGetUsersNewestFirst(t *testing.T) {
196227
assert.Equal(t, "*string", reflect.TypeOf(userPaginationResult.NextPaginationToken).String())
197228

198229
customLimit = 5
199-
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil)
230+
userPaginationResult, err = supertokens.GetUsersNewestFirst(userPaginationResult.NextPaginationToken, &customLimit, nil, nil)
200231
if err != nil {
201232
t.Error(err.Error())
202233
}
203234
assert.Equal(t, 3, len(userPaginationResult.Users))
204235

205236
customInvalidPaginationToken := "invalid-pagination-token"
206237
customLimit = 10
207-
userPaginationResult, err = supertokens.GetUsersNewestFirst(&customInvalidPaginationToken, &customLimit, nil)
238+
userPaginationResult, err = supertokens.GetUsersNewestFirst(&customInvalidPaginationToken, &customLimit, nil, nil)
208239
if err != nil {
209240
assert.Contains(t, err.Error(), "invalid pagination token")
210241
} else {
211242
t.Fail()
212243
}
213244

214245
customLimit = -1
215-
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil)
246+
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil, nil)
216247
if err != nil {
217248
assert.Contains(t, err.Error(), "limit must a positive integer with min value 1")
218249
} else {
219250
t.Fail()
220251
}
252+
253+
querier, err := supertokens.GetNewQuerierInstanceOrThrowError("thirdparty")
254+
if err != nil {
255+
t.Fail()
256+
}
257+
cdiVersion, err := querier.GetQuerierAPIVersion()
258+
if err != nil {
259+
t.Fail()
260+
}
261+
262+
if supertokens.MaxVersion(cdiVersion, "2.20") != cdiVersion {
263+
t.Skip()
264+
}
265+
266+
customLimit = 10
267+
query := make(map[string]string)
268+
query["email"] = "doe"
269+
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil, query)
270+
if err != nil {
271+
t.Fail()
272+
} else {
273+
assert.Equal(t, len(userPaginationResult.Users), 0)
274+
}
275+
276+
query["email"] = "john"
277+
userPaginationResult, err = supertokens.GetUsersNewestFirst(nil, &customLimit, nil, query)
278+
if err != nil {
279+
t.Fail()
280+
} else {
281+
assert.Equal(t, len(userPaginationResult.Users), 1)
282+
}
221283
}
222284

223285
func TestGetUserCount(t *testing.T) {

0 commit comments

Comments
 (0)