tramway-api 1.0.3 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ca6fc2c599d996783de1ac8a07383ca7ceec44451ab39d51f30ef1431a5ca61
-  data.tar.gz: 15c2670773edde1c527b422817e354d333de13b8da3664f1c05345c8d32d9926
+  metadata.gz: 9dd077883596f2b69e87b35d326323415bf8c5184636caf46ab18d8377d01494
+  data.tar.gz: 7618b6d6fc2b0b45282747a5042fdf2976dcb2e66896e301ac6fde8d43c41331
 SHA512:
-  metadata.gz: d9545ecbf121766e12b0ae76f1c527f9ce2d40288c033e6174e78e9c515551d7b0c5d314ebeb853568002a90abf9e82ec05c20418d7710acff826f86c5f477d3
-  data.tar.gz: a5ebb28926fc86784e31d6b581b2b15974dff66c5fb8cf7f9bb3ca066b63ee6673d1e347444d82fafbb63a83718aa5de230d60b8a04d88c7ad1cd9287ad90f5b
+  metadata.gz: 5e93025a3e5f55e928a60879a4552440f5f8eb198c8af379419d776d8d1dfe735eaf7a87d4cda09bb3461633f581e4d32828aecf33b80b43d70b24a8cb0b7857
+  data.tar.gz: 974204ec735f413a47e1469443d1f2638346dea60792be83f438868de0d4c411b10a99f19fedaabfa0a9176519017c78c9546099d6701d0911ee6eebfca47a83

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

@@ -34,12 +34,20 @@ module Tramway
           if Tramway::Api.user_based_model.respond_to? :from_token_request
             Tramway::Api.user_based_model.active.from_token_request request
           else
-            params[:auth] && Tramway::Api.user_based_model.active.find_by(email: auth_params[:email])
+            params[:auth] && find_user_by_auth_attributes
           end
       end
 
+      def find_user_by_auth_attributes
+        Tramway::Api.auth_attributes.each do |attribute|
+          object = Tramway::Api.user_based_model.active.where.not(attribute => nil).find_by(attribute => auth_params[:login])
+          return object if object
+        end
+        nil
+      end
+
       def auth_params
-        params[:auth]&.permit :email, :password
+        params[:auth]&.permit(:login, :password)
       end
     end
   end

data/lib/tramway/api/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Api
-    VERSION = '1.0.3'
+    VERSION = '1.1'
   end
 end

data/lib/tramway/api.rb

@@ -3,12 +3,20 @@ require 'tramway/api/engine'
 module Tramway
   module Api
     class << self
+      def auth_config
+        @@auth_config ||= { user_model: ::Tramway::User::User, auth_attributes: :email }
+      end
+
+      def auth_config=(**params)
+        @@auth_config = params
+      end
+
       def user_based_model
-        @@user_based_model ||= ::Tramway::User::User
+        @@auth_config[:user_model]
       end
 
-      def user_based_model=(model_class)
-        @@user_based_model = model_class
+      def auth_attributes
+        @@auth_config[:auth_attributes]
       end
 
       def set_available_models(**models)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: '1.1'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knock
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Engine for api