Skip to content

Commit 67c1361

Browse files
authored
CXP-47 fix inf loop (#46)
* fix inf loop * fix test
1 parent 00715b2 commit 67c1361

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

pkg/connector/client/pagination.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,16 @@ func GetNextToken(
8585
limit int,
8686
total int,
8787
) string {
88+
nextPage := page + 1
89+
nextOffset := nextPage * limit
90+
91+
if nextOffset >= total {
92+
return ""
93+
}
94+
8895
bytes, err := json.Marshal(
8996
Pagination{
90-
Page: page + 1,
97+
Page: nextPage,
9198
},
9299
)
93100
if err != nil {

pkg/connector/users_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ func TestUsersList(t *testing.T) {
4343

4444
require.Nil(t, err)
4545
test.AssertNoRatelimitAnnotations(t, listAnnotations)
46+
47+
if nextToken == "" {
48+
break
49+
}
50+
4651
var token client.Pagination
4752
err = json.Unmarshal([]byte(nextToken), &token)
4853
require.Nil(t, err)

0 commit comments

Comments
 (0)