From e05a1b0f5ae40a2aa17976b3009cd563b8e4660a Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sun, 1 May 2016 10:55:33 -0300
Subject: api: allow version bumping - bump to 2

---
 app/controllers/api/configs_controller.rb | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 app/controllers/api/configs_controller.rb

(limited to 'app/controllers/api/configs_controller.rb')

diff --git a/app/controllers/api/configs_controller.rb b/app/controllers/api/configs_controller.rb
new file mode 100644
index 0000000..55ceb4f
--- /dev/null
+++ b/app/controllers/api/configs_controller.rb
@@ -0,0 +1,37 @@
+class Api::ConfigsController < ApiController
+  include ControllerExtension::JsonFile
+
+  before_filter :require_login, :unless => :anonymous_access_allowed?
+  before_filter :sanitize_id, only: :show
+
+  def index
+    render json: {services: service_paths}
+  end
+
+  def show
+    send_file lookup_file
+  end
+
+  protected
+
+  SERVICE_IDS = {
+    soledad: "soledad-service",
+    eip: "eip-service",
+    smtp: "smtp-service"
+  }
+
+  def service_paths
+    Hash[SERVICE_IDS.map{|k,v| [k,"/1/configs/#{v}.json"] } ]
+  end
+
+  def sanitize_id
+    @id = params[:id].downcase
+    access_denied unless SERVICE_IDS.values.include? @id
+  end
+
+  def lookup_file
+    path = APP_CONFIG[:config_file_paths][@id]
+    not_found if path.blank?
+    Rails.root.join path
+  end
+end
-- 
cgit v1.2.3


From 83f59164fc069f2593cf6babbc18638d9a68c9a3 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 18 May 2016 20:21:04 +0200
Subject: features for API version 2 - keep old ones

Now we test both api versions. We want this for backwards compatibility.
---
 app/controllers/api/configs_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/controllers/api/configs_controller.rb')

diff --git a/app/controllers/api/configs_controller.rb b/app/controllers/api/configs_controller.rb
index 55ceb4f..0f9b8a6 100644
--- a/app/controllers/api/configs_controller.rb
+++ b/app/controllers/api/configs_controller.rb
@@ -21,7 +21,11 @@ class Api::ConfigsController < ApiController
   }
 
   def service_paths
-    Hash[SERVICE_IDS.map{|k,v| [k,"/1/configs/#{v}.json"] } ]
+    Hash[SERVICE_IDS.map{|k,v| [k,"/#{api_version}/configs/#{v}.json"] } ]
+  end
+
+  def api_version
+    ["1", "2"].include?(params[:version]) ? params[:version] : "2"
   end
 
   def sanitize_id
-- 
cgit v1.2.3