tramway-api 1.6 → 1.6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01e0eb09865cd422bd78339ed17061bcb3e9783109877faf8c7d284386152696
-  data.tar.gz: 805e37d122674f9a95e71b8dcc98b819b34dfcf3e5ab8f1b6fc34883f65e6c1a
+  metadata.gz: 0f21707e10ef82a1c378250e9c82339400ee41739d7a6009001ecd1c8a17c4e0
+  data.tar.gz: 22732d5ad75036e1bf59831171f4d82af30f95805432900df283566b2b24619c
 SHA512:
-  metadata.gz: ee33d4fd776288f9ebe9159e8ac7387aa001a8687e32a6e91dff1b32d0786e7cc0ec58a19d597e0600c117785c234801fdad0adf9616cb00dc05f381af0314ce
-  data.tar.gz: f8b7b35880e8f509cdd73d9d9e9a41f3c9f3bd7d669c399a8b97b649494d444323188493e9abcc768b490242792bf2d88c6cd63268cef3ade7f4aca6e2ca8b7f
+  metadata.gz: 313b31746731d79afe528f6100daa910260707e03c4d68d5c0961b6a046591d485006a58e3438b9b3bf4c1dcb7b79009511834b7a58905e293834d679c47bb66
+  data.tar.gz: 6b9a2570cd6b8e68d039de8706d9923651081c010f0a4cebce5347a06f442033b2c3833b7c07194bd4eea3b9bb3a2b7b81d629078d18380df4488f35b90ba63f

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

@@ -51,6 +51,12 @@ module Tramway
       def auth_params
         params[:auth]&.permit(:login, :password)
       end
+
+      def current_user
+        Tramway::Api.user_based_models.map do |user_based_model|
+          send("current_#{user_based_model.name.underscore}")
+        end.compact.first
+      end
     end
   end
 end

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

@@ -68,9 +68,7 @@ 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) || []
-        Tramway::Api.user_based_models.map do |user_based_model|
-          send("current_#{user_based_model.name.underscore}").present?
-        end.include? true
+        current_user
       end
     end
 

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

@@ -5,9 +5,9 @@ class Tramway::Api::V1::UsersController < ::Tramway::Api::V1::ApplicationControl
   include Tramway::ClassNameHelpers
 
   def create
-    user_form = sign_up_form_class_name(Tramway::Api.user_based_model).new Tramway::Api.user_based_model.new
+    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[Tramway::Api.user_based_model.name.underscore]
+    if user_form.submit snake_case params[user_based_model.name.underscore]
       token = ::Knock::AuthToken.new(payload: { sub: user_form.model.uid }).token
       # FIXME refactor this bullshit
       serialized_user = OpenStruct.new(
@@ -31,4 +31,8 @@ class Tramway::Api::V1::UsersController < ::Tramway::Api::V1::ApplicationControl
   def sign_up_form_class_name(model_class)
     form_class_name "#{model_class}SignUp"
   end
+
+  def user_based_model
+    params[:user_based_model].constantize if params[:user_based_model].in? Tramway::Api.user_based_models.map(&:to_s)
+  end
 end

data/lib/tramway/api/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: 1.6.0.1
 platform: ruby
 authors:
 - Pavel Kalashnikov