model_driven_api 2.3.17 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa5e1a3c1035f1a2c765dfc5969845af3c80d70a2e0063e2f42b140b636b751a
-  data.tar.gz: 461d22a194727f614e60227f2ed886b0f8fe92e27a984ed13e8b33f5e73db2e8
+  metadata.gz: 3acd8a7365111aab30d8ff8d2b99b42205e30d379c8a3e1d4ed67afed159058c
+  data.tar.gz: 73d6cca889e4bf7aa08816567e52f274576f1e67cefb1e233c3f2e820c389086
 SHA512:
-  metadata.gz: a401038c58d3bf9386e5020b4552040a013c5c6867c2df16ae831ebaf90ae7c22a0ed75187bd2f09fcadf00d48958ec314e288fe74767471d2432eaef6f95e39
-  data.tar.gz: 4b03ebfbc44d9158198f1a455a5a294a5436e31af3488714b0a0fd153771aa38f2907d613a4b76a552dcbf463a6c6969821bac3a79a77e4777fd0be5b86dc745
+  metadata.gz: 4cc64b956182b5dbfcc7c0778c18da6e94b5f52525868595f4a8fdfd2c1bc3149b4d9b667ba89d21549ae7668d4251c95e0b57bbfe6a6b71319fc0de06793749
+  data.tar.gz: 4d175e1264cc0db245fe67e80bee381dcf05ee1402ee3ce6c42717a6db8abe852294b6608c2a10f4569a31c2337695ae5038760b661a9d3078748cbf1e7fceb6

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

@@ -3,13 +3,14 @@ class JsonWebToken
     def encode(payload, expiry = 15.minutes.from_now.to_i)
       result = ::JWT.encode(payload.merge(exp: expiry), ::Rails.application.credentials.dig(:secret_key_base).presence||ENV["SECRET_KEY_BASE"])
       # Store the created token into the DB for later checks if is invalid
-      UsedToken.create(token: result, user_id: payload[:user_id])
+      # In a public environment management, without login, it has no interest, so I don't pollute the DB
+      UsedToken.find_or_create_by(token: result, user_id: payload[:user_id]) if ENV["ALLOW_MULTISESSIONS"] == "false"
       result
     end
     
     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.17
+  version: 2.4.1
 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