Resolves issues with pagination

Gopkg.toml

@@ -87,7 +87,7 @@
 
 [[constraint]]
   name = "github.com/ory/ladon"
-  version = "0.8.4"
+  version = "0.8.8"
 
 [[constraint]]
   name = "github.com/pborman/uuid"

policy/handler.go

@@ -24,6 +24,7 @@ import (
 	"github.com/ory/hydra/firewall"
 	"github.com/ory/hydra/pkg"
 	"github.com/ory/ladon"
+	"github.com/ory/pagination"
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 )
@@ -102,8 +103,8 @@ func (h *Handler) List(w http.ResponseWriter, r *http.Request, _ httprouter.Para
 		return
 	}
 
-	limit, offset := pkg.ParsePagination(r, 500, 0, 1000)
-	policies, err := h.Manager.GetAll(limit, offset)
+	limit, offset := pagination.Parse(r, 500, 0, 1000)
+	policies, err := h.Manager.GetAll(int64(limit), int64(offset))
 	if err != nil {
 		h.H.WriteError(w, r, errors.WithStack(err))
 		return

warden/group/handler.go

@@ -22,7 +22,7 @@ import (
 	"github.com/julienschmidt/httprouter"
 	"github.com/ory/herodot"
 	"github.com/ory/hydra/firewall"
-	"github.com/ory/hydra/pkg"
+	"github.com/ory/pagination"
 	"github.com/pkg/errors"
 )
 
@@ -111,7 +111,7 @@ func (h *Handler) ListGroupsHandler(w http.ResponseWriter, r *http.Request, _ ht
 		return
 	}
 
-	limit, offset := pkg.ParsePagination(r, 100, 0, 500)
+	limit, offset := pagination.Parse(r, 100, 0, 500)
 	if member := r.URL.Query().Get("member"); member != "" {
 		h.FindGroupNames(w, r, member, limit, offset)
 		return
@@ -121,7 +121,7 @@ func (h *Handler) ListGroupsHandler(w http.ResponseWriter, r *http.Request, _ ht
 	}
 }
 
-func (h *Handler) ListGroups(w http.ResponseWriter, r *http.Request, limit, offset int64) {
+func (h *Handler) ListGroups(w http.ResponseWriter, r *http.Request, limit, offset int) {
 	groups, err := h.Manager.ListGroups(limit, offset)
 	if err != nil {
 		h.H.WriteError(w, r, err)
@@ -131,7 +131,7 @@ func (h *Handler) ListGroups(w http.ResponseWriter, r *http.Request, limit, offs
 	h.H.Write(w, r, groups)
 }
 
-func (h *Handler) FindGroupNames(w http.ResponseWriter, r *http.Request, member string, limit, offset int64) {
+func (h *Handler) FindGroupNames(w http.ResponseWriter, r *http.Request, member string, limit, offset int) {
 	groups, err := h.Manager.FindGroupsByMember(member, limit, offset)
 	if err != nil {
 		h.H.WriteError(w, r, err)

warden/group/manager.go

@@ -33,6 +33,6 @@ type Manager interface {
 	AddGroupMembers(group string, members []string) error
 	RemoveGroupMembers(group string, members []string) error
 
-	FindGroupsByMember(subject string, limit, offset int64) ([]Group, error)
-	ListGroups(limit, offset int64) ([]Group, error)
+	FindGroupsByMember(subject string, limit, offset int) ([]Group, error)
+	ListGroups(limit, offset int) ([]Group, error)
 }

warden/group/manager_memory.go

@@ -18,6 +18,7 @@ import (
 	"sync"
 
 	"github.com/ory/hydra/pkg"
+	"github.com/ory/pagination"
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 )
@@ -91,7 +92,7 @@ func (m *MemoryManager) RemoveGroupMembers(group string, subjects []string) erro
 	return m.CreateGroup(g)
 }
 
-func (m *MemoryManager) FindGroupsByMember(subject string, limit, offset int64) ([]Group, error) {
+func (m *MemoryManager) FindGroupsByMember(subject string, limit, offset int) ([]Group, error) {
 	if m.Groups == nil {
 		m.Groups = map[string]Group{}
 	}
@@ -106,29 +107,22 @@ func (m *MemoryManager) FindGroupsByMember(subject string, limit, offset int64)
 		}
 	}
 
-	if offset+limit > int64(len(res)) {
-		return []Group{}, nil
-	}
-
-	return res[offset:limit], nil
+	start, end := pagination.Index(limit, offset, len(res))
+	return res[start:end], nil
 }
 
-func (m *MemoryManager) ListGroups(limit, offset int64) ([]Group, error) {
+func (m *MemoryManager) ListGroups(limit, offset int) ([]Group, error) {
 	if m.Groups == nil {
 		m.Groups = map[string]Group{}
 	}
 
-	if offset+limit > int64(len(m.Groups)) {
-		return []Group{}, nil
-	}
-
-	i := int64(0)
+	i := 0
 	res := make([]Group, len(m.Groups))
 	for _, g := range m.Groups {
 		res[i] = g
 		i++
 	}
 
-
-	return res[offset:limit], nil
+	start, end := pagination.Index(limit, offset, len(res))
+	return res[start:end], nil
 }

warden/group/manager_sql.go

@@ -142,7 +142,7 @@ func (m *SQLManager) RemoveGroupMembers(group string, subjects []string) error {
 	return nil
 }
 
-func (m *SQLManager) FindGroupsByMember(subject string, limit, offset int64) ([]Group, error) {
+func (m *SQLManager) FindGroupsByMember(subject string, limit, offset int) ([]Group, error) {
 	var ids []string
 	if err := m.DB.Select(&ids, m.DB.Rebind("SELECT group_id from hydra_warden_group_member WHERE member = ? GROUP BY group_id ORDER BY group_id LIMIT ? OFFSET ?"), subject, limit, offset); err == sql.ErrNoRows {
 		return nil, errors.WithStack(pkg.ErrNotFound)
@@ -163,7 +163,7 @@ func (m *SQLManager) FindGroupsByMember(subject string, limit, offset int64) ([]
 	return groups, nil
 }
 
-func (m *SQLManager) ListGroups(limit, offset int64) ([]Group, error) {
+func (m *SQLManager) ListGroups(limit, offset int) ([]Group, error) {
 	var ids []string
 	if err := m.DB.Select(&ids, m.DB.Rebind("SELECT group_id from hydra_warden_group_member GROUP BY group_id ORDER BY group_id LIMIT ? OFFSET ?"), limit, offset); err == sql.ErrNoRows {
 		return nil, errors.WithStack(pkg.ErrNotFound)