model_driven_api 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35c5430020e71d79d842e40b0edc01e64c0d0ce1272bb5fe26c2db9259cd7b1c
-  data.tar.gz: cd40b3b1aae58c98442a275ddd04d342b36b67a8aa3d137e14c98be85945bbbd
+  metadata.gz: 0751f2c240c15ab7130628b14469555a3fb1abf74e80fba20c86b6a588c4d2db
+  data.tar.gz: 573b9acc768a3162a449e3c70890a1ab5be0e2b124eca9d0d3f6a25fc9928aba
 SHA512:
-  metadata.gz: aa45a6adbd3faf40cefe545661815aaf63423872afd9c6d6182204461eb50e85bd8c3dc0390d9a9a2276db00fca1ec818f9a1c62591db4d3d757bca457c39e08
-  data.tar.gz: f7a5ddf37f3503d19ddb7d14807c4bc8b4d8683ef11f7c8ffec1c225de4f5addfdff3bf1d4af229ff3c8fb25b961dbf0d0888b44485988dae437004eb0067821
+  metadata.gz: ace22af5f8fd756d69b251d4576997e907e38c275706960aa3b31a2149c63744506792f5995e604b0ec68fd08f8bae2f256e4013a43af7ae10a10474c018eaba
+  data.tar.gz: 961a3a7b3378981df8078b6b7369cc8eb1fb3cada953553de4e2cf2f677583ec6050a968bd3d6d85b483279ca9d24b9796ae06f5d8448bec944f6ca2fc601d2a

data/app/commands/authorize_api_request.rb

@@ -25,16 +25,16 @@ class AuthorizeApiRequest
     end
     
     def decoded_auth_token
-        Rails.logger.debug "AuthorizeApiRequest: http_auth_header -> #{http_auth_header}"
+        Rails.logger.debug "AuthorizeApiRequest: decoded_auth_token -> 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']}"
+        Rails.logger.debug "AuthorizeApiRequest: http_auth_header - Authorization -> #{headers['Authorization']}"
         if headers['Authorization'].present?
             token = headers['Authorization'].split(' ').last
-            Rails.logger.debug "AuthorizeApiRequest: token -> #{token}"
+            Rails.logger.debug "AuthorizeApiRequest: http_auth_header - token -> #{token}"
             return token
         else
             errors.add(:token, "Missing token")

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

@@ -61,15 +61,18 @@ class Api::V2::InfoController < Api::V2::ApplicationController
   end
 
   def compute_type(model, key)
+    Rails.logger.debug "compute_type #{model} #{key}"
     # if it's a file, a date or a text, then return string
     instance = model.new
     # If it's a method, it is a peculiar case, in which we have to return "object" and additionalProperties: true
     return "method" if model.methods.include?(:json_attrs) && model.json_attrs && model.json_attrs.include?(:methods) && model.json_attrs[:methods].include?(key.to_sym)
     # If it's not the case of a method, then it's a field
     method_class = instance.send(key).class.to_s
+    Rails.logger.debug "compute_type #{model} #{key} #{method_class}"
     method_key = model.columns_hash[key]
     
     # Not columns
+    return nil if method_key.nil?
     return "object" if method_class == "ActiveStorage::Attached::One"
     return "array" if method_class == "ActiveStorage::Attached::Many" || method_class == "Array" || method_class.ends_with?("Array") || method_class.ends_with?("Collection") || method_class.ends_with?("Relation") || method_class.ends_with?("Set") || method_class.ends_with?("List") || method_class.ends_with?("Queue") || method_class.ends_with?("Stack") || method_class.ends_with?("ActiveRecord_Associations_CollectionProxy")
     
@@ -132,7 +135,7 @@ class Api::V2::InfoController < Api::V2::ApplicationController
         [k, { "type": "array", "items": { "type": "object", "properties": properties } }] rescue nil
       else
         [k, { "type": type }]
-      end
+      end unless type.blank?
     end.compact.to_h
   end
   

data/config/routes.rb

@@ -21,7 +21,7 @@ Rails.application.routes.draw do
                 end
 
                 namespace :raw do
-                post :sql
+                    post :sql
                 end
 
                 post "authenticate" => "authentication#authenticate"

data/lib/json_web_token.rb

@@ -10,11 +10,12 @@ class JsonWebToken
     
     def decode(token)
       # Check if the passed token is present and valid into the UsedToken 
-      raise "Token is invalidated by new login" unless UsedToken.exists?(token: token, is_valid: true) if ENV["ALLOW_MULTISESSIONS"] == "false"
+      raise "Token is invalidated by new login" if !UsedToken.exists?(token: token, is_valid: true) && ENV["ALLOW_MULTISESSIONS"] == "false"
       body = ::JWT.decode(token, ::Rails.application.credentials.dig(:secret_key_base).presence||ENV["SECRET_KEY_BASE"])[0]
+      Rails.logger.debug "JsonWebToken: decode -> body -> #{body}"
       ::HashWithIndifferentAccess.new body
-    rescue
-      nil
+    # rescue
+    #   nil
     end
   end
 end

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.3.0".freeze
+  VERSION = "3.3.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Gabriele Tassoni