is: Set default page limit in the store

pkg/identityserver/application_access.go

@@ -125,7 +125,7 @@ func (is *IdentityServer) listApplicationAPIKeys(
 	}
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)
@@ -398,7 +398,7 @@ func (is *IdentityServer) listApplicationCollaborators(
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)

pkg/identityserver/application_registry.go

@@ -230,7 +230,7 @@ func (is *IdentityServer) listApplications( // nolint:gocyclo
 	}
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	paginateCtx := store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)

pkg/identityserver/client_access.go

@@ -203,7 +203,7 @@ func (is *IdentityServer) listClientCollaborators(
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)

pkg/identityserver/client_registry.go

@@ -249,7 +249,7 @@ func (is *IdentityServer) listClients(
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	paginateCtx := store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)

pkg/identityserver/end_device_registry.go

@@ -312,7 +312,7 @@ func (is *IdentityServer) listEndDevices(ctx context.Context, req *ttnpb.ListEnd
 	}
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)

pkg/identityserver/gateway_access.go

@@ -121,7 +121,7 @@ func (is *IdentityServer) listGatewayAPIKeys(
 	}
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)
@@ -389,7 +389,7 @@ func (is *IdentityServer) listGatewayCollaborators(
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)

pkg/identityserver/gateway_registry.go

@@ -406,7 +406,7 @@ func (is *IdentityServer) listGateways( // nolint:gocyclo
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	paginateCtx := store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)

pkg/identityserver/invitation_registry.go

@@ -88,7 +88,7 @@ func (is *IdentityServer) listInvitations(ctx context.Context, req *ttnpb.ListIn
 		return nil, errNoInviteRights.New()
 	}
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)

pkg/identityserver/notification_registry.go

@@ -340,7 +340,7 @@ func (is *IdentityServer) listNotifications(ctx context.Context, req *ttnpb.List
 	res := &ttnpb.ListNotificationsResponse{}
 	err := is.store.Transact(ctx, func(ctx context.Context, st store.Store) (err error) {
 		var total uint64
-		paginateCtx := store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+		paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total)
 		defer func() {
 			if err == nil {
 				setTotalHeader(ctx, total)

pkg/identityserver/oauth_registry.go

@@ -30,7 +30,7 @@ func (is *IdentityServer) listOAuthClientAuthorizations(ctx context.Context, req
 	}
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)
@@ -60,7 +60,7 @@ func (is *IdentityServer) listOAuthAccessTokens(ctx context.Context, req *ttnpb.
 	}
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)

pkg/identityserver/organization_access.go

@@ -129,7 +129,7 @@ func (is *IdentityServer) listOrganizationAPIKeys(
 	}
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)
@@ -402,7 +402,7 @@ func (is *IdentityServer) listOrganizationCollaborators(
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)

pkg/identityserver/organization_registry.go

@@ -203,7 +203,7 @@ func (is *IdentityServer) listOrganizations(
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	paginateCtx := store.WithPagination(ctx, store.WithLimit(req.Limit, is.config.Pagination.DefaultLimit), req.Page, &total)
+	paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)

pkg/identityserver/registry_search.go

@@ -73,7 +73,7 @@ func (rs *registrySearch) SearchApplications(
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, rs.IdentityServer.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)
@@ -101,7 +101,7 @@ func (rs *registrySearch) SearchApplications(
 				return err
 			}
 		}
-		ctx = store.WithPagination(ctx, rs.IdentityServer.config.Pagination.DefaultLimit, 0, nil) // Reset pagination (already done in EntitySearch.FindApplications).
+		ctx = store.WithPagination(ctx, 0, 0, nil) // Reset pagination (already done in EntitySearch.FindApplications).
 		res.Applications, err = st.FindApplications(ctx, entityIDs, req.FieldMask.GetPaths())
 		if err != nil {
 			return err
@@ -176,7 +176,7 @@ func (rs *registrySearch) SearchClients(
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, rs.IdentityServer.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)
@@ -204,7 +204,7 @@ func (rs *registrySearch) SearchClients(
 				return err
 			}
 		}
-		ctx = store.WithPagination(ctx, rs.IdentityServer.config.Pagination.DefaultLimit, 0, nil) // Reset pagination (already done in EntitySearch.FindClients).
+		ctx = store.WithPagination(ctx, 0, 0, nil) // Reset pagination (already done in EntitySearch.FindClients).
 		res.Clients, err = st.FindClients(ctx, entityIDs, req.FieldMask.GetPaths())
 		if err != nil {
 			return err
@@ -282,7 +282,7 @@ func (rs *registrySearch) SearchGateways(
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, rs.IdentityServer.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)
@@ -310,7 +310,7 @@ func (rs *registrySearch) SearchGateways(
 				return err
 			}
 		}
-		ctx = store.WithPagination(ctx, rs.IdentityServer.config.Pagination.DefaultLimit, 0, nil) // Reset pagination (already done in EntitySearch.FindGateways).
+		ctx = store.WithPagination(ctx, 0, 0, nil) // Reset pagination (already done in EntitySearch.FindGateways).
 		res.Gateways, err = st.FindGateways(ctx, entityIDs, req.FieldMask.GetPaths())
 		if err != nil {
 			return err
@@ -391,7 +391,7 @@ func (rs *registrySearch) SearchOrganizations(
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, rs.IdentityServer.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)
@@ -419,7 +419,7 @@ func (rs *registrySearch) SearchOrganizations(
 				return err
 			}
 		}
-		ctx = store.WithPagination(ctx, rs.IdentityServer.config.Pagination.DefaultLimit, 0, nil) // Reset pagination (already done in EntitySearch.FindOrganizations).
+		ctx = store.WithPagination(ctx, 0, 0, nil) // Reset pagination (already done in EntitySearch.FindOrganizations).
 		res.Organizations, err = st.FindOrganizations(ctx, entityIDs, req.FieldMask.GetPaths())
 		if err != nil {
 			return err
@@ -492,7 +492,7 @@ func (rs *registrySearch) SearchUsers(
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, rs.IdentityServer.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)
@@ -516,7 +516,7 @@ func (rs *registrySearch) SearchUsers(
 		if len(ids) == 0 {
 			return nil
 		}
-		ctx = store.WithPagination(ctx, rs.IdentityServer.config.Pagination.DefaultLimit, 0, nil) // Reset pagination (already done in EntitySearch.FindUsers).
+		ctx = store.WithPagination(ctx, 0, 0, nil) // Reset pagination (already done in EntitySearch.FindUsers).
 		res.Users, err = st.FindUsers(ctx, ids, req.FieldMask.GetPaths())
 		if err != nil {
 			return err
@@ -606,7 +606,7 @@ func (rs *registrySearch) SearchEndDevices(ctx context.Context, req *ttnpb.Searc
 
 	ctx = store.WithOrder(ctx, req.Order)
 	var total uint64
-	ctx = store.WithPagination(ctx, store.WithLimit(req.Limit, rs.IdentityServer.config.Pagination.DefaultLimit), req.Page, &total)
+	ctx = store.WithPagination(ctx, req.Limit, req.Page, &total)
 	defer func() {
 		if err == nil {
 			setTotalHeader(ctx, total)
@@ -622,7 +622,7 @@ func (rs *registrySearch) SearchEndDevices(ctx context.Context, req *ttnpb.Searc
 		if len(ids) == 0 {
 			return nil
 		}
-		ctx = store.WithPagination(ctx, rs.IdentityServer.config.Pagination.DefaultLimit, 0, nil) // Reset pagination (already done in EntitySearch.FindEndDevices).
+		ctx = store.WithPagination(ctx, 0, 0, nil) // Reset pagination (already done in EntitySearch.FindEndDevices).
 		res.EndDevices, err = st.FindEndDevices(ctx, ids, req.FieldMask.GetPaths())
 		if err != nil {
 			return err

pkg/identityserver/store.go

@@ -18,11 +18,15 @@ import (
 	"github.com/uptrace/bun"
 	"github.com/uptrace/bun/dialect/pgdialect"
 	bunstore "go.thethings.network/lorawan-stack/v3/pkg/identityserver/bunstore"
+	"go.thethings.network/lorawan-stack/v3/pkg/identityserver/store"
 	"go.thethings.network/lorawan-stack/v3/pkg/log"
 	storeutil "go.thethings.network/lorawan-stack/v3/pkg/util/store"
 )
 
 func (is *IdentityServer) setupStore() error {
+	store.SetPaginationDefaults(store.PaginationDefaults{
+		DefaultLimit: is.config.Pagination.DefaultLimit,
+	})
 	return is.setupBunStore()
 }
 

pkg/identityserver/store/pagination.go

@@ -20,6 +20,15 @@ import (
 	"strings"
 )
 
+// PaginationDefaults sets default values for paginations options within the IS store.
+type PaginationDefaults struct {
+	DefaultLimit uint32
+}
+
+var paginationDefaults = PaginationDefaults{}
+
+func SetPaginationDefaults(d PaginationDefaults) { paginationDefaults = d }
+
 type paginationOptionsKeyType struct{}
 
 var paginationOptionsKey paginationOptionsKeyType
@@ -31,20 +40,15 @@ type PaginationOptions struct {
 	total  *uint64
 }
 
-// WithLimit checks if the limit is set, and returns the set limit or the default.
-func WithLimit(set, def uint32) uint32 {
-	if set == 0 {
-		return def
-	}
-	return set
-}
-
 // WithPagination instructs the store to paginate the results, and set the total
 // number of results into total.
 func WithPagination(ctx context.Context, limit, page uint32, total *uint64) context.Context {
 	if page == 0 {
 		page = 1
 	}
+	if limit == 0 {
+		limit = paginationDefaults.DefaultLimit
+	}
 	return context.WithValue(ctx, paginationOptionsKey, PaginationOptions{
 		limit:  limit,
 		offset: (page - 1) * limit,

pkg/identityserver/storetest/api_key_store.go

@@ -225,7 +225,7 @@ func (st *StoreTest) TestAPIKeyStorePagination(t *T) {
 	app1 := st.population.NewApplication(nil)
 
 	var all []*ttnpb.APIKey
-	for i := 0; i < 102; i++ {
+	for i := 0; i < 7; i++ {
 		_, key := st.population.NewAPIKey(app1.GetEntityIdentifiers(), ttnpb.Right_RIGHT_APPLICATION_ALL)
 		key.Name = fmt.Sprintf("Key %d", i)
 		all = append(all, key)
@@ -253,15 +253,43 @@ func (st *StoreTest) TestAPIKeyStorePagination(t *T) {
 
 			got, err := s.FindAPIKeys(paginateCtx, app1.GetEntityIdentifiers())
 			if a.So(err, should.BeNil) && a.So(got, should.NotBeNil) {
-				a.So(got, should.HaveLength, 2)
+				if page == 4 {
+					a.So(got, should.HaveLength, 1)
+				} else {
+					a.So(got, should.HaveLength, 2)
+				}
 				for i, e := range got {
 					a.So(e.Name, should.Equal, all[i+2*int(page-1)].Name)
 				}
 			}
 
-			a.So(total, should.Equal, 102)
+			a.So(total, should.Equal, 7)
 		}
 	})
+}
+
+func (st *StoreTest) TestAPIKeyStorePaginationDefaults(t *T) {
+	app1 := st.population.NewApplication(nil)
+
+	var all []*ttnpb.APIKey
+	for i := 0; i < 102; i++ {
+		_, key := st.population.NewAPIKey(app1.GetEntityIdentifiers(), ttnpb.Right_RIGHT_APPLICATION_ALL)
+		key.Name = fmt.Sprintf("Key %d", i)
+		all = append(all, key)
+	}
+
+	sort.Sort(apiKeysByID(all))
+
+	s, ok := st.PrepareDB(t).(interface {
+		Store
+
+		is.APIKeyStore
+	})
+	defer st.DestroyDB(t, false)
+	if !ok {
+		t.Skip("Store does not implement APIKeyStore")
+	}
+	defer s.Close()
 
 	t.Run("FindAPIKeys_PageLimit", func(t *T) {
 		a, ctx := test.New(t)