tramway-admin 1.29.2 → 1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb8572d620231b636f36ee41b63de90c82cf6bbda55bd49d43018e13a81e9bb4
-  data.tar.gz: 38aa095dc281d92baacf40504cd56790bac6ff071dcfd238d0d6a98e4b49cd7e
+  metadata.gz: 1a3193abc0ba418d70dc16809e03ed0dc6d81d7b426a7a0f14db0343cfcd3e54
+  data.tar.gz: b39d546781c693843e04dd1ed2a06ae50179e6880ee43217a4abb28330068fb0
 SHA512:
-  metadata.gz: e9534f3052c14aa43b8dbf06dbbef7c61030e4fe5e8a901dfc07863caf349af8c2d8b3da153b766cc39d3a5bf98e53e5507208c224643af79f6bc48458649b53
-  data.tar.gz: 777695f2b36a4ee82e9848c25fefb79e40bfb35bbd214e97a0b3e6c0c676499ea24961f636883ed15a70fae36230d6a348cd2a854b07eb1cece6e3ba63dd9292
+  metadata.gz: 9c68c4efbc9a38d060b1551e2873285238e08c3f64f87eb06652ecd49494f883b822e4683d95e1dcafa8d018ddba4885a11391833064842011bb3419d8b46c91
+  data.tar.gz: 767f2cc010f4255c29b33f24c42baf092214aba1d086d55e15c3fdd7ef0d8dd69d41e23f039301e85394a33c930ff2867550599345523a04955a8e68cc8b3c1e

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

@@ -31,7 +31,7 @@ module Tramway
       def collections_counts
         @counts = decorator_class.collections.reduce({}) do |hash, collection|
           records = model_class.active.send(collection)
-          records = records.send "#{current_user.role}_scope", current_user.id
+          records = records.send "#{current_admin.role}_scope", current_admin.id
           records = records.ransack(params[:filter]).result if params[:filter].present?
           hash.merge! collection => records.count
         end
@@ -44,8 +44,10 @@ module Tramway
       end
 
       def notifications
-        @notifications ||= Tramway::Admin.notificable_queries&.reduce({}) do |hash, notification|
-          hash.merge! notification[0] => notification[1].call(current_user)
+        if current_admin
+          @notifications ||= Tramway::Admin.notificable_queries&.reduce({}) do |hash, notification|
+            hash.merge! notification[0] => notification[1].call(current_admin)
+          end
         end
         @notifications
       end
@@ -76,7 +78,7 @@ module Tramway
       end
 
       def admin_form_class
-        "::#{current_user.role.camelize}::#{model_class}Form".constantize
+        "::#{current_admin.role.camelize}::#{model_class}Form".constantize
       end
 
       def model_given?
@@ -89,7 +91,7 @@ module Tramway
         #  :tramway, :admin, :application_controller, :form_given, :model_not_included_to_tramway_admin,
         #  model: params[:model]
         # )
-        raise "Looks like model #{params[:model]} is not included to tramway-admin for `#{current_user.role}` role. Add it in the `config/initializers/tramway.rb`. This way `Tramway::Admin.set_available_models(#{params[:model]})`"
+        #raise "Looks like model #{params[:model]} is not included to tramway-admin for `#{current_admin.role}` role. Add it in the `config/initializers/tramway.rb`. This way `Tramway::Admin.set_available_models(#{params[:model]})`"
         Tramway::Admin.forms.include? params[:form].underscore.sub(%r{^admin/}, '').sub(/_form$/, '')
       end
 
@@ -105,12 +107,22 @@ module Tramway
         check_models_given? :singleton
       end
 
+      def current_admin
+        user = Tramway::User::User.find_by id: session[:admin_id]
+        return false unless user
+        Tramway::User::UserDecorator.decorate user
+      end
+
       private
 
       def check_models_given?(model_type)
-        models = ::Tramway::Admin.send("#{model_type}_models", role: current_user.role)
+        models = ::Tramway::Admin.send("#{model_type}_models", role: current_admin.role)
         models.any? && params[:model].in?(models.map(&:to_s))
       end
+
+      def authenticate_admin!
+        redirect_to '/admin/session/new' if !current_admin && !request.path.in?(['/admin/session/new', '/admin/session'])
+      end
     end
   end
 end

data/app/controllers/tramway/admin/has_and_belongs_to_many_records_controller.rb

@@ -3,8 +3,14 @@
 class Tramway::Admin::HasAndBelongsToManyRecordsController < ::Tramway::Admin::ApplicationController
   def create
     base_object = params[:model_class].constantize.find params[:object_id]
-    record_form = params[:form].constantize.new base_object
-    if record_form.submit params[params[:model_class].underscore]
+    form_class = params[:form].constantize
+    record_form = form_class.new base_object
+    sending_params = if params[params[:model_class].underscore].present?
+                       params[params[:model_class].underscore]
+                     else
+                       params[form_class.associated_as]
+                     end
+    if record_form.submit sending_params
       redirect_to params[:redirect].present? ? params[:redirect] : record_path(base_object, model: base_object.class)
     else
       redirect_to params[:redirect].present? ? params[:redirect] : record_path(base_object, model: base_object.class)

data/app/controllers/tramway/admin/records_controller.rb

@@ -6,7 +6,7 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
     records = model_class.active.order(id: :desc).send scope
     records = records.full_text_search params[:search] if params[:search].present?
     records = records.ransack(params[:filter]).result if params[:filter].present?
-    records = records.send "#{current_user.role}_scope", current_user.id
+    records = records.send "#{current_admin.role}_scope", current_admin.id
     @records = decorator_class.decorate records.page params[:page]
   end
 

data/app/controllers/tramway/admin/sessions_controller.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class Tramway::Admin::SessionsController < ::Tramway::Admin::ApplicationController
+  before_action :redirect_if_signed_in, except: :destroy
+  skip_before_action :check_available!
+  skip_before_action :collections_counts
+
+  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]
+      admin_sign_in @session_form.model
+      redirect_to Tramway::Admin::Engine.routes.url_helpers.root_path
+    else
+      render :new
+    end
+  end
+
+  def destroy
+    admin_sign_out
+    redirect_to '/admin/session/new'
+  end
+
+  private
+
+  def redirect_if_signed_in
+    redirect_to Tramway::Admin::Engine.routes.url_helpers.root_path if current_admin
+  end
+
+  def admin_sign_in(user)
+    session[:admin_id] = user.id
+  end
+
+  def admin_sign_out
+    session[:admin_id] = nil
+  end
+end

data/app/helpers/tramway/admin/actions_helper.rb

@@ -6,7 +6,7 @@ module Tramway::Admin::ActionsHelper
       association_object,
       project: (@application_engine || @application.name),
       model_name: association_object.model.class.name,
-      role: current_user.role,
+      role: current_admin.role,
       action: :destroy
     )
   end
@@ -16,7 +16,7 @@ module Tramway::Admin::ActionsHelper
       association_object,
       project: (@application_engine || @application.name),
       model_name: association_object.model.class.name,
-      role: current_user.role,
+      role: current_admin.role,
       action: :update
     )
   end

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

@@ -4,7 +4,6 @@ module Tramway
   module Admin
     module ApplicationHelper
       include ::FontAwesome5::Rails::IconHelper
-      include AuthManagement
       include AdditionalButtonsBuilder
       include ::SmartButtons
       include CasesHelper
@@ -26,6 +25,12 @@ module Tramway
                             end
         ::Tramway::Admin.available_models_for(@application_engine || @application.name).map(&:to_s).include?(object_class_name) ? :record : :singleton
       end
+
+      def current_admin
+        user = Tramway::User::User.find_by id: session[:admin_id]
+        return false unless user
+        Tramway::User::UserDecorator.decorate user
+      end
     end
   end
 end

data/app/views/layouts/tramway/admin/shared/_navbar.html.haml

@@ -7,9 +7,9 @@
     %button.navbar-toggler.collapsed{ aria: { controls: :navbar, expanded: "false", label: 'Toggle Navigation' }, data: { target: "#navbar", toggle: :collapse }, type: :button }
       %span.navbar-toggler-icon
     .navbar-collapse.collapse#navbar
-      - if signed_in?
+      - if current_admin
         %ul.navbar-nav
-          - ::Tramway::Admin.navbar_items_for(@application_engine || @application.name, role: current_user.role)&.each do |item|
+          - ::Tramway::Admin.navbar_items_for(@application_engine || @application.name, role: current_admin.role)&.each do |item|
             - case item.keys.first
             - when Class
               - model = item.keys.first
@@ -31,7 +31,7 @@
                       = dropdown_model_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first), pluralize: plural(model.model_name).capitalize
 
       %ul.nav.navbar-nav.ml-auto
-        - if signed_in?
+        - if current_admin
           - if @notifications_count.present?
             - if @notifications_count > 0
               %li.nav-item.dropdown.notifications
@@ -50,7 +50,9 @@
                   %span.badge.badge-light
                     = @notifications_count
           %li.nav-item
-            = link_to Tramway::Auth::Engine.routes.url_helpers.session_path, method: :delete, class: 'nav-link' do
+            -# FIXME url_helpers return with /admin for some reason
+            -#= link_to Tramway::Auth::Engine.routes.url_helpers.session_path(model: Tramway::User::User).sub('/admin', ''), method: :delete, class: 'nav-link' do
+            = link_to '/admin/sign_out', class: 'nav-link' do
               = fa_icon 'sign-out-alt'
               = t('helpers.links.sign_out')
         - else

data/app/views/tramway/admin/sessions/new.html.haml

@@ -0,0 +1,9 @@
+- title
+.row
+  .col-md-6
+    = simple_form_for @session_form.model, url: '/admin/session', method: :post, html: { class: 'form-horizontal' } do |f|
+      = f.input :email, as: :string
+      = f.input :password
+      = hidden_field_tag :model, @session_form.model.class.to_s
+      = hidden_field_tag :redirect, Tramway::Admin::Engine.routes.url_helpers.root_path
+      = f.button :submit, t('helpers.links.enter'), class: 'btn btn-success'

data/config/routes.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 Tramway::Admin::Engine.routes.draw do
-  mount Tramway::Auth::Engine, at: '/auth'
   mount Tramway::Export::Engine, at: '/' if defined? Tramway::Export::Engine
 
   root to: 'welcome#index'
@@ -9,4 +8,6 @@ Tramway::Admin::Engine.routes.draw do
   resources :records
   resource :singleton, only: %i[new create show edit update]
   resources :has_and_belongs_to_many_records, only: %i[create destroy]
+  resource :session, only: %i[new create]
+  get 'sign_out', to: 'sessions#destroy'
 end

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.29.2'
+    VERSION = '1.30'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.29.2
+  version: '1.30'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
@@ -183,6 +183,7 @@ files:
 - app/controllers/tramway/admin/application_controller.rb
 - app/controllers/tramway/admin/has_and_belongs_to_many_records_controller.rb
 - app/controllers/tramway/admin/records_controller.rb
+- app/controllers/tramway/admin/sessions_controller.rb
 - app/controllers/tramway/admin/singletons_controller.rb
 - app/controllers/tramway/admin/welcome_controller.rb
 - app/controllers/tramway/export/application_controller.rb
@@ -207,6 +208,7 @@ files:
 - app/views/tramway/admin/records/index.html.haml
 - app/views/tramway/admin/records/new.html.haml
 - app/views/tramway/admin/records/show.html.haml
+- app/views/tramway/admin/sessions/new.html.haml
 - app/views/tramway/admin/shared/_show.html.haml
 - app/views/tramway/admin/shared/errors/server_error.html.haml
 - app/views/tramway/admin/shared/show/_attribute_tr.html.haml