From 3f9dc65636afb57fed441978dca4bf7d3209bd2d Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 7 Feb 2014 14:38:56 +0100
Subject: rename authorize to require_login

authorize_admin -> require_admin

also add require_token which will ensure token has been used for auth.
---
 certs/app/controllers/certs_controller.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'certs')

diff --git a/certs/app/controllers/certs_controller.rb b/certs/app/controllers/certs_controller.rb
index 62ef3fd..82cbc44 100644
--- a/certs/app/controllers/certs_controller.rb
+++ b/certs/app/controllers/certs_controller.rb
@@ -1,6 +1,6 @@
 class CertsController < ApplicationController
 
-  before_filter :login_if_required
+  before_filter :require_login, :unless => :anonymous_certs_allowed?
 
   # GET /cert
   def show
@@ -10,10 +10,9 @@ class CertsController < ApplicationController
 
   protected
 
-  def login_if_required
-    authorize unless APP_CONFIG[:allow_anonymous_certs]
+  def anonymous_certs_allowed?
+    APP_CONFIG[:allow_anonymous_certs]
   end
-
   #
   # this is some temporary logic until we store the service level in the user db.
   #
-- 
cgit v1.2.3