model_driven_api 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ae75e607281baf108e6841f71d4dd5e9f55f8e1fc1658fb83020e28a61338da
-  data.tar.gz: 9639e68bb94fb4a1562b5078c8832cf2c4fb8b5033b42b2dde1441e9863fc16e
+  metadata.gz: 77497a359b4d336baf533725376f1122b376d2a97b05bcf3e8f7e203d4963780
+  data.tar.gz: 8a799a1009588c764b5dbec7ea1b1cfd4c7f8c1d4ac4554bccb22b35877531a1
 SHA512:
-  metadata.gz: 145cce106430f76bcae76084684c5926fbd5fbfb774a285778fadf78e5443b1c750a46e71e8775adde75582bfa36548e0b0353bcf7a36fb86bcd524c6acf21d0
-  data.tar.gz: ad33e323b89e297f16899d99931321ed262dfb07b05b4bd938f19e1250108a0c769d6ca7690c604cfbb2a860f19bedd5d79cce535065c016f042ecb56f49b96a
+  metadata.gz: abd1210273d04c393f6a6b46e593f52da8dba14bce52dd3351b3cc3c5575c9c931826538035566a186c9d4af0596cea2f54aa1ce6d685dc7136feb933f82ce1a
+  data.tar.gz: 6b822a4b6da0f2718a7837124e654fc6c5ba7223798171621d669de2fd54aa4e9a933a99d5c5cf7c5b0b5641fc2eab6f5b729bef7d4d7ae8a4531fda20e3aa87

data/app/commands/authorize_api_request.rb

@@ -1,8 +1,8 @@
 class AuthorizeApiRequest
     prepend SimpleCommand
     
-    def initialize(headers = {})
-        @headers = headers
+    def initialize(request = {})
+        @headers = request.headers rescue {}
     end
     
     def call

data/app/controllers/api/v2/application_controller.rb

@@ -129,11 +129,12 @@ class Api::V2::ApplicationController < ActionController::API
         unless params[:do].blank?
             # Poor man's solution to avoid the possibility to 
             # call an unwanted method in the AR Model.
-            resource = "custom_action_#{params[:do]}"
+            custom_action, token = params[:do].split("-")
+            resource = "custom_action_#{custom_action}"
             raise NoMethodError unless @model.respond_to?(resource)
             # puts json_attrs
             params[:request_url] = request.url
-            params[:token] = bearer_token
+            params[:token] = token.presence || bearer_token
             body, status = @model.send(resource, params)
             return true, body.to_json(json_attrs), status
         end
@@ -158,10 +159,10 @@ class Api::V2::ApplicationController < ActionController::API
         @current_user = nil
         Settings.ns(:security).allowed_authorization_headers.split(",").each do |header|
             # puts "Found header #{header}: #{request.headers[header]}" 
-            check_authorization("Authorize#{header}".constantize.call(request.headers)) # if request.headers[header]
+            check_authorization("Authorize#{header}".constantize.call(request))
         end
         
-        check_authorization AuthorizeApiRequest.call(request.headers) unless @current_user
+        check_authorization AuthorizeApiRequest.call(request) unless @current_user
         return unauthenticated!(OpenStruct.new({message: @auth_errors})) unless @current_user
         
         current_user = @current_user

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.0.10".freeze
+  VERSION = "3.0.11".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons