thecore_api 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91bfe2280c7f928d37230a916ab8794bf079ae06c77b4f96b0dc5469551c5b04
-  data.tar.gz: c84e2dd1771f3ca85b317e22b377e44f61ffd36f15614c533d268f1a668a3980
+  metadata.gz: 9bd3d266dca0cc6b50e37c4b87e3201f6b0d77832df40db10a214f84cc8b3143
+  data.tar.gz: bc4b775d2197827c57142d71a7a5f46ccc35d8fbf7e36e95e4a4e4be84d4dc85
 SHA512:
-  metadata.gz: 618fcbaa57524b6f8ff96a15fa56e524619d95de1afc4bc4a262e525b7b23a0908a43238cfbb3dbcb9926206872ea1a85cd6f93e8e7c91eff2b841f55b60024f
-  data.tar.gz: c93655052f3636be0deb17379af1ea0689f739649f901b5e236fe65e54ba7dbba642e82042b71a559efd4c74145d4918f54e74c2002cd9dcde19e4b56cca1dd9
+  metadata.gz: addb715890b80b2cca5bc305f3e8255f66f7a8fa541b8cc2fc674a6fc4d21b2f812b985d30babf334ada3c988ae87a1b97c6628133440912bd4a8581d955a8ba
+  data.tar.gz: b6befad608ce40f4a56f282988f0bbe0b7a5a7c1f74790589fb332b3642331e24a6ae1133340e4d33e0e9e51e20fce4ca90543a174262fef889e8ecac0adf76f

data/app/controllers/api/v1/base_controller.rb

@@ -57,7 +57,10 @@ class Api::V1::BaseController < ActionController::API
         return render json: result, status: result.blank? ? 404 : 200
       elsif !path.second.to_i.zero? && path.third.blank?
         # Integer, so it's an ID, I must show it
-        find_record path.second.to_i
+        # Rails.logger.debug "IL SECONDO è ID? #{path.second.inspect}"
+        # find_record path.second.to_i
+        @record_id =  path.second.to_i
+        find_record
         show
       elsif !path.second.to_i.zero? && !path.third.blank?
         # Like :controller/:id/:custom_action
@@ -75,14 +78,20 @@ class Api::V1::BaseController < ActionController::API
     elsif request.put?
       if !path.second.to_i.zero? && path.third.blank?
         @params = params
-        find_record path.second.to_i
+        # Rails.logger.debug "IL SECONDO è ID in PUT? #{path.second.inspect}"
+        # find_record path.second.to_i
+        @record_id =  path.second.to_i
+        find_record
         update
       elsif !path.second.to_i.zero? && !path.third.blank?
         result = MultiJson.dump(@model.send(path.third, path.second.to_i, params))
         return render json: result, status: result.blank? ? 404 : 200
       end
     elsif request.delete?
-      find_record path.second.to_i
+      # Rails.logger.debug "IL SECONDO è ID in delete? #{path.second.inspect}"
+      # find_record path.second.to_i
+      @record_id =  path.second.to_i
+      find_record
       destroy
     end
   end
@@ -246,9 +255,9 @@ class Api::V1::BaseController < ActionController::API
 
   # private
 
-  def find_record id
+  def find_record
     # find the records
-    @record = @model.column_names.include?("user_id") ? @model.where(id: (id.presence || params[:id]), user_id: current_user.id).first : @model.find((id.presence || params[:id]))
+    @record = @model.column_names.include?("user_id") ? @model.where(id: (@record_id.presence || params[:id]), user_id: current_user.id).first : @model.find((@record_id.presence || params[:id]))
   end
 
   def find_model path=nil

data/app/controllers/api/v1/users_controller.rb

@@ -1,15 +1,15 @@
 class Api::V1::UsersController < Api::V1::BaseController
   load_and_authorize_resource
   
-  before_action :check_demoting
+  before_action :check_demoting, only: [:update, :destroy]
 
   private
   
   def check_demoting
-    render json: "You cannot demote yourself", status: 403 if (params[:id].to_i == current_user.id && (params[:users].keys.include?("admin") || params[:users].keys.include?("locked")))
+    render json: "You cannot demote yourself", status: 403 if (params[:id].to_i == current_user.id && (params[:user].keys.include?("admin") || params[:user].keys.include?("locked")))
   end
   
   def request_params
-    params.require(:users).permit(:email, :roles, :password, :password_confirmation, :username, :number_of_instances_purchased, :admin, :locked).delete_if{ |_,v| v.nil? }
+    params.require(:user).permit(:email, :roles, :password, :password_confirmation, :username, :number_of_instances_purchased, :admin, :locked).delete_if{ |_,v| v.nil? }
   end
 end

data/lib/thecore_api/version.rb

@@ -1,3 +1,3 @@
 module ThecoreApi
-  VERSION = "1.3.10".freeze
+  VERSION = "1.3.11".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thecore_api
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors:
 - Gabriele Tassoni