avo 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cab03834ddaad490fcd3f0eb64f9ac2006dacb235c2ffb34a451139da31444a
-  data.tar.gz: 20c9770b7b259b0207857e4b70450b73748c5d30b7dd405662b720e5f97499ba
+  metadata.gz: f524eb45dfab913083b9fc23de6c35146d59436336d3e444ae8b525b9a70e6b2
+  data.tar.gz: 4075e8ca48aff4aa7cbd21a52ee6b6e67535a0bcf69652ed3f9298d39fbfde2f
 SHA512:
-  metadata.gz: e024dbbb67133f849c0b45b65694ba6322bf8e07d5ae399280e9e233b54bf26ee954aaabf8eebdfd81e33db79b007ce78a73be5fc99e5fb3b5089b4a75121d81
-  data.tar.gz: 1d52cf19ca6a8a831222fd36762862de3e88f8f02c4469eaa19e98844da6f707677120e0f92d13bb47caed37fa3e7cf3f24b6f7f10a049805cbe222a3653fb42
+  metadata.gz: e3c1a13390fee90c6fb892eeae21d66151a66aa29055d16437251060f341bd86eba8315caf0a249330ee5d5f4b1943276cf79862e0bb361ec07f5ba7df50fc1d
+  data.tar.gz: 402ded6bc6111f30321d03eb2282895acdc25761567efb42e260e7c971854a305022f13afe8d300c947792796e2e5fe17c0f36204938ce14c05f4679cc214ccc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (0.4.5)
+    avo (0.4.6)
       countries
       httparty
       i18n-js

data/app/controllers/avo/application_controller.rb

@@ -3,6 +3,9 @@ module Avo
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
     protect_from_forgery with: :exception
     before_action :init_app
+    before_action :_authenticate!
+
+    helper_method :_current_user
 
     def init_app
       Avo::App.boot if Avo::IN_DEVELOPMENT
@@ -22,6 +25,10 @@ module Avo
       end
     end
 
+    def _current_user
+      instance_eval(&Avo.configuration.current_user)
+    end
+
     private
       def resource
         eager_load_files(resource_model).find params[:id]
@@ -54,11 +61,15 @@ module Avo
           record = resource
         end
 
-        return render_unauthorized unless AuthorizationService::authorize_action current_user, record, params[:action]
+        return render_unauthorized unless AuthorizationService::authorize_action _current_user, record, params[:action]
       end
 
       def render_unauthorized
         render json: { message: I18n.t('avo.unauthorized') }, status: 403
       end
+
+      def _authenticate!
+        instance_eval(&Avo.configuration.authenticate)
+      end
   end
 end

data/app/controllers/avo/resource_overview_controller.rb

@@ -4,7 +4,7 @@ module Avo
   class ResourceOverviewController < ApplicationController
     def index
       resources = App.get_resources
-        .select { |resource| AuthorizationService::authorize session_user, resource.model, Avo.configuration.authorization_methods.stringify_keys['index'] }
+        .select { |resource| AuthorizationService::authorize _current_user, resource.model, Avo.configuration.authorization_methods.stringify_keys['index'] }
         .sort_by(&:name)
         .map do |resource|
           {
@@ -20,10 +20,5 @@ module Avo
         hide_docs: Avo.configuration.hide_documentation_link,
       }
     end
-
-    private
-      def session_user
-        current_user.present? ? current_user : nil
-      end
   end
 end

data/app/controllers/avo/resources_controller.rb

@@ -10,14 +10,14 @@ module Avo
       params[:sort_by] = params[:sort_by].present? ? params[:sort_by] : :created_at
       params[:sort_direction] = params[:sort_direction].present? ? params[:sort_direction] : :desc
 
-      query = AuthorizationService.with_policy current_user, resource_model
+      query = AuthorizationService.with_policy _current_user, resource_model
 
       if params[:via_resource_name].present? and params[:via_resource_id].present? and params[:via_relationship].present?
         # get the related resource (via_resource)
         related_model = App.get_resource_by_name(params[:via_resource_name]).model
 
         relation = related_model.find(params[:via_resource_id]).public_send(params[:via_relationship])
-        query = AuthorizationService.with_policy current_user, relation
+        query = AuthorizationService.with_policy _current_user, relation
 
         params[:per_page] = Avo.configuration.via_per_page
       elsif ['has_many', 'has_and_belongs_to_many'].include? params[:for_relation]
@@ -52,7 +52,7 @@ module Avo
 
       resources_with_fields = []
       resources.each do |resource|
-        resources_with_fields << Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: :index, user: current_user)
+        resources_with_fields << Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: :index, user: _current_user)
       end
 
       render json: {
@@ -66,7 +66,7 @@ module Avo
 
     def show
       render json: {
-        resource: Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: @view || :show, user: current_user),
+        resource: Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: @view || :show, user: _current_user),
       }
     end
 
@@ -94,7 +94,7 @@ module Avo
 
       render json: {
         success: true,
-        resource: Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: :show, user: current_user),
+        resource: Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: :show, user: _current_user),
         message: I18n.t('avo.resource_updated'),
       }
     end
@@ -117,14 +117,14 @@ module Avo
 
       render json: {
         success: true,
-        resource: Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: :create, user: current_user),
+        resource: Avo::Resources::Resource.hydrate_resource(model: resource, resource: avo_resource, view: :create, user: _current_user),
         message: I18n.t('avo.resource_created'),
       }
     end
 
     def new
       render json: {
-        resource: Avo::Resources::Resource.hydrate_resource(model: resource_model.new, resource: avo_resource, view: :create, user: current_user),
+        resource: Avo::Resources::Resource.hydrate_resource(model: resource_model.new, resource: avo_resource, view: :create, user: _current_user),
       }
     end
 
@@ -256,13 +256,7 @@ module Avo
           available_view_types: avo_resource.available_view_types,
           default_view_type: avo_resource.default_view_type || Avo.configuration.default_view_type,
           translation_key: avo_resource.translation_key,
-          authorization: {
-            create: AuthorizationService::authorize(current_user, avo_resource.model, Avo.configuration.authorization_methods.stringify_keys['create']),
-            edit: AuthorizationService::authorize(current_user, avo_resource.model, Avo.configuration.authorization_methods.stringify_keys['edit']),
-            update: AuthorizationService::authorize(current_user, avo_resource.model, Avo.configuration.authorization_methods.stringify_keys['update']),
-            show: AuthorizationService::authorize(current_user, avo_resource.model, Avo.configuration.authorization_methods.stringify_keys['show']),
-            destroy: AuthorizationService::authorize(current_user, avo_resource.model, Avo.configuration.authorization_methods.stringify_keys['destroy']),
-          },
+          authorization: AuthorizationService::authorized_methods(_current_user, avo_resource.model)
         }
       end
   end

data/app/controllers/avo/search_controller.rb

@@ -9,7 +9,7 @@ module Avo
 
       resources_to_search_through = App.get_resources
         .select { |resource| resource.search.present? }
-        .select { |resource| AuthorizationService.authorize_action current_user, resource.model, 'index' }
+        .select { |resource| AuthorizationService.authorize_action _current_user, resource.model, 'index' }
         .each do |resource_model|
           found_resources = add_link_to_search_results(search_resource(resource_model), resource_model)
           resources.push({
@@ -41,7 +41,7 @@ module Avo
       end
 
       def search_resource(avo_resource)
-        avo_resource.query_search(query: params[:q], via_resource_name: params[:via_resource_name], via_resource_id: params[:via_resource_id], user: current_user)
+        avo_resource.query_search(query: params[:q], via_resource_name: params[:via_resource_name], via_resource_id: params[:via_resource_id], user: _current_user)
       end
 
       def authorize_user
@@ -49,7 +49,7 @@ module Avo
 
         action = params[:action] == 'resource' ? :index : params[:action]
 
-        return render_unauthorized unless AuthorizationService::authorize_action current_user, avo_resource.model, action
+        return render_unauthorized unless AuthorizationService::authorize_action _current_user, avo_resource.model, action
       end
   end
 end

data/app/views/layouts/avo/_javascript.html.erb

@@ -4,5 +4,5 @@
   var locale = '<%= Avo.configuration.locale %>';
   var defaultViewType = '<%= Avo.configuration.default_view_type %>';
   var license = <%= Avo::App.license.properties.to_json.html_safe %>;
-  var avoResources = <%= Avo::App.get_available_resources(current_user).as_json.html_safe %>;
+  var avoResources = <%= Avo::App.get_available_resources(_current_user).as_json.html_safe %>;
 <% end %>

data/lib/avo/app/services/authorization_service.rb

@@ -3,6 +3,7 @@ module Avo
     class << self
       def authorize(user, record, action)
         return true if skip_authorization
+        return true if user.nil?
 
         begin
           if Pundit.policy user, record
@@ -24,6 +25,7 @@ module Avo
 
       def with_policy(user, model)
         return model if skip_authorization
+        return model if user.nil?
 
         begin
           Pundit.policy_scope! user, model
@@ -35,6 +37,12 @@ module Avo
       def skip_authorization
         Avo::App.license.lacks :authorization
       end
+
+      def authorized_methods(user, record)
+        [:create, :edit, :update, :show, :destroy].map do |method|
+          [method, authorize(user, record, Avo.configuration.authorization_methods[method])]
+        end.to_h
+      end
     end
   end
 end

data/lib/avo/configuration.rb

@@ -14,6 +14,8 @@ module Avo
     attr_accessor :license
     attr_accessor :license_key
     attr_accessor :authorization_methods
+    attr_accessor :authenticate
+    attr_accessor :current_user
 
     def initialize
       @root_path = '/avo'
@@ -29,6 +31,8 @@ module Avo
       @hide_documentation_link = false
       @license = 'community'
       @license_key = nil
+      @current_user = proc {}
+      @authenticate = proc {}
       @authorization_methods = {
         index: 'index?',
         show: 'show?',
@@ -51,6 +55,14 @@ module Avo
         'en'
       end
     end
+
+    def current_user_method(&block)
+      @current_user = block if block.present?
+    end
+
+    def authenticate_with(&block)
+      @authenticate = block if block.present?
+    end
   end
 
   def self.configuration

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

data/lib/generators/avo/templates/initializer/avo.rb

@@ -1,5 +1,41 @@
 Avo.configure do |config|
+  ## == Routing ==
   config.root_path = '/<%= options[:path] %>'
+
+  ## == Licensing ==
   config.license = 'community'
-  config.license_key = nil
+  # config.license_key = ENV['AVO_LICENSE_KEY']
+
+  ## == Authentication ==
+  # config.current_user_method(&:current_user)
+  # config.authenticate_with do
+  #   warden.authenticate! scope: :user
+  # end
+
+  ## == Authorization ==
+  # config.authorization_methods = {
+  #   index: 'index?',
+  #   show: 'show?',
+  #   edit: 'edit?',
+  #   new: 'new?',
+  #   update: 'update?',
+  #   create: 'create?',
+  #   destroy: 'destroy?',
+  # }
+
+  ## == Localization ==
+
+  ## == Customization ==
+  # config.app_name = 'Avocadelicious'
+  # config.locale = 'en-US'
+  # config.timezone = 'UTC'
+  # config.currency = 'USD'
+  # config.per_page = 24
+  # config.per_page_steps = [12, 24, 48, 72]
+  # config.via_per_page = 8
+  # config.default_view_type = :table
+
+  ## == Beta version ==
+  # config.hide_resource_overview_component = false
+  # config.hide_documentation_link = false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails