From f1bc68c73e7183a0ad30c6aefc6cc4cbbf1bc1f0 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Mon, 18 Nov 2013 16:18:33 -0800
Subject: Need to cleanup some, but start to show public key for /key/username

---
 users/app/controllers/users_controller.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'users/app/controllers')

diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 3cbb6dc..3f4daeb 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -59,4 +59,10 @@ class UsersController < UsersBaseController
     end
   end
 
+  def get_public_key
+    @show_navigation = false
+    user = User.find_by_login(params[:login])
+    @public_key = user.public_key if user
+  end
+
 end
-- 
cgit v1.2.3


From d82ea5da2aa705bcfa74f2a8b42a197883b694e3 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Thu, 21 Nov 2013 12:15:03 -0800
Subject: Refactoring of code, and tests.

---
 users/app/controllers/keys_controller.rb  | 10 ++++++++++
 users/app/controllers/users_controller.rb |  6 ------
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 users/app/controllers/keys_controller.rb

(limited to 'users/app/controllers')

diff --git a/users/app/controllers/keys_controller.rb b/users/app/controllers/keys_controller.rb
new file mode 100644
index 0000000..9a39fc4
--- /dev/null
+++ b/users/app/controllers/keys_controller.rb
@@ -0,0 +1,10 @@
+class KeysController < ApplicationController
+
+  def show
+    user = User.find_by_login(params[:login])
+    # layout won't be included if we render text
+    # we will show blank page if user doesn't have key or user doesn't exist
+    render text: user ? user.public_key : ''
+  end
+
+end
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 3f4daeb..3cbb6dc 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -59,10 +59,4 @@ class UsersController < UsersBaseController
     end
   end
 
-  def get_public_key
-    @show_navigation = false
-    user = User.find_by_login(params[:login])
-    @public_key = user.public_key if user
-  end
-
 end
-- 
cgit v1.2.3


From 299dfdf4164ee10de63aa2543935eeed65437b3f Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Mon, 25 Nov 2013 11:31:33 -0800
Subject: Give 404 error if one goes to /key/user for non-existing user.

---
 users/app/controllers/keys_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'users/app/controllers')

diff --git a/users/app/controllers/keys_controller.rb b/users/app/controllers/keys_controller.rb
index 9a39fc4..949f2c0 100644
--- a/users/app/controllers/keys_controller.rb
+++ b/users/app/controllers/keys_controller.rb
@@ -3,8 +3,10 @@ class KeysController < ApplicationController
   def show
     user = User.find_by_login(params[:login])
     # layout won't be included if we render text
-    # we will show blank page if user doesn't have key or user doesn't exist
-    render text: user ? user.public_key : ''
+    # we will show blank page if user doesn't have key (which shouldn't generally occur)
+    # and a 404 error if user doesn't exist
+    user ? (render text: user.public_key) : (raise ActionController::RoutingError.new('Not Found'))
+
   end
 
 end
-- 
cgit v1.2.3