tramway-api 1.6.0.2 → 1.6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b227fe2c5a72ce92a967c1a1abf17b0f3a3480cee4f4e9fc5a1a53c978aca4
-  data.tar.gz: ffe812022a1229e947c0db0edbda374c174d7632970099107f0d8f556a7ebcd1
+  metadata.gz: dc3d2db65fc5b4b06905703a83e8652a7794f46cf2c28147cf0c39d95bb81f4f
+  data.tar.gz: 84d4b9f3f77bd968d75d2a512679647352c687193d26a2b30d909b58643cc3fa
 SHA512:
-  metadata.gz: 14f9d4a3aff794718f346dc0ace3ec0a92f1abe05d2123164ae8d1dc0b9b5f9ad5f2c08dee24264e691bbc798d0af758bb48fcb8079423c1833795b105ca83a0
-  data.tar.gz: cbbd904561dee654dccf93f2279f7a1e6dcf6069e85f705cd4efdef58175c99138647a18e14d1878b7f726535089239683966b4fbb4e01d8c8822737e5f5b58c
+  metadata.gz: ee82990f80e8692e5a1428ad0685ee0d17ff9ffa3acd5474716b3385fae07570be6d1d2a21fa3590b9351992eab8f318b3c0fa3359fc76fef0d1aef96ab58c92
+  data.tar.gz: 1fbe1b706291a8cfb0a04ea9e7ebeec5376032f2970d345424d18263d467d5d7da070dbb3f056482dd712e451d489e63bb314ed58ee0f1603f794d5c2fb32208

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
 
@@ -17,12 +17,14 @@ module Tramway
         head :unauthorized
       end
 
-      protected
-
       def authenticate
-        return unauthorized if current_user.nil? || !params[:user_based_model].in?(Tramway::Api.user_based_models)
+        return if current_user || params[:user_based_model].in?(Tramway::Api.user_based_models)
+
+        unauthorized
       end
 
+      protected
+
       def auth_token
         if entity.respond_to? :to_token_payload
           ::Knock::AuthToken.new payload: entity.to_token_payload

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

@@ -69,7 +69,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

@@ -13,7 +13,7 @@ class Tramway::Api::V1::UserTokensController < ::Tramway::Api::V1::ApplicationCo
         }
       }, status: :created
     else
-      not_found
+      unauthorized
     end
   end
 end

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

@@ -9,13 +9,14 @@ class Tramway::Api::V1::UsersController < ::Tramway::Api::V1::ApplicationControl
   def create
     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[user_based_model.name.underscore]
+    if user_form.submit snake_case params[:data][:attributes]
       token = ::Knock::AuthToken.new(payload: { sub: user_form.model.uid }).token
       # FIXME: refactor this bullshit
       serialized_user = OpenStruct.new(
         user_form.model.attributes.merge(
           authentication_token: token,
-          id: user_form.model.uid
+          uid: user_form.model.uid,
+          id: user_form.model.id
         )
       )
       render json: serialized_user, status: :created

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.6.0.2'
+    VERSION = '1.6.3.1'
   end
 end

metadata

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