tramway-auth 1.2.1.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6093468664bc0b122b3fc7bb1cda7a7030581936ce72e3ce4994ba2fd3a9153c
-  data.tar.gz: 340ac029ced667dcdddd10e1f201a75e05c447d462de49344dc6671c2890d06b
+  metadata.gz: 4adfdbe574a9d31bc8077b374b70157cfda825f0600269a4224b5ff177649f5f
+  data.tar.gz: 83bfe0c4bbaa456ced5403604f7d451ba1a77267300d0d7eb084c7ceadd613e2
 SHA512:
-  metadata.gz: d3d92bd186abc10659925738a2de77e90ad698b58ce1a1a08013d6f20c324ac7ad9802a0b586b104917fd071cb2e51fcb88a512e6cb6e122232940e115ae9864
-  data.tar.gz: e1684587ff576a464a83e79b7add3fd7ac7022f5f0dc86f0d91bf6b9c4c4cd9c3666e4381fee12330f45a368a56c438fb154118ff0860b0b0e518b13219bbbfb
+  metadata.gz: ac20f69be6eda14d8563147ae5642dd056c36faf70269c8cbb03c0b9433902cd75b437e6760253930925aa2662ef41b00a0fbada4b05277b060837b95192f99b
+  data.tar.gz: 42dcdfc8047a1ff5f13bf6985d3b101404deae427f85e5c3d7be798c3013978b0d0f9b1ce8823bb4302d56bd19f3b9c96f1c47c64e2736c8b749f47f3e36e465

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

@@ -3,33 +3,31 @@
 module Tramway
   module AuthManagement
     def sign_in(user)
-      session[:user_id] = user.id
+      session[user_id_key(user.class)] = user.id
     end
 
-    def sign_out
-      session[:user_id] = nil
+    def sign_out(user_class = ::Tramway::User::User)
+      session[user_id_key(user_class.constantize)] = nil
     end
 
-    def signed_in?
-      current_user
+    def signed_in?(user_class = ::Tramway::User::User)
+      current_user(user_class)
     end
 
-    def authenticate_user!
-      redirect_to new_session_path unless signed_in?
+    def authenticate_user!(user_class = ::Tramway::User::User)
+      redirect_to new_session_path unless signed_in?(user_class)
     end
 
-    def authenticate_admin!
-      if signed_in?
-        if !current_user.admin? && request.env['PATH_INFO'] != ::Tramway::Auth.root_path
-          redirect_to ::Tramway::Auth.root_path
-        end
-      else
-        redirect_to '/auth/session/new'
-      end
+    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
 
-    def current_user
-      @_current_user ||= ::Tramway::User::User.find_by id: session[:user_id]
+    private
+
+    def user_id_key(user_class)
+      "#{user_class.to_s.underscore}_id".to_sym
     end
   end
 end

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

@@ -5,30 +5,26 @@ module Tramway::Auth
     class SessionsController < ::Tramway::Auth::Web::ApplicationController
       before_action :redirect_if_signed_in, except: :destroy
 
-      def new
-        @application = Tramway::Core.application&.model_class&.first || Tramway::Core.application
-        @session_form = ::Tramway::Auth::SessionForm.new ::Tramway::User::User.new
-      end
-
       def create
-        @session_form = ::Tramway::Auth::SessionForm.new ::Tramway::User::User.active.find_or_initialize_by email: params[:user][:email]
+        @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 ::Tramway::Auth.root_path
+          redirect_to [params[:success_redirect], '?', { flash: :success_user_sign_in }.to_query].join || ::Tramway::Auth.root_path_for(@session_form.model.class)
         else
-          render :new
+          redirect_to [params[:error_redirect], '?', { flash: :error_user_sign_in }.to_query].join || ::Tramway::Auth.root_path_for(@session_form.model.class)
         end
       end
 
       def destroy
-        sign_out
-        redirect_to ::Tramway::Auth.root_path
+        root_path = ::Tramway::Auth.root_path_for(current_user.class)
+        sign_out params[:model]
+        redirect_to params[:redirect] || root_path
       end
 
       private
 
       def redirect_if_signed_in
-        redirect_to ::Tramway::Auth.root_path if signed_in? && request.env['PATH_INFO'] != ::Tramway::Auth.root_path
+        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)
       end
     end
   end

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

@@ -4,19 +4,20 @@ class Tramway::Auth::Web::SignUpsController < Tramway::Auth::Web::ApplicationCon
   before_action :check_authenticable_models
 
   def create
-    @form = "#{model_class}SignUpForm".constantize.new model_class.new
-    if @form.submit params[:record]
-      additional_params = { flash: :success }
-      url = if params[:redirect].present?
-              [params[:redirect], '?', additional_params.to_query].join
+    @form = "Public::#{model_class}SignUpForm".constantize.new model_class.new
+    if @form.submit params[:user]
+      additional_params = { flash: :success_user_sign_up }
+      url = if params[:success_redirect].present?
+              [params[:success_redirect], '?', additional_params.to_query].join
             else
               Rails.application.routes.url_helpers.root_path(flash: :success)
             end
+      sign_in @form.model if @form.class.sign_in_after
       redirect_to url
     else
-      additional_params = { flash: :error, errors: @form.errors.messages, record: @form.attributes }
-      url = if params[:redirect].present?
-              [params[:redirect], '?', additional_params.to_query].join
+      additional_params = { flash: :error_user_sign_up, errors: @form.errors.messages, record: @form.attributes }
+      url = if params[:error_redirect].present?
+              [params[:error_redirect], '?', additional_params.to_query].join
             else
               Rails.application.routes.url_helpers.root_path(**additional_params)
             end

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

@@ -5,10 +5,6 @@ module Tramway::Auth
     properties :email
     attr_accessor :password
 
-    def model_name
-      User
-    end
-
     def validate(params)
       (!model.new_record? && model.authenticate(params[:password])).tap do |result|
         add_wrong_email_or_password_error unless result

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

@@ -0,0 +1,5 @@
+class Tramway::Auth::SignUpForm < Tramway::Core::ApplicationForm
+  class << self
+    attr_accessor :sign_in_after
+  end
+end

data/app/helpers/tramway/auth/application_helper.rb

@@ -7,6 +7,12 @@ module Tramway
       include ::FontAwesome5::Rails::IconHelper
       include Tramway::Core::TitleHelper
       include Tramway::Admin::NavbarHelper
+      include Tramway::Admin::CasesHelper
+      include Tramway::Admin::RussianCasesHelper
+
+      def decorator_class(model_name = nil)
+        "#{model_name || model_class}Decorator".constantize
+      end
     end
   end
 end

data/config/routes.rb

@@ -2,7 +2,8 @@
 
 Tramway::Auth::Engine.routes.draw do
   scope module: :web do
-    resource :session, only: %i[new create destroy]
+    resource :session, only: %i[new create]
+    get 'sign_out', to: 'sessions#destroy'
     resource :sign_up, only: :create
   end
 end

data/lib/tramway/auth/version.rb

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

data/lib/tramway/auth.rb

@@ -28,10 +28,13 @@ module Tramway
         @layout_path ||= 'tramway/user/application'
       end
 
-      attr_writer :root_path
+      def root_path_for=(**options)
+        @root_path ||= {}
+        @root_path.merge! options
+      end
 
-      def root_path
-        @root_path || '/'
+      def root_path_for(user_class)
+        @root_path&.dig(user_class) || '/'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-auth
 version: !ruby/object:Gem::Version
-  version: 1.2.1.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -29,11 +29,11 @@ files:
 - app/controllers/tramway/auth/web/sessions_controller.rb
 - app/controllers/tramway/auth/web/sign_ups_controller.rb
 - app/forms/tramway/auth/session_form.rb
+- app/forms/tramway/auth/sign_up_form.rb
 - app/helpers/tramway/auth/application_helper.rb
 - app/jobs/tramway/auth/application_job.rb
 - app/mailers/tramway/auth/application_mailer.rb
 - app/models/tramway/auth/application_record.rb
-- app/views/tramway/auth/web/sessions/new.html.haml
 - config/locales/en/helpers.yml
 - config/locales/en/locale.yml
 - config/locales/ru/helpers.yml

data/app/views/tramway/auth/web/sessions/new.html.haml

@@ -1,7 +0,0 @@
-- title
-.row
-  .col-md-6
-    = simple_form_for @session_form.model, url: session_path, method: :post, html: { class: 'form-horizontal' } do |f|
-      = f.input :email, as: :string
-      = f.input :password
-      = f.button :submit, t('helpers.links.enter'), class: 'btn btn-success'