model_driven_api 3.0.4 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c3499b8cbcc19be7b13832ca8ba8c46944582833854f4cef7a3805415af072f
-  data.tar.gz: 886c1c13ec67b3f6575308916b75aff81ba605d5cbe0c259ea59680aa32baf11
+  metadata.gz: 1ba0922c4a172c2281c46307ba065d30ef787167503aeaa468731c939e277904
+  data.tar.gz: 9ec7f34e99684acf9f978d6fed80f8cd14cf82ae41a06366b4ee9b6ce89232c8
 SHA512:
-  metadata.gz: 9f836adb10e63ba6b5a7b9443e97aa38487a7a5b15262ace84e7da44f58e0bf2d402cdaa312d891adad322399b8c89115affc756bcc6c3b9615d9c4601317a63
-  data.tar.gz: 258c694e8edf70554d2cfbd240f21f9e356e8794bf2f04cc3f0b68486fcdc29c2e5d0595fd363c4048358d2e237c48b5a9c409a5e4fb27ced278abd4a1e447fe
+  metadata.gz: d16adf2aacce296e357c96ac4ca923850c9bb106f996bcde912d504d0df3991d7c52963fadc928fd08f86ab64f2e3aa1bee1d1c6eec243643f7854ace4495f44
+  data.tar.gz: 4333524807337ded6bb5eba120b558e6c342914450287a3fcd7867f82486c693467cbf5ebf77fa884a089a5c0b755ba6bf9a7026253949662873cc73fa8e6a51

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/db/migrate/20210519145438_create_used_tokens.rb

@@ -1,12 +1,12 @@
-class CreateUsedTokens < ActiveRecord::Migration[6.0]
+class CreateUsedTokens < ActiveRecord::Migration[7.0]
   def change
-    create_table :used_tokens do |t|
+    create_table :used_tokens, if_not_exists: true do |t|
       t.string :token
       t.references :user, null: false, foreign_key: true
       t.boolean :valid, default: true
 
       t.timestamps
     end
-    add_index :used_tokens, :token, unique: true
+    add_index :used_tokens, :token, unique: true, if_not_exists: true
   end
 end

data/db/migrate/20210528111450_rename_valid_to_is_valid_in_used_token.rb

@@ -1,6 +1,6 @@
-class RenameValidToIsValidInUsedToken < ActiveRecord::Migration[6.0]
+class RenameValidToIsValidInUsedToken < ActiveRecord::Migration[7.0]
   def change
-    change_table :used_tokens do |t|
+    change_table :used_tokens, if_not_exists: true do |t|
       t.rename :valid, :is_valid
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.6
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-11 00:00:00.000000000 Z
+date: 2023-02-12 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