model_driven_api 2.3.18 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0185ee834ab4556b49df71082c7cff31f834e8c5a434f0add47763f8b4e3a0b5'
-  data.tar.gz: d0731f1d3485921ce34250f91e50ece42c4d1bc0a35378b881b24d6c711b9a31
+  metadata.gz: 8ebbf8c8f9cb0482195ef574b6bab41ec475f902adbf03de770919d2ac0fbd40
+  data.tar.gz: cc1a6d816f3d2a448a80dc91bdd4aab17d83aa303333241a8a401ca4b4b0dcd3
 SHA512:
-  metadata.gz: 3558a4190736978ac74b84c43887907cde12785439bef08e18edd85b2c334e5d30e79b8b1c649552fc07ea20026d0da9c5167c796fbfcfd2b814fb1a7f25682a
-  data.tar.gz: 8bf646ed0e69761256895e60dffefa2c320d2bf6535ba0659c49e7f8d14107fafaa9ae53caeba31fb247364174cbfa52341c891d407b6c8cd62d2e88c6bebd42
+  metadata.gz: '01395a025a0443d82d5e8642b5a83677d4baa85fc09139f90f333c8673a95060afce395adca76e7d0f515f32749d728fa3d5be67c75fb56807b62eeb063ab515'
+  data.tar.gz: 9ec3c4dfed6b399e633cbf8adb208296093057fac04a5e7754c7b5947102e8d14b14c3582c536ecba8f1fa35791400ab4e902991bd5790ce69f4005609847495

data/app/commands/authenticate_user.rb

@@ -23,7 +23,7 @@ class AuthenticateUser
             # 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(is_valid: false) if ENV["ALLOW_MULTISESSIONS"] == "false"
-            return result
+            return {jwt: result, user: current_u}
         end
         nil
     end

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

@@ -84,7 +84,8 @@ class Api::V2::ApplicationController < ActionController::API
         return render json: result, status: 200 if status == true
 
         # Normal Update Action
-        @record.update_attributes!(@body)
+        # Raisl 6 vs Rails 6.1
+        @record.respond_to?('update_attributes!') ? @record.update_attributes!(@body) : @record.update!(@body)
         render json: @record.to_json(json_attrs), status: 200
     end
     

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

@@ -5,8 +5,9 @@ class Api::V2::AuthenticationController < ActionController::API
         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])
         
         if command.success?
-            response.headers['Token'] = command.result
-            head :ok
+            response.headers['Token'] = command.result[:jwt]
+            # head :ok
+            render json: command.result[:user].to_json(User.json_attrs), status: 200
         end
     end
 end

data/lib/json_web_token.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 2.3.18
+  version: 2.4.2
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 description: Ruby on Rails REST APIs built by convention using the DB schema as the
-  foundation.
+  foundation, please see README for mode of use.
 email:
 - gabriele.tassoni@gmail.com
 executables: []