tramway-auth 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4adfdbe574a9d31bc8077b374b70157cfda825f0600269a4224b5ff177649f5f
-  data.tar.gz: 83bfe0c4bbaa456ced5403604f7d451ba1a77267300d0d7eb084c7ceadd613e2
+  metadata.gz: 296edc29aec74f9944ac494dc9fd393384f1d060bc4110aede56e023a22ec8cc
+  data.tar.gz: 65612c69a4d28844ef172a4c113c7d97bea422b4eceda2951876238f6c81d43b
 SHA512:
-  metadata.gz: ac20f69be6eda14d8563147ae5642dd056c36faf70269c8cbb03c0b9433902cd75b437e6760253930925aa2662ef41b00a0fbada4b05277b060837b95192f99b
-  data.tar.gz: 42dcdfc8047a1ff5f13bf6985d3b101404deae427f85e5c3d7be798c3013978b0d0f9b1ce8823bb4302d56bd19f3b9c96f1c47c64e2736c8b749f47f3e36e465
+  metadata.gz: 3d2389875a90181944620b3188e6e2174e20933796007fc8b267b2d8ffbc7a7c11c4d7f207a973e525e470d7a58c20584602f05419c828f5c01dcc1ca5bde5dc
+  data.tar.gz: cfe0f77f8e1a049b1d9d1750d8d5cad9e64ba1f02dcc56ff5f56a506783bb337bce88cafa00faa7d816ff8b2ec3efd5b39baf2cfdfe4a30c85b8c695dfbb7135

data/app/controllers/concerns/tramway/auth_management.rb

@@ -21,6 +21,7 @@ module Tramway
     def current_user(user_class = ::Tramway::User::User)
       user = user_class.find_by id: session[user_id_key(user_class)]
       return false unless user
+
       "#{user_class}Decorator".constantize.decorate user
     end
 

data/app/controllers/tramway/auth/web/sessions_controller.rb

@@ -7,11 +7,15 @@ module Tramway::Auth
 
       def create
         @session_form = ::Tramway::Auth::SessionForm.new params[:model].constantize.active.find_by email: params[:user][:email]
-        if @session_form.validate params[:user]
-          sign_in @session_form.model
-          redirect_to [params[:success_redirect], '?', { flash: :success_user_sign_in }.to_query].join || ::Tramway::Auth.root_path_for(@session_form.model.class)
+        if @session_form.model.present?
+          if @session_form.validate params[:user]
+            sign_in @session_form.model
+            redirect_to [params[:success_redirect], '?', { flash: :success_user_sign_in }.to_query].join || ::Tramway::Auth.root_path_for(@session_form.model.class)
+          else
+            redirect_to [params[:error_redirect], '?', { flash: :error_user_sign_in }.to_query].join || ::Tramway::Auth.root_path_for(@session_form.model.class)
+          end
         else
-          redirect_to [params[:error_redirect], '?', { flash: :error_user_sign_in }.to_query].join || ::Tramway::Auth.root_path_for(@session_form.model.class)
+          redirect_to [params[:error_redirect], '?', { flash: :error_user_sign_in }.to_query].join || ::Tramway::Auth.root_path_for(params[:model].constantize)
         end
       end
 
@@ -24,7 +28,9 @@ module Tramway::Auth
       private
 
       def redirect_if_signed_in
-        redirect_to ::Tramway::Auth.root_path_for(current_user.class) if params[:model].present? && signed_in?(params[:model].constantize) && request.env['PATH_INFO'] != ::Tramway::Auth.root_path_for(current_user.class)
+        if params[:model].present? && signed_in?(params[:model].constantize) && request.env['PATH_INFO'] != ::Tramway::Auth.root_path_for(current_user.class)
+          redirect_to ::Tramway::Auth.root_path_for(current_user.class)
+        end
       end
     end
   end

data/app/forms/tramway/auth/sign_up_form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Auth::SignUpForm < Tramway::Core::ApplicationForm
   class << self
     attr_accessor :sign_in_after

data/lib/tramway/auth/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Auth
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-auth
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for auth
 email: