From df29e48d8c7e86a3193b942ff81987458f1d3486 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Tue, 4 Oct 2016 22:51:21 +0800 Subject: [PATCH] rubocop + allow unauthed users to see all users --- app/controllers/api/v2/users_controller.rb | 4 ++-- app/policies/metacode_policy.rb | 1 + app/policies/user_policy.rb | 10 +++++----- app/serializers/api/v2/user_serializer.rb | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/v2/users_controller.rb b/app/controllers/api/v2/users_controller.rb index 9eba232f..b4b83e3f 100644 --- a/app/controllers/api/v2/users_controller.rb +++ b/app/controllers/api/v2/users_controller.rb @@ -5,9 +5,9 @@ module Api def current @user = current_user authorize @user - return show + show # delegate to the normal show function end - + private def searchable_columns diff --git a/app/policies/metacode_policy.rb b/app/policies/metacode_policy.rb index e8787f8d..626d23e3 100644 --- a/app/policies/metacode_policy.rb +++ b/app/policies/metacode_policy.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true class MetacodePolicy < ApplicationPolicy def index? true diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index fa6158b8..943200e8 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -1,14 +1,15 @@ +# frozen_string_literal: true class UserPolicy < ApplicationPolicy def index? - user.present? + true end def show? - user.present? + true end def create? - fail 'Create should be handled by Devise' + raise 'Create should be handled by Devise' end def update? @@ -34,8 +35,7 @@ class UserPolicy < ApplicationPolicy class Scope < Scope def resolve - return scope.all if user.present? - scope.none + scope.all end end end diff --git a/app/serializers/api/v2/user_serializer.rb b/app/serializers/api/v2/user_serializer.rb index 3234205e..c3b0c3fe 100644 --- a/app/serializers/api/v2/user_serializer.rb +++ b/app/serializers/api/v2/user_serializer.rb @@ -8,7 +8,7 @@ module Api :generation attribute :is_admin, - if: -> { scope[:show_is_admin] && scope[:current_user] == object } + if: -> { scope[:show_is_admin] && scope[:current_user] == object } def avatar object.image.url(:sixtyfour)