model_driven_api 3.2.6 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b97e79e1bc34847a05fd1c9ac004c0f64d15203b2a803d176559bfdcc2b3cf4e
-  data.tar.gz: 6c48764ef66785db7b5793bd0bde4526233f39ae10650ec76c98799f0ac5efef
+  metadata.gz: 66f79849229a707224dc7cfdb61e3cb53995e2ba6e4b01c7485f9b1115791dfb
+  data.tar.gz: d5ba4ba9e7e4c0d750683c230e63d3f3d9f7785c64e4fee8da96f06ea52dc1b5
 SHA512:
-  metadata.gz: 925b9065f28afcfa64652a4262eccf1ad59f829c153f8b9950653331857c9020649633be0590e18c7acfe29aafa06118c839cbbce3e993085c77f98d4d7c4e59
-  data.tar.gz: 2ae0d12d73b4c23113d0f98d1829adf4e35ea8a29fa0370d7d7fdd0f8fae5fe3dfcbfab33a7bbd6e0b6a97b9e5a9c431bdcdef403114b2f1846d06a50f701fc9
+  metadata.gz: '0578ec016dc2dd7fcee4eef1fed2fcd765ed13a9a1391383911fbeb336b2a8654efee5d043a3a803dd2af83440a83048315b9034873bd19f155bd3326f4d51ae'
+  data.tar.gz: 484370bc4395eeb5782180875f470784ca02dcf1b3431da82e491b21545aef86f2d254744fbbe5be5675f09dd2e30ed85ceb77051c9d78cd7b40dfe731015c3a

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

@@ -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/config/routes.rb

@@ -2,53 +2,56 @@
 
 Rails.application.routes.draw do
     # REST API (Stateless)
-    namespace :api, constraints: { format: :json } do
-        namespace :v2 do
-            resources :users
 
-            namespace :info do
-                get :version
-                get :roles
-                get :translations
-                get :schema
-                get :dsl
-                get :heartbeat
-                get :settings
-                get :swagger
-                get :openapi
-            end
+    scope ENV.fetch("RAILS_RELATIVE_URL_ROOT", "/") do
+        namespace :api, constraints: { format: :json } do
+            namespace :v2 do
+                resources :users
 
-            namespace :raw do
-              post :sql
-            end
+                namespace :info do
+                    get :version
+                    get :roles
+                    get :translations
+                    get :schema
+                    get :dsl
+                    get :heartbeat
+                    get :settings
+                    get :swagger
+                    get :openapi
+                end
 
-            post "authenticate" => "authentication#authenticate"
-            post ":ctrl/search" => 'application#index'
+                namespace :raw do
+                post :sql
+                end
 
-            # Add a route with placeholders for custom actions, the custom actions routes have a form like: :ctrl/custom_action/:action_name or :ctrl/custom_action/:action_name/:id
-            # Can have all the verbs, but the most common are: get, post, put, delete
-            get ":ctrl/custom_action/:action_name", to: 'application#index'
-            get ":ctrl/custom_action/:action_name/:id", to: 'application#show'
-            post ":ctrl/custom_action/:action_name", to: 'application#create'
-            put ":ctrl/custom_action/:action_name/:id", to: 'application#update'
-            patch ":ctrl/custom_action/:action_name/:id", to: 'application#update'
-            delete ":ctrl/custom_action/:action_name/:id", to: 'application#destroy'
-            # Catchall routes
-            # # CRUD Show
-            get '*path/:id', to: 'application#show'
-            # # CRUD Index
-            get '*path', to: 'application#index'
-            # # CRUD Create
-            post '*path', to: 'application#create'
-            # CRUD Update
-            put '*path/:id/multi', to: 'application#update_multi'
-            patch '*path/:id/multi', to: 'application#update_multi'
-            put '*path/:id', to: 'application#update'
-            patch '*path/:id', to: 'application#patch'
+                post "authenticate" => "authentication#authenticate"
+                post ":ctrl/search" => 'application#index'
 
-            # # CRUD Delete
-            delete '*path/:id/multi', to: 'application#destroy_multi'
-            delete '*path/:id', to: 'application#destroy'
+                # Add a route with placeholders for custom actions, the custom actions routes have a form like: :ctrl/custom_action/:action_name or :ctrl/custom_action/:action_name/:id
+                # Can have all the verbs, but the most common are: get, post, put, delete
+                get ":ctrl/custom_action/:action_name", to: 'application#index'
+                get ":ctrl/custom_action/:action_name/:id", to: 'application#show'
+                post ":ctrl/custom_action/:action_name", to: 'application#create'
+                put ":ctrl/custom_action/:action_name/:id", to: 'application#update'
+                patch ":ctrl/custom_action/:action_name/:id", to: 'application#update'
+                delete ":ctrl/custom_action/:action_name/:id", to: 'application#destroy'
+                # Catchall routes
+                # # CRUD Show
+                get '*path/:id', to: 'application#show'
+                # # CRUD Index
+                get '*path', to: 'application#index'
+                # # CRUD Create
+                post '*path', to: 'application#create'
+                # CRUD Update
+                put '*path/:id/multi', to: 'application#update_multi'
+                patch '*path/:id/multi', to: 'application#update_multi'
+                put '*path/:id', to: 'application#update'
+                patch '*path/:id', to: 'application#patch'
+
+                # # CRUD Delete
+                delete '*path/:id/multi', to: 'application#destroy_multi'
+                delete '*path/:id', to: 'application#destroy'
+            end
         end
     end
 end

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.2.6".freeze
+  VERSION = "3.2.8".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.8
 platform: ruby
 authors:
 - Gabriele Tassoni
 bindir: bin
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons