model_driven_api 3.2.7 → 3.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6355671a58c563bf10480491a193f8d0f3777a87aeda572ce8cd5aef9202ee71
-  data.tar.gz: fc2dc537d4da4cba5fec9979ccf480bad7d8a1c28fefc8e3c23716c8363f0dca
+  metadata.gz: e3cd19d5c69348493256387515146bca60041d648fd49acc939181dd8a859e35
+  data.tar.gz: e5a2a33889767d9b8aedbfa4e6eb2895a5153a313d32073e767080cb20481692
 SHA512:
-  metadata.gz: 168b2156b31846474aea51786fd2adb19c421b80898ada6a6d58f08a1a29c7dcd864eb96e08a087bae9272032c96cf7a4238d4075d030238e65a9231488e29fb
-  data.tar.gz: 3e572dd6a73561db3d595c29ecb9ae817afd54715418fe1ea666bee383ede1c97f6bb0642e76fdd2927015487bb0efe37afd526ff6cd94aa4036fff655ce6b3f
+  metadata.gz: c4482340718ac9a9b88a4381cf2e807f3c226aa6979c4f3d45c4fb1e2ddff5668ba3acc748b40fbc431f9c3702a05a6e81a4ccc4baad154a8ce8c447b165b4e9
+  data.tar.gz: b252c95eed43d4c6216cf29c7f184bb3563128319f9605d9454bbb67cfe32eab0781b8f085cc478cc110c27ed6d509dc61c3d8add74ffc35d367ffc57d6e108c

data/app/commands/authorize_api_request.rb

@@ -14,17 +14,28 @@ class AuthorizeApiRequest
     attr_reader :headers
     
     def api_user
+        Rails.logger.debug "AuthorizeApiRequest: api_user -> #{decoded_auth_token}"
         @api_user ||= User.find(decoded_auth_token[:user_id]) if decoded_auth_token
-        @api_user || errors.add(:token, "Invalid token") && nil
+        if @api_user
+            return @api_user
+        else
+            errors.add(:token, "Invalid token")
+            return nil
+        end
     end
     
     def decoded_auth_token
+        Rails.logger.debug "AuthorizeApiRequest: http_auth_header -> #{http_auth_header}"
         @decoded_auth_token ||= JsonWebToken.decode(http_auth_header)
+        @decoded_auth_token
     end
     
     def http_auth_header
+        Rails.logger.debug "AuthorizeApiRequest: Authorization -> #{headers['Authorization']}"
         if headers['Authorization'].present?
-            return headers['Authorization'].split(' ').last
+            token = headers['Authorization'].split(' ').last
+            Rails.logger.debug "AuthorizeApiRequest: token -> #{token}"
+            return token
         else
             errors.add(:token, "Missing token")
         end

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

@@ -44,7 +44,7 @@ class Api::V2::ApplicationController < ActionController::API
     # puts "If it's asked for page number, then paginate"
     return render json: @records.as_json(json_attrs), status: status if !page.blank? # (@json_attrs || {})
     #puts "if you ask for count, then return a json object with just the number of objects"
-    return render json: { count: @records_all.count } if !count.blank?
+    return render json: { count: @records_all.size } if !count.blank?
     #puts "Default"
     json_out = @records_all.as_json(json_attrs)
     #puts "JSON ATTRS: #{json_attrs}"
@@ -195,9 +195,11 @@ 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))
+      check_authorization("Authorize#{header}".constantize.call(request)) unless @current_user
     end
 
+    Rails.logger.debug("Checking for authorization with AuthorizeApiRequest if current_user not already present -> current_user: #{@current_user}")
+
     check_authorization AuthorizeApiRequest.call(request) unless @current_user
     return unauthenticated!(OpenStruct.new({ message: @auth_errors })) unless @current_user
 
@@ -240,6 +242,7 @@ class Api::V2::ApplicationController < ActionController::API
   end
 
   def check_authorization(cmd)
+    Rails.logger.debug("Checking authorization: #{cmd.inspect}")
     if cmd.success?
       @current_user = cmd.result
     else

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.2.7".freeze
+  VERSION = "3.2.9".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.9
 platform: ruby
 authors:
 - Gabriele Tassoni
 bindir: bin
 cert_chain: []
-date: 2025-01-16 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons