model_driven_api 2.3.16 → 2.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f42b6fcf4138560f8e183c7f02e10854836f7e04247bbe8bb96cdf3b3299324
-  data.tar.gz: 1ea8b0e0819840b9f443c06d77f5b175c510085ea435aed509968bf87f2cf2ef
+  metadata.gz: aa5e1a3c1035f1a2c765dfc5969845af3c80d70a2e0063e2f42b140b636b751a
+  data.tar.gz: 461d22a194727f614e60227f2ed886b0f8fe92e27a984ed13e8b33f5e73db2e8
 SHA512:
-  metadata.gz: dcb26da2904c349a2749d30ec86011b2712847c0fbfd7577bbc02bcb549e1d2bc05425c5beb609c62784dae0ae3f25a2272a240707ec9647d5e8f3a97c59034a
-  data.tar.gz: e4f5477ef79bfe582465ba72a25b984b248d9a2f0b28bf35ad16e4dca4ad104eaa96bd1487df95b0ad7476593544a0fef8c010418b99d6bffc7f8b2012972baa
+  metadata.gz: a401038c58d3bf9386e5020b4552040a013c5c6867c2df16ae831ebaf90ae7c22a0ed75187bd2f09fcadf00d48958ec314e288fe74767471d2432eaef6f95e39
+  data.tar.gz: 4b03ebfbc44d9158198f1a455a5a294a5436e31af3488714b0a0fd153771aa38f2907d613a4b76a552dcbf463a6c6969821bac3a79a77e4777fd0be5b86dc745

data/app/commands/authenticate_user.rb

@@ -7,20 +7,22 @@ class AuthenticateUser
     prepend SimpleCommand
     
     def initialize(*args)
-        if !args.email.blank? && !args.password.blank?
-            @email = args.email
-            @password = args.password
-        elsif !args.access_token.blank?
-            @access_token = args.access_token
+        first_arg = args.first
+        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
     
     def call
-        if !api_user.blank? && result = JsonWebToken.encode(user_id: api_user.id)
+        current_u = api_user
+        if !current_u.blank? && result = JsonWebToken.encode(user_id: current_u.id)
             # The token is created and the api_user exists => Invalidating all the previous tokens
             # Since this is a new login and I don't care from where it comes, new logins always
             # Invalidate older tokens
-            UsedToken.where(user_id: api_user.id).update(valid: false)
+            UsedToken.where(user_id: api_user.id).update(is_valid: false) if ENV["ALLOW_MULTISESSIONS"] == "false"
             return result
         end
         nil
@@ -33,8 +35,7 @@ class AuthenticateUser
     def api_user
         if !email.blank? && !password.blank?
             user = User.find_by(email: email)
-            
-            # Verify the password. You can create a blank method for now.
+            # Verify the password.
             raise AccessDenied if user.blank? && user.authenticate(password).blank?
         elsif !access_token.blank?
             user = User.find_by(access_token: access_token)

data/app/models/used_token.rb

@@ -1,7 +1,3 @@
 class UsedToken < ApplicationRecord
   belongs_to :user, inverse_of: :used_tokens
-
-  rails_admin do
-    visible false
-  end
 end

data/config/routes.rb

@@ -12,6 +12,7 @@ Rails.application.routes.draw do
                 get :translations
                 get :schema
                 get :dsl
+                get :heartbeat
             end
 
             post "authenticate" => "authentication#authenticate"

data/db/migrate/20210528111450_rename_valid_to_is_valid_in_used_token.rb

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

data/lib/json_web_token.rb

@@ -9,7 +9,7 @@ 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, valid: true)
+      raise "Token is invalidated by new login" unless UsedToken.exists?(token: token, is_valid: true)
       body = ::JWT.decode(token, ::Rails.application.credentials.dig(:secret_key_base).presence||ENV["SECRET_KEY_BASE"])[0]
       ::HashWithIndifferentAccess.new body
     rescue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 2.3.16
+  version: 2.3.17
 platform: ruby
 authors:
 - Gabriele Tassoni
@@ -147,6 +147,7 @@ files:
 - config/initializers/wrap_parameters.rb
 - config/routes.rb
 - db/migrate/20210519145438_create_used_tokens.rb
+- db/migrate/20210528111450_rename_valid_to_is_valid_in_used_token.rb
 - lib/concerns/api_exception_management.rb
 - lib/concerns/model_driven_api_role.rb
 - lib/concerns/model_driven_api_user.rb