tramway-api 0.6.1.2 → 0.6.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1346da9664247ade1b7d23e1abe801b5047533f24521bf67570941486ba0df70
-  data.tar.gz: 0f02451ab2c22f4aef2792be996109a84c4375bef132dc4080ccaef693e3ea0c
+  metadata.gz: 685306ba5192ad4a31885a29f774e3892f2b0e807c2d65323c3fb4aabdcb5fe4
+  data.tar.gz: 391fd9136d462647cc2b36e50a4cc1f8255fe3da57fd043b238dcc64cc90bcfb
 SHA512:
-  metadata.gz: eaf679d627a6a7eeb7209f77240d4396fcb48c53ef3421c30a10d4e9f8422bcd2ccf562e2610d5f45d9e82ae5eef14ee5bc56c812efa696768eba288007941c2
-  data.tar.gz: 825b079b76e078114cd54d3e9e202104e82ad5b20575f42c6eab913fed5f143156e0b5fb9f0363fc3120a9865184d78421e5ef1064525db8327d6132963687f2
+  metadata.gz: 2ec68fd04e3e14a4f85855942fed20f163f0eca33ad0acc1c487f5116059eb689962e4bb7af0a7cb1f1fd4f67fd06e2851919a70940c489b669e555e1249f3b1
+  data.tar.gz: 9aeae6018d957203230b6e45c01b0dd80ff857a0bb50b4d26590de8e7baccac7afa8889b8c63d5939c26a8d807bbe36d250edcb77fa8abf34ba547aecf8875bd

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

@@ -11,10 +11,18 @@ module Tramway
         render json: { data: [] }, status: :not_found
       end
 
+      def unauthorized
+        head :unauthorized
+      end
+
       protected
 
+      def authenticate_user
+        authenticate_for Tramway::Api.user_based_model
+      end
+
       def authenticate
-        raise ActiveRecord::RecordNotFound unless entity.present? && entity.authenticate(auth_params[:password])
+        unauthorized unless entity.present? && entity.authenticate(auth_params[:password])
       end
 
       def auth_token
@@ -30,12 +38,12 @@ module Tramway
           if Tramway::Api.user_based_model.respond_to? :from_token_request
             Tramway::Api.user_based_model.from_token_request request
           else
-            Tramway::Api.user_based_model.find_by email: auth_params[:email]
+            params[:auth] && Tramway::Api.user_based_model.find_by(email: auth_params[:email])
           end
       end
 
       def auth_params
-        params.require(:auth).permit :email, :password
+        params[:auth]&.permit :email, :password
       end
     end
   end

data/lib/tramway/api/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Api
-    VERSION = '0.6.1.2'
+    VERSION = '0.6.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 0.6.1.2
+  version: 0.6.1.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knock