tramway-auth 1.1.0.3 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d2473a57b2fa14a55ca4b0ebf937c407fffb0a77f36c7873ef0397986fc1d02
-  data.tar.gz: 210d77cce88f4f85d4769856c91f1d5306bd030b165a22a23a808bb53c335ceb
+  metadata.gz: 296edc29aec74f9944ac494dc9fd393384f1d060bc4110aede56e023a22ec8cc
+  data.tar.gz: 65612c69a4d28844ef172a4c113c7d97bea422b4eceda2951876238f6c81d43b
 SHA512:
-  metadata.gz: af9c60e64439b9f790c9c6af09416e0b7d7c626e3ffecc0c8bdf5f9d371a1e4e2da58636ee005499193e88561ff0a7fcc404819cbac9480cc2f87d0b5d977e96
-  data.tar.gz: f4410b617a4657715bb720167a90779b9375f2d8fbbcc5b48ffaa14ea50e65c97b9ad3695acfb46d4b1a554de32a34278d5e27e026964daedaac5eedb5338ca2
+  metadata.gz: 3d2389875a90181944620b3188e6e2174e20933796007fc8b267b2d8ffbc7a7c11c4d7f207a973e525e470d7a58c20584602f05419c828f5c01dcc1ca5bde5dc
+  data.tar.gz: cfe0f77f8e1a049b1d9d1750d8d5cad9e64ba1f02dcc56ff5f56a506783bb337bce88cafa00faa7d816ff8b2ec3efd5b39baf2cfdfe4a30c85b8c695dfbb7135

data/README.md

@@ -1,9 +1,6 @@
 # Tramway::Auth
 Short description and motivation.
 
-## Usage
-How to use my plugin.
-
 ## Installation
 Add this line to your application's Gemfile:
 
@@ -21,6 +18,47 @@ Or install it yourself as:
 $ gem install tramway-auth
 ```
 
+## Usage
+
+### Set authentication
+
+*config/initializers/tramway/auth.rb*
+```ruby
+Tramway::Auth.root_path_for YourModel => "/your_path", AnotherYourModel => "/another_path"
+```
+
+### Add sign up
+
+#### 1. Create model sign up form
+
+We have `User` model. System will create instances of this model on Sign Up. Then we should create `UserSignUpForm`.
+
+```ruby
+class UserSignUpForm < Tramway::Core::ApplicationForm
+  properties :email, :password # you may add all you needed properties here
+  
+  def initiailize(object)
+    super(object).tap do
+      self.submit_message = 'Sign Up'
+      form_properties email: :string,
+        first_name: :string,
+        last_name: :string,
+        password: :default
+    end
+  end
+end
+```
+
+#### 2. Add password encryption into the User model
+
+**Don't forget that User model must inherited of Tramway::Core::ApplicationRecord**
+
+```ruby
+class User < ApplicationRecord
+  has_secure_password
+end
+```
+
 ## Contributing
 Contribution directions go here.
 

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

@@ -3,33 +3,32 @@
 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/application_controller.rb

@@ -1,17 +1,13 @@
 # frozen_string_literal: true
 
-module Tramway
-  module Auth
-    class ApplicationController < ActionController::Base
-      layout ::Tramway::Auth.layout_path
-      protect_from_forgery with: :exception
-      before_action :application
+class Tramway::Auth::ApplicationController < Tramway::Core::ApplicationController
+  layout ::Tramway::Auth.layout_path
+  protect_from_forgery with: :exception
+  before_action :application
 
-      def application
-        if ::Tramway::Core.application
-          @application = Tramway::Core.application&.model_class&.first || Tramway::Core.application
-        end
-      end
+  def application
+    if ::Tramway::Core.application
+      @application = Tramway::Core.application&.model_class&.first || Tramway::Core.application
     end
   end
 end

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

@@ -5,29 +5,32 @@ module Tramway::Auth
     class SessionsController < ::Tramway::Auth::Web::ApplicationController
       before_action :redirect_if_signed_in, except: :destroy
 
-      def new
-        @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]
-        if @session_form.validate params[:user]
-          sign_in @session_form.model
-          redirect_to ::Tramway::Auth.root_path
+        @session_form = ::Tramway::Auth::SessionForm.new params[:model].constantize.active.find_by email: params[:user][:email]
+        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
-          render :new
+          redirect_to [params[:error_redirect], '?', { flash: :error_user_sign_in }.to_query].join || ::Tramway::Auth.root_path_for(params[:model].constantize)
         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
+        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/controllers/tramway/auth/web/sign_ups_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Tramway::Auth::Web::SignUpsController < Tramway::Auth::Web::ApplicationController
+  before_action :check_authenticable_models
+
+  def create
+    @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_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
+      redirect_to url
+    end
+  end
+
+  private
+
+  def check_authenticable_models
+    return unless params[:model].in? Tramway::Auth.authenticable_models
+  end
+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,7 @@
+# frozen_string_literal: true
+
+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,6 +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.rb

@@ -5,16 +5,16 @@ require 'tramway/auth/engine'
 module Tramway
   module Auth
     class << self
-      def authenticable_classes
-        @authenticable_classes ||= []
+      def authenticable_models
+        @authenticable_models ||= []
       end
 
-      def authenticable_classes=(value)
-        @authenticable_classes ||= []
+      def authenticable_models=(value)
+        @authenticable_models ||= []
         if value.is_a? Array
-          @authenticable_classes += value
+          @authenticable_models += value
         else
-          @authenticable_classes << value
+          @authenticable_models << value
         end
       end
 
@@ -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

data/lib/tramway/auth/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-auth
 version: !ruby/object:Gem::Version
-  version: 1.1.0.3
+  version: 2.0.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for auth
 email:
@@ -27,12 +27,13 @@ files:
 - app/controllers/tramway/auth/application_controller.rb
 - app/controllers/tramway/auth/web/application_controller.rb
 - 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'