raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-17 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce current_user with memoization

Browse Source
This commit is contained in:
François Turbelin
2020-09-02 22:18:56 +02:00
parent 4f2b7094d0
commit 1baba5b61c
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engines/dfc_provider/app/controllers/dfc_provider/api/base_controller.rb
View File

@@ -21,9 +21,7 @@ module DfcProvider
end
def check_user
@user = authorization_control.process
return if @user.present?
return if current_user.present?
head :unauthorized
end
@@ -31,12 +29,16 @@ module DfcProvider
def check_enterprise
@enterprise =
if params[:enterprise_id] == 'default'
@user.enterprises.first!
current_user.enterprises.first!
else
@user.enterprises.find(params[:enterprise_id])
current_user.enterprises.find(params[:enterprise_id])
end
end
def current_user
@current_user ||= authorization_control.process
end
def access_token
request.headers['Authorization'].to_s.split(' ').last
end

2
engines/dfc_provider/app/controllers/dfc_provider/api/catalog_items_controller.rb
View File

@@ -5,7 +5,7 @@ module DfcProvider
module Api
class CatalogItemsController < BaseController
def index
render json: @user, serializer: DfcProvider::PersonSerializer
render json: current_user, serializer: DfcProvider::PersonSerializer
end
def show

4
engines/dfc_provider/app/controllers/dfc_provider/api/enterprises_controller.rb
View File

@@ -13,9 +13,9 @@ module DfcProvider
def check_enterprise
@enterprise =
if params[:id] == 'default'
@user.enterprises.first!
current_user.enterprises.first!
else
@user.enterprises.find(params[:id])
current_user.enterprises.find(params[:id])
end
end
end

10
engines/dfc_provider/app/controllers/dfc_provider/api/people_controller.rb
View File

@@ -6,20 +6,20 @@ module DfcProvider
class PeopleController < BaseController
skip_before_action :check_enterprise
before_action :find_user, :check_user_accessibility
before_action :check_user_accessibility
def show
render json: @user, serializer: DfcProvider::PersonSerializer
render json: user, serializer: DfcProvider::PersonSerializer
end
private
def find_user
@retrieved_user = Spree::User.find(params[:id])
def user
@user ||= Spree::User.find(params[:id])
end
def check_user_accessibility
return if @user == @retrieved_user
return if current_user == user
not_found
end