model_driven_api 3.0.5 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 121cf90a81e77e493340b5349aead00f2511ffbb5ed9ae2ece60b1c42b5df179
-  data.tar.gz: 24eced53d7abec52c76ecd4ebf5185f3d66fc532c1c5cb08e0a84bcf71fa5916
+  metadata.gz: 1822139deff80353dbae231afd40ed1397d7d4cf52da33e7bfc2d1c037cee751
+  data.tar.gz: 1545317f8c87c9446a3f6cce825468e7bab53754a6031e012c9b2c16f4850bea
 SHA512:
-  metadata.gz: 4dde33d3d868f96d4f3ae77087d627fbba457190c2114075129e6ab414379b6debdd4165be69b0c8795c138da100892d063c67f7acbe5655e52367b6c9f0bce3
-  data.tar.gz: bf614a1100e17e58c1380ebbdf1422687c2e78050abe970f38366c09365c304f70b3fa2af9ff565d5a89e62c55e7628999a0bb946d5346868044868106f40ef0
+  metadata.gz: 61f7ee38ad2620dcecbc23e00508a5238c7402408fa10a7f5a8925e3939d030b2cb68f330acaab36497cd9ea329bc20da5f6df1327ea4b2986e4ed350ac7d8c4
+  data.tar.gz: 9e7b861687ee4e4e798f2fc0d95f925aa06e0d4349d579eb6b6a194a2177bc7d902f9ca630d24fa797b1cfb75a3627e6895a54bf15a792698cfacaa7a3b7fb56

data/README.md

@@ -480,8 +480,6 @@ Once loaded the tests inside the insomnia application, please right click on the
 
 ## TODO
 
-* Document the new feature (from version 2.3.3) to add Authentication methods which override the JWT described above. Useful for Webhooks and machine2machine trusted dialogues.
-
 ## References
 Thanks to all these people for ideas:
 

data/app/commands/authenticate_user.rb

@@ -11,8 +11,6 @@ class AuthenticateUser
         if !first_arg[:email].blank? && !first_arg[:password].blank?
             @email = first_arg[:email]
             @password = first_arg[:password]
-        elsif !first_arg[:access_token].blank?
-            @access_token = first_arg[:access_token]
         end
     end
     
@@ -30,15 +28,13 @@ class AuthenticateUser
     
     private
     
-    attr_accessor :email, :password, :access_token
+    attr_accessor :email, :password
     
     def api_user
         if !email.blank? && !password.blank?
             user = User.find_by(email: email)
             # Verify the password.
             user = nil if user.blank? || user.authenticate(password).blank?
-        elsif !access_token.blank?
-            user = User.find_by(access_token: access_token)
         end
 
         raise AccessDenied unless user.present?

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

@@ -2,7 +2,7 @@ class Api::V2::AuthenticationController < ActionController::API
     include ::ApiExceptionManagement
 
     def authenticate
-        command = !params[:atoken].blank? && User.column_names.include?("access_token") ? AuthenticateUser.call(access_token: params[:atoken]) : AuthenticateUser.call(email: params[:auth][:email], password: params[:auth][:password])
+        command = AuthenticateUser.call(email: params[:auth][:email], password: params[:auth][:password])
         
         if command.success?
             response.headers['Token'] = command.result[:jwt]

data/config/initializers/cors_api_thecore.rb

@@ -1,21 +1,14 @@
-# config/initializers/cors.rb
-# Rails.application.config.middleware.insert_before 0, Rack::Cors do
-#   allow do
-#     origins '*'
-#     resource '*',
-#       headers: %w(Token),
-#       methods: :any,
-#       expose: %w(Token),
-#       max_age: 600
-#   end
-# end
-
 puts "Loading CORS"
+# config/initializers/cors_api_thecore.rb
 Rails.application.config.middleware.insert_before 0, Rack::Cors do
-  # Allow Everything
-  # Please override to your specific security needs in the actual application
+  #   # Allow Everything
+  #   # Please override to your specific security needs in the actual application
   allow do
     origins '*'
-    resource '*', headers: :any, methods: [:get, :post, :put, :patch, :delete, :options, :head]
+    resource '*',
+      headers: %w(app lang enc-data user-data session-id x-requested-with content-type origin authorization accept client-security-token Accept Authorization Cache-Control Content-Type DNT If-Modified-Since Keep-Alive Origin User-Agent X-Requested-With Token),
+      methods: [:get, :post, :put, :patch, :delete, :options, :head],
+      expose: %w(authorization Authorization Content-Length Token),
+      max_age: 600
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.7
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-11 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons
@@ -121,7 +121,6 @@ files:
 - Rakefile
 - app/commands/authenticate_user.rb
 - app/commands/authorize_api_request.rb
-- app/commands/authorize_machine_2_machine.rb
 - app/controllers/api/v2/application_controller.rb
 - app/controllers/api/v2/authentication_controller.rb
 - app/controllers/api/v2/info_controller.rb

data/app/commands/authorize_machine_2_machine.rb

@@ -1,31 +0,0 @@
-class AuthorizeMachine2Machine
-    prepend SimpleCommand
-    
-    def initialize(headers = {})
-        @headers = headers
-    end
-    
-    def call
-        api_user
-    end
-    
-    private
-    
-    attr_reader :headers
-    
-    def api_user
-        token = http_auth_header
-        user = User.find_by(access_token: token) unless token.blank?
-        @api_user = user if user
-        @api_user || errors.add(:token, "Invalid token") && nil
-    end
-    
-    def http_auth_header
-        if headers['Authorization'].present?
-            return headers['Authorization'].split(' ').last
-        else
-            errors.add(:token, "Missing token")
-        end
-        nil
-    end
-end