tramway-api 1.6.3 → 1.7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0ea77a64960468cd8a38627fe4400e78d591810d3123dd5b59672fcd1f37da3
-  data.tar.gz: 6e952b9555a2be85d5a0676ac527a7c8fff3027dfcb984a38fce99d2e145089b
+  metadata.gz: 94170f0f2f5bf4138fc21cc86290ac51092fd6580d98ec9ee01e143e3a846f8e
+  data.tar.gz: c610745ab3cd6eb82116c9720d846ac17a7bf7bef5a5f496f850cbd6bad8f793
 SHA512:
-  metadata.gz: 3bdd5d17648fac5814452ff4d1873b6085cdff3f776a37b9ac73224a56189989876832d9ad841d082ca1b2cdb6acf05c51eb4fb2cd1ec87d0db84f64b1b5286e
-  data.tar.gz: 7004e9ade3569be69ad1ca94058533d425b9dea39e746ccc189034e95374be2553682658ff2768208f1f41e97f1e26f2c6937a7c12eb457c7f0413d3bc3d79ce
+  metadata.gz: 214f6b56a98a0a4fcbc02431178c77cbf0e0d2eafb020e2183a8266398266fc72c2e193327616f36b5293a1c386a2286ad3fe018e478ebbd57c00a24d34745ee
+  data.tar.gz: 5b3f18221ede26fb67bacb212ecd93794b379fd69d40723eb5f771b686b967f9bb5d1a83a191ee7fc5c2de44adc3a951f57b8a5abf513fe69cfc0221a1b52753

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

@@ -5,7 +5,7 @@ module Tramway
     class ApplicationController < ::Tramway::Core::ApplicationController
       include ::Knock::Authenticable
       protect_from_forgery with: :null_session, if: proc { |c| c.request.format == 'application/json' }
-      rescue_from ActiveRecord::RecordNotFound, with: :not_found
+      rescue_from ActiveRecord::RecordNotFound, with: :not_found if Rails.env.production?
 
       private
 
@@ -19,6 +19,7 @@ module Tramway
 
       def authenticate
         return if current_user || params[:user_based_model].in?(Tramway::Api.user_based_models)
+
         unauthorized
       end
 
@@ -28,7 +29,7 @@ module Tramway
         if entity.respond_to? :to_token_payload
           ::Knock::AuthToken.new payload: entity.to_token_payload
         else
-          ::Knock::AuthToken.new payload: { sub: entity.uid }
+          ::Knock::AuthToken.new payload: { sub: entity.uuid }
         end
       end
 

data/app/controllers/tramway/api/v1/records_controller.rb

@@ -18,6 +18,7 @@ module Tramway::Api::V1
     def create
       record_form = form_class.new model_class.new
       if record_form.submit snake_case params[:data][:attributes]
+        record_form.model.reload
         render json: record_form.model,
                serializer: serializer_class,
                include: '*',
@@ -28,7 +29,7 @@ module Tramway::Api::V1
     end
 
     def update
-      record_form = form_class.new model_class.active.find params[:id]
+      record_form = form_class.new model_class.active.find_by uuid: params[:id]
       if record_form.submit snake_case params[:data][:attributes]
         render json: record_form.model,
                serializer: serializer_class,
@@ -40,7 +41,7 @@ module Tramway::Api::V1
     end
 
     def show
-      record = model_class.active.find params[:id]
+      record = model_class.active.find_by uuid: params[:id]
       render json: record,
              serializer: serializer_class,
              include: '*',
@@ -48,7 +49,7 @@ module Tramway::Api::V1
     end
 
     def destroy
-      record = model_class.active.find params[:id]
+      record = model_class.active.find_by uuid: params[:id]
       record.remove
       render json: record,
              serializer: serializer_class,
@@ -69,7 +70,9 @@ module Tramway::Api::V1
     end
 
     def authenticate_user_if_needed
-      head :unauthorized and return if action_name.in?(Tramway::Api.available_models[model_class.to_s][:closed]&.map(&:to_s) || []) && !current_user
+      if action_name.in?(Tramway::Api.available_models[model_class.to_s][:closed]&.map(&:to_s) || []) && !current_user
+        head(:unauthorized) && return
+      end
     end
 
     def model_class

data/app/controllers/tramway/api/v1/user_tokens_controller.rb

@@ -8,8 +8,7 @@ class Tramway::Api::V1::UserTokensController < ::Tramway::Api::V1::ApplicationCo
         auth_token: token,
         user: {
           email: @entity.email,
-          uid: @entity.uid,
-          id: @entity.id
+          uuid: @entity.uuid
         }
       }, status: :created
     else

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

@@ -10,13 +10,12 @@ class Tramway::Api::V1::UsersController < ::Tramway::Api::V1::ApplicationControl
     user_form = sign_up_form_class_name(user_based_model).new user_based_model.new
     # Implement JSON API spec here
     if user_form.submit snake_case params[:data][:attributes]
-      token = ::Knock::AuthToken.new(payload: { sub: user_form.model.uid }).token
+      token = ::Knock::AuthToken.new(payload: { sub: user_form.model.uuid }).token
       # FIXME: refactor this bullshit
       serialized_user = OpenStruct.new(
         user_form.model.attributes.merge(
           authentication_token: token,
-          uid: user_form.model.uid,
-          id: user_form.model.id
+          uuid: user_form.model.uuid
         )
       )
       render json: serialized_user, status: :created

data/app/serializers/tramway/api/v1/application_serializer.rb

@@ -3,6 +3,12 @@
 class Tramway::Api::V1::ApplicationSerializer < ActiveModel::Serializer
   include ::Tramway::Core::Concerns::AttributesDecoratorHelper
 
+  attribute :id
+
+  def id
+    object.uuid
+  end
+
   def created_at
     object.created_at.iso8601
   end

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.6.3'
+    VERSION = '1.7.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers