summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2014-07-11 14:55:36 +0200
committerFolker Bernitt <fbernitt@thoughtworks.com>2014-07-14 09:56:23 +0200
commit821b1444dcc147b9c1205326a2d28651c369a52d (patch)
tree451d67ee217d3f54ef783059aad5bca4269df93a /app
parent07b141f3d677e993f02380b455738b20b9f0fe42 (diff)
Moved check for allow_registration into filter.
Diffstat (limited to 'app')
-rw-r--r--app/controllers/users_controller.rb15
-rw-r--r--app/controllers/v1/users_controller.rb15
2 files changed, 19 insertions, 11 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a623653..0f822cb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -8,6 +8,7 @@ class UsersController < UsersBaseController
before_filter :redirect_if_logged_in, :only => [:new]
before_filter :require_admin, :only => [:index, :deactivate, :enable]
before_filter :fetch_user, :only => [:show, :edit, :update, :destroy, :deactivate, :enable]
+ before_filter :require_registration_allowed, only: :new
respond_to :html
@@ -26,11 +27,7 @@ class UsersController < UsersBaseController
end
def new
- if APP_CONFIG[:allow_registration]
- @user = User.new
- else
- redirect_to home_path
- end
+ @user = User.new
end
def show
@@ -70,4 +67,12 @@ class UsersController < UsersBaseController
end
end
+ protected
+
+ def require_registration_allowed
+ unless APP_CONFIG[:allow_registration]
+ redirect_to home_path
+ end
+ end
+
end
diff --git a/app/controllers/v1/users_controller.rb b/app/controllers/v1/users_controller.rb
index 881708a..abaefd8 100644
--- a/app/controllers/v1/users_controller.rb
+++ b/app/controllers/v1/users_controller.rb
@@ -5,6 +5,7 @@ module V1
before_filter :fetch_user, :only => [:update]
before_filter :require_admin, :only => [:index]
before_filter :require_token, :only => [:update]
+ before_filter :require_registration_allowed, only: :create
respond_to :json
@@ -19,12 +20,8 @@ module V1
end
def create
- if APP_CONFIG[:allow_registration]
- @user = Account.create(params[:user])
- respond_with @user # return ID instead?
- else
- head :forbidden
- end
+ @user = Account.create(params[:user])
+ respond_with @user # return ID instead?
end
def update
@@ -32,5 +29,11 @@ module V1
respond_with @user
end
+ def require_registration_allowed
+ unless APP_CONFIG[:allow_registration]
+ head :forbidden
+ end
+ end
+
end
end