diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index a7993f90..b385b1b6 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -8,3 +8,5 @@ // //= link supplier/foundation1/application.js //= link supplier/foundation1/application.css +// +//= link supplier/app/application.js diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index af9fa792..c76cc4db 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -15,6 +15,15 @@ class ApplicationController < ActionController::Base private + def authenticate_employee! + if auth_token = params[:auth_token].presence + raise CanCan::AccessDenied unless employee = Employee.find_by_authentication_token(auth_token) + sign_in employee + else + super + end + end + def allow_all_origins headers['Access-Control-Allow-Origin'] = '*' headers['Access-Control-Request-Method'] = '*' diff --git a/app/controllers/suppliers/application_controller.rb b/app/controllers/suppliers/application_controller.rb index b19911c5..f89e202d 100644 --- a/app/controllers/suppliers/application_controller.rb +++ b/app/controllers/suppliers/application_controller.rb @@ -25,7 +25,8 @@ module Suppliers supplier = current_supplier || employee.suppliers.first render json: { employee: JSONAPI::Serializer.serialize(employee, serializer: Suppliers::EmployeeSerializer), - supplier: JSONAPI::Serializer.serialize(supplier, serializer: Suppliers::SupplierSerializer) + supplier: JSONAPI::Serializer.serialize(supplier, serializer: Suppliers::SupplierSerializer), + auth_token: employee.authentication_token, } end diff --git a/lib/qwaiter/supplier_base_serializer.rb b/lib/qwaiter/supplier_base_serializer.rb index 7bf0d37e..4f440a35 100644 --- a/lib/qwaiter/supplier_base_serializer.rb +++ b/lib/qwaiter/supplier_base_serializer.rb @@ -22,7 +22,8 @@ module Qwaiter::SupplierBaseSerializer #alias_method :default_relationship_related_link, :relationship_related_link def relationship_related_link(attribute_name) #super if related_link_for_attributes.include?(attribute_name) - super + #super + nil end