tramway-api 1.5.0.2 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7c200630528335bf88fc29901da97260dcff159e14d4e05f948a25211fdffb3
-  data.tar.gz: f777b6bbc9ff7288e1b49d123b27ba7350a904305650cbbeafd738e31a64b828
+  metadata.gz: 01e0eb09865cd422bd78339ed17061bcb3e9783109877faf8c7d284386152696
+  data.tar.gz: 805e37d122674f9a95e71b8dcc98b819b34dfcf3e5ab8f1b6fc34883f65e6c1a
 SHA512:
-  metadata.gz: 8a1ceb5825fb2ddccc0155b98de5ebd1cc36c707a61c9b61729eb6d23437ca7fd6fd2440fcaba32eb7e700f86054ffb77ce1258d6a26ef601002da0e7a86764f
-  data.tar.gz: 891faee71e40942898a9848b01fe61dbe203f6af05efb32d9029b7a9aa771ce694784dde8076b3164ad2dfdd1878def1683beab1d790551aef5d41e83585faa2
+  metadata.gz: ee33d4fd776288f9ebe9159e8ac7387aa001a8687e32a6e91dff1b32d0786e7cc0ec58a19d597e0600c117785c234801fdad0adf9616cb00dc05f381af0314ce
+  data.tar.gz: f8b7b35880e8f509cdd73d9d9e9a41f3c9f3bd7d669c399a8b97b649494d444323188493e9abcc768b490242792bf2d88c6cd63268cef3ade7f4aca6e2ca8b7f

data/README.md

@@ -43,6 +43,7 @@ coming soon...
   gem 'tramway-core'
   gem 'state_machine', github: 'seuros/state_machine'
   gem 'knock'
+  gem 'audited'
   ```
 
 ## Usage

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

@@ -18,7 +18,7 @@ module Tramway
       protected
 
       def authenticate
-        return unauthorized unless current_user
+        return unauthorized if current_user.nil? || !params[:user_based_model].in?(Tramway::Api.user_based_models)
       end
 
       def auth_token
@@ -30,17 +30,19 @@ module Tramway
       end
 
       def entity
+        user_based_model = params[:user_based_model].constantize
         @entity ||=
-          if Tramway::Api.user_based_model.respond_to? :from_token_request
-            Tramway::Api.user_based_model.active.from_token_request request
+          if user_based_model.respond_to? :from_token_request
+            user_based_model.active.from_token_request request
           else
             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])
+        user_based_model = params[:user_based_model].constantize
+        Tramway::Api.auth_attributes[user_based_model].each do |attribute|
+          object = user_based_model.active.where.not(attribute => nil).find_by(attribute => auth_params[:login])
           return object if object
         end
         nil

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

@@ -68,7 +68,9 @@ module Tramway::Api::V1
 
     def authenticate_user_if_needed
       if action_name.in? Tramway::Api::available_models[model_class.to_s][:closed]&.map(&:to_s) || []
-        authenticate_user
+        Tramway::Api.user_based_models.map do |user_based_model|
+          send("current_#{user_based_model.name.underscore}").present?
+        end.include? true
       end
     end
 

data/lib/tramway/api/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Api
-    VERSION = '1.5.0.2'
+    VERSION = '1.6'
   end
 end

data/lib/tramway/api.rb

@@ -4,19 +4,27 @@ module Tramway
   module Api
     class << self
       def auth_config
-        @@auth_config ||= { user_model: ::Tramway::User::User, auth_attributes: :email }
+        @@auth_config ||= [{ user_model: ::Tramway::User::User, auth_attributes: :email }]
       end
 
-      def auth_config=(**params)
-        @@auth_config = params
+      def auth_config=(params)
+        if params.is_a? Hash
+          @@auth_config = [params]
+        elsif params.is_a? Array
+          @@auth_config = params
+        end
       end
 
-      def user_based_model
-        @@auth_config[:user_model]
+      def user_based_models
+        @@auth_config.map do |conf|
+          conf[:user_model]
+        end
       end
 
       def auth_attributes
-        @@auth_config[:auth_attributes]
+        @@auth_config.reduce({}) do |hash, conf|
+          hash.merge! conf[:user_model] => conf[:auth_attributes]
+        end
       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.5.0.2
+  version: '1.6'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knock