From 2f7acbe4b3c51a5fa82cbe84a38a28e59bd04315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <jonne.hass@offerista.com>
Date: Sun, 28 Apr 2019 14:51:09 +0200
Subject: [PATCH] API: fix missing page parameter to integer conversion

---
 app/views/api/openid_connect/authorizations/new.html.haml | 2 +-
 lib/api/paging/rest_paginator_builder.rb                  | 4 ++--
 spec/lib/api/paging/rest_paginator_builder_spec.rb        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/api/openid_connect/authorizations/new.html.haml b/app/views/api/openid_connect/authorizations/new.html.haml
index 6079db345..06999c762 100644
--- a/app/views/api/openid_connect/authorizations/new.html.haml
+++ b/app/views/api/openid_connect/authorizations/new.html.haml
@@ -9,6 +9,6 @@
             = submit_tag t(".deny"), class: "btn btn-danger"
             = hidden_field_tag :approve, false
 
-          = form_tag api_openid_connect_authorizations_path, class: "approval-button"do
+          = form_tag api_openid_connect_authorizations_path, class: "approval-button" do
             = submit_tag t(".approve"),  class: "btn btn-primary"
             = hidden_field_tag :approve, true
diff --git a/lib/api/paging/rest_paginator_builder.rb b/lib/api/paging/rest_paginator_builder.rb
index 08a6096d8..36614b26d 100644
--- a/lib/api/paging/rest_paginator_builder.rb
+++ b/lib/api/paging/rest_paginator_builder.rb
@@ -40,7 +40,7 @@ module Api
 
       def current_page_settings(params)
         if params["page"]
-          requested_page = params["page"]
+          requested_page = params["page"].to_i
           requested_page = 1 if requested_page < 1
           requested_page
         elsif @allow_default_page
@@ -71,7 +71,7 @@ module Api
       end
 
       def limit_settings(params)
-        requested_limit = params["per_page"]
+        requested_limit = params["per_page"].to_i if params["per_page"]
         return @default_limit unless requested_limit
 
         requested_limit = [1, requested_limit].max
diff --git a/spec/lib/api/paging/rest_paginator_builder_spec.rb b/spec/lib/api/paging/rest_paginator_builder_spec.rb
index 646cc6544..dd62d8e89 100644
--- a/spec/lib/api/paging/rest_paginator_builder_spec.rb
+++ b/spec/lib/api/paging/rest_paginator_builder_spec.rb
@@ -2,7 +2,7 @@
 
 describe Api::Paging::RestPaginatorBuilder do
   it "generates page response builder called with index-based pager" do
-    params = ActionController::Parameters.new(page: 1)
+    params = ActionController::Parameters.new(page: "1", per_page: "20")
     pager = Api::Paging::RestPaginatorBuilder.new(alice.posts, nil).index_pager(params)
     expect(pager.is_a?(Api::Paging::RestPagedResponseBuilder)).to be_truthy
   end