symphonia 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a195060e6fa12677b383245afdaa0d7cefb75e463031b21aca473c2b2eabc6d
-  data.tar.gz: ca98109a38542883af2f24a0eadbfb9363861b09fa98a146437c405ba4872338
+  metadata.gz: 81d7e486f9226d136f252f53841733cf7fd1f76a84a27b80ff0472cfc574ae30
+  data.tar.gz: 39fa3ee78ed46669f2dcd583179818e7288fd392c54556b943d7ca2a9b1b312b
 SHA512:
-  metadata.gz: 4b5a099d7ab9e70cbe8526a9e2a765220c3d137472a08dfcbedebaef43745c96f78dc90512335adf4da26b1e910052231c9fa49fcff11dc8eeda122bb8ef1554
-  data.tar.gz: 6f300e80b0373f6f19298f6a1c33a4e059be86e7f1110eeebe74f32e90a04960a3ab2edbadf2d5d54624fbc3b4b38c6734b02abd7f6e857d06c11c6648a49b03
+  metadata.gz: 16fa7bf6a6fbfbb875f0d6bf84c554ecd48ba9d2aacf2c259b361c3e5cb90ac57d448bd1da3c95ab3a1918f18b1a22a05ed3db1517bb36dcc34a4d10e30b7577
+  data.tar.gz: 4fd6defbf9b4128295eb1c5d90c9ec9476c08e4d80adb58fdcd275cc5998190adad1db771d496cbb97f6ed128d6fafa46109b9b96b320ec892544ebb6c5a3743

data/CHANGELOG.md

@@ -5,11 +5,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [3.3.2] - 2020-10-17
+### Added
+- `render_super` for templates
+### Changed
+- lost password check
+## [3.3.1] - 2020-09-28
 ### Removed
-- openapi (it seems to be uneccessary)
+- openapi (it seems to be unnecessarily)
 - paperclip support
+- the_sortable_tree
 ### Changed
-- upgrade authlogic to 6.1.0
+- upgrade authlogic to 6.2.0
 ## [3.2.4] - 2020-05-10
 ### Added
 - sidekiq-cron gem
@@ -80,7 +87,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - do not require password for SSO users
 - hide password field from form of SSO users
 ## [3.0.0] - 2019-07-06
-### Added
+### Added
 - external_id on user
 ### Changed
 - users/show only for logged users

data/app/controllers/symphonia/accounts_controller.rb

@@ -100,6 +100,8 @@ module Symphonia
 
     end
 
+    # @!group Reset lost password
+
     def reset_password
       @user = find_account_by_token(params.require(:id))
       return render_404 if @user.nil?
@@ -109,28 +111,28 @@ module Symphonia
       end
 
       if @user.changed? && @user.save
-        return redirect_to(user_current_path, notice: t(:text_updated))
+        logger.info "#{@user.id} has changed password"
+        return redirect_to(login_path, notice: t(:text_password_reset_success))
       end
     end
 
     def lost_password
       @user = find_account_by_mail(params[:email]) if params[:email]
-      if @user
-        if @user.active?
-          @user.reset_perishable_token!
-          Notifier.reset_password_user(@user).deliver_later
+      if @user&.active?
+        @user.reset_perishable_token!
+        activation_url = url_for(action: "reset_password", id: @user.perishable_token, only_path: false)
+        Notifier.reset_password_user(@user, activation_url).deliver_later
+      end
+      respond_to do |format|
+        format.html do
           redirect_to login_path, notice: t(:text_reset_password_resend)
-        else
-          redirect_to login_path, flash: { error: t("authlogic.error_messages.not_active") }
-        end
-      else
-        respond_to do |format|
-          format.html
-          format.js
         end
+        format.js
       end
     end
 
+    # @!endgroup
+
     private
 
     def prepare_user

data/app/helpers/symphonia/application_helper.rb

@@ -242,6 +242,23 @@ module Symphonia
       fa_icon(fa, (text && { text: content_tag(:span, text, class: 'd-none d-sm-inline') } || {}).merge(options))
     end
 
+    # Render original template from engine
+    #   Useful for override part of engine view
+    #
+    # @example render_super "login/new"
+    # @param [String] template_name
+    # @param [Class<Symphonia::Engine>] engine
+    # @param [String] format
+    def render_super(template_name, engine: Symphonia::Engine, format: "html")
+      resolver = lookup_context.view_paths.paths.find do |resolver|
+        resolver.path == engine.root.join("app", "views").to_s
+      end
+      template = resolver.find_all(template_name, engine.engine_name, false, { locale: ["."], formats: [format], variants: [], handlers: [:erb] }, nil, {}).first
+      return "" unless template
+
+      render template: template
+    end
+
     def render_symphonia_dialog(*args, &block)
       ActiveSupport::Deprecation.warn "Use `render_modal` instead"
       options = args.extract_options!
@@ -356,67 +373,6 @@ module Symphonia
       end
 
     end
-
-    # Example of use
-    # <%=
-    # table_header_tag_for(User) do |t|
-    #  t.th :login
-    #  t.th :email
-    # end
-    # %>
-    # options:
-    # => column : DB full name of column
-    #
-    # def table_header_tag_for(model, &block)
-    #   tags = TableHeaderTag.new(model, self)
-    #   yield tags
-    #   tags.to_html
-    # end
-    #
-    # class TableHeaderTag
-    #
-    #   attr_reader :view, :model
-    #
-    #   def initialize(model, view)
-    #     @model = model
-    #     @tags = Array.new
-    #     @view = view
-    #   end
-    #
-    #   def th(*args)
-    #     options = args.extract_options!
-    #     attribute = args.first
-    #     label = args[1]
-    #     raise ArgumentError if attribute.nil?
-    #
-    #     sort_options = options.delete(:sort_options) || {}
-    #     html_options = options.delete(:html_options) || {}
-    #
-    #     label ||= @model.send(:human_attribute_name, attribute, options[:i18n] || {})
-    #     @tags << @view.content_tag(:th, html_options) do
-    #       if options[:sort] === false
-    #         label
-    #       else
-    #         sort_options[:column] ||= options.delete(:column)
-    #         sort_options[:column] ||= "#{@model.send(:table_name)}.#{attribute}"
-    #         # @view.sortable_column(label, sort_options) # TODO: Rails 5 error
-    #         label
-    #       end
-    #     end
-    #
-    #   end
-    #
-    #   def to_html
-    #     @tags.join("\n").html_safe
-    #   end
-    #
-    # end
-
-    # def render_share_buttons(url, name, options = {})
-    #   options[:icon_css] ||= ''
-    #   render(partial: 'common/share_links', locals: options.merge({ url: url, name: name }))
-    # end
   end
 end
 
-#ApplicationHelper.send :include, Symphonia::ApplicationHelperExtension

data/app/mailers/symphonia/notifier.rb

@@ -21,8 +21,9 @@ module Symphonia
       mail({ to: @user.mail, subject: 'Váš účet je aktivován' })
     end
 
-    def reset_password_user(user)
+    def reset_password_user(user, url)
       @user = user
+      @url = url
       mail({ to: @user.mail, subject: t(:subject_reset_password_mail) })
     end
 

data/app/models/symphonia/user.rb

@@ -21,7 +21,6 @@ module Symphonia
     acts_as_authentic do |config|
       config.crypto_provider = ::Authlogic::CryptoProviders::SCrypt
     end
-    validates :email, uniqueness: { case_sensitive: false }
     validates :password,
               confirmation: { if: :require_password? },
               length: {

data/app/views/layouts/symphonia/application.pdf.erb

@@ -10,6 +10,5 @@
     <section id="main" class="container-fluid">
       <%= yield %>
     </section>
-
   </body>
 </html>

data/app/views/symphonia/accounts/lost_password.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag symphonia.lost_password_account_path do %>
+<%= form_tag url_for({action: 'lost_password'}) do %>
 <div class="form-group required">
   <%= label_tag(:email, t(:'attributes.mail'), required: true, class: 'sr-only') %>
   <%= email_field_tag(:email, nil, autofocus: true, placeholder: t(:'attributes.mail'), required: true, size: 35, class: 'form-control') %>

data/app/views/symphonia/accounts/reset_password.html.erb

@@ -3,11 +3,11 @@
     <div class="card w-75 mx-auto">
       <div class="card-body">
         <h4 class="card-title"><%= t(:label_reset_password) %></h4>
-        <%= symphonia_form_tag(url: symphonia.reset_password_path(params[:id]), method: 'put') do |f| %>
+        <%= symphonia_form_tag(url: url_for(action: "reset_password", id: params[:id]), method: 'put') do |f| %>
           <%= f.error_messages %>
           <%= f.password_field(:password, label: t(:'attributes.password'), required: true, wrapper_class: 'required') -%>
 
-          <%= f.submit(t(:button_submit), class: 'btn btn-primary btn-block') -%>
+          <%= f.submit(t(:button_save), class: 'btn btn-primary btn-block') -%>
         <% end %>
       </div>
     </div>

data/app/views/symphonia/login/_form.html.erb

@@ -8,7 +8,6 @@
   <%= f.check_box :remember_me %>
 <% end %>
 
-<%= f.form_group class: 'text-center' do %>
   <%= f.submit t(:button_login), class: 'btn btn-primary btn-block' %>
   <% if f.object.is_a?(Symphonia::UserSession) %>
     <%= link_to(t(:label_reset_password), lost_password_account_path, remote: true, class: 'btn btn-link btn-sm ') %>
@@ -16,4 +15,3 @@
       <%= link_to(t(:button_register), register_path, class: 'btn btn-link btn-sm ') %>
     <% end %>
   <% end %>
-<% end %>

data/app/views/symphonia/notifier/reset_password_user.html.erb

@@ -2,6 +2,5 @@
   <%= t(:text_html_reset_password, :scope => :mailer) %>
 </p>
 <p>
-  <% activation_url = symphonia.reset_password_url(id: @user.perishable_token) %>
-  <%= link_to(activation_url, activation_url) %>
+  <%= link_to(@url, @url) %>
 </p>

data/app/views/symphonia/notifier/reset_password_user.text.erb

@@ -1,3 +1,3 @@
 <%= t(:'mailer.text_html_reset_password') %>
 
-<%=symphonia.reset_password_url(id: @user.perishable_token) %>
+<%= @url -%>

data/config/locales/cs.yml

@@ -153,6 +153,8 @@ cs:
   text_error_query_not_init: Filtry nejsou nastaveny. Registruj query!
   text_error_there_is_no_filters_available: Nejsou zaregistrované žádné validní filtry.
   text_error_login_required: Přihlašte se prosím
+  text_password_reset_success: "Nové heslo uloženo. Přihlašte se prosím"
+
 
   title_toggle_multiselect: Přepnout multiselect
   title_login: Přihlášení

data/lib/symphonia/engine.rb

@@ -20,7 +20,6 @@ require 'sortable-table'
 require 'awesome_nested_set'
 # require 'acts_as_list'
 require 'bootstrap_form'
-require 'the_sortable_tree'
 require 'bootstrap-datepicker-rails'
 # require 'wicked_pdf'
 # require 'swagger/blocks'

data/lib/symphonia/user_management.rb

@@ -13,7 +13,10 @@ module Symphonia
       # validates :password, presence: true, if: ->(u){ u.new_record? }
 
       validates :email, presence: true, uniqueness: { case_sensitive: false }
-      validates :login, :first_name, presence: true
+      validates :login, presence: true, uniqueness: { case_sensitive: false }
+      validates :first_name, presence: true
+
+      before_validation :set_uuid, only: -> { uuid.blank? }
 
       def self.current=(entity)
         Rails.logger.info("* #{entity.class.name}: #{entity.login} id: #{entity.id}") if entity
@@ -54,6 +57,11 @@ module Symphonia
 
       alias_method :activate!, :unarchive!
 
+      private
+
+      def set_uuid
+        self.uuid ||= SecureRandom.uuid
+      end
     end
   end
 end

data/lib/symphonia/version.rb

@@ -1,3 +1,3 @@
 module Symphonia
-  VERSION = '3.3.0'
+  VERSION = '3.3.2'
 end

data/spec/controllers/account_controller_spec.rb

@@ -90,7 +90,7 @@ module Symphonia
       subject { FactoryBot.create :user }
       it "reset" do
         put :reset_password, params: { id: subject.perishable_token, password: "secret-pass-1" }
-        expect(response).to redirect_to /user\/current/
+        expect(response).to redirect_to /login/
         expect { subject.reload }.to change(subject, :crypted_password)
       end
     end

data/spec/factories/factories.rb

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :user, class: 'Symphonia::User', aliases: [:author] do
     sequence(:first_name) { |n| "#{Faker::Name.first_name} #{n}" }
     sequence(:last_name) { |n| "#{Faker::Name.last_name} #{n}" }
-    sequence(:email) { |n| "#{n}" + Faker::Internet.email }
+    sequence(:email) { |n| "#{n}-#{Faker::Internet.email}" }
     login { email }
     admin { false }
     password { SecureRandom.hex(16) }
@@ -26,19 +26,7 @@ FactoryBot.define do
   factory :role, class: 'Symphonia::Role' do
     sequence(:name) { |n| "#{Faker::Job.title} #{n}" }
   end
-
-  # factory :attachment, class: 'Symphonia::Attachment' do
-  #   association :attachable, factory: :user
-  # end
-  #
-  # factory :file, parent: :attachment, class: 'Symphonia::CommonFile' do
-  #   attachment { File.new(File.expand_path('../../support/common_file.txt', __FILE__)) }
-  # end
-  #
-  # factory :image, parent: :attachment, class: 'Symphonia::Image' do
-  #   attachment { File.new(File.expand_path('../../support/symphonia.jpg', __FILE__)) }
-  # end
-
+  
   factory :preference, class: 'Symphonia::Preference' do
 
     factory :email_preference, class: 'Symphonia::EmailPreference' do

data/spec/mailers/previews/symphonia/notifier_preview.rb

@@ -10,7 +10,7 @@ module Symphonia
     end
 
     def reset_password_user
-      Notifier.reset_password_user(User.last)
+      Notifier.reset_password_user(User.last, "http://symphonia.app/reset?id=123")
     end
 
     def activation_user
@@ -21,7 +21,6 @@ module Symphonia
       Notifier.user_change_to_active(User.last)
     end
 
-
   end
 
 end

data/spec/mailers/symphonia/notifier_spec.rb

@@ -45,7 +45,7 @@ module Symphonia
     end
 
     context '#reset_password_user' do
-      let(:mail) { described_class.reset_password_user(user) }
+      let(:mail) { described_class.reset_password_user(user, Symphonia::Engine.routes.url_helpers.reset_password_path(user.perishable_token)) }
 
       it 'renders the headers' do
         expect(mail.subject).to match 'heslo'

data/spec/requests/accounts_spec.rb

@@ -61,7 +61,7 @@ describe Symphonia::AccountsController do
 
     it 'html' do
       get symphonia.lost_password_account_path
-      expect(response).to have_http_status :success
+      expect(response).to have_http_status :redirect
     end
 
   end
@@ -91,7 +91,7 @@ describe Symphonia::AccountsController do
 
       it 'valid token' do
         put symphonia.reset_password_account_path(id: token, password: password, password_confirmation: password)
-        expect(response).to redirect_to symphonia.user_current_path
+        expect(response).to redirect_to /login/
         expect(flash[:notice]).not_to be :blank
       end
 

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ require 'database_cleaner'
 require 'sass-rails'
 require 'authlogic/test_case'
 
-
 Dir.glob(File.expand_path('../support/*.rb', __FILE__)).each do |file|
   require file
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.2
 platform: ruby
 authors:
 - Lukas Pokorny
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: scrypt
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.0
-- !ruby/object:Gem::Dependency
-  name: the_sortable_tree
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: bootstrap-datepicker-rails
   requirement: !ruby/object:Gem::Requirement
@@ -591,13 +577,11 @@ files:
 - spec/requests/roles_spec.rb
 - spec/requests/users_spec.rb
 - spec/spec_helper.rb
-- spec/support/common_file.txt
 - spec/support/query.rb
 - spec/support/shared.rb
 - spec/support/shared_controllers.rb
 - spec/support/shared_requests.rb
 - spec/support/stub_users.rb
-- spec/support/symphonia.jpg
 - spec/support/wait_for_ajax.rb
 - spec/version_spec.rb
 - spec/views/filters/options.html.erb_spec.rb
@@ -621,7 +605,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: My administration
 test_files:
@@ -638,9 +622,7 @@ test_files:
 - spec/requests/login_spec.rb
 - spec/requests/accounts_spec.rb
 - spec/requests/users_spec.rb
-- spec/support/symphonia.jpg
 - spec/support/stub_users.rb
-- spec/support/common_file.txt
 - spec/support/shared.rb
 - spec/support/wait_for_ajax.rb
 - spec/support/shared_controllers.rb

data/spec/support/common_file.txt

@@ -1,2 +0,0 @@
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Mauris dolor felis, sagittis at, luctus sed, aliquam non, tellus. Etiam dictum tincidunt diam. Suspendisse sagittis ultrices augue. Nullam justo enim, consectetuer nec, ullamcorper ac, vestibulum in, elit. Nulla quis diam. Duis bibendum, lectus ut viverra rhoncus, dolor nunc faucibus libero, eget facilisis enim ipsum id lacus. Sed convallis magna eu sem. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nulla accumsan, elit sit amet varius semper, nulla mauris mollis quam, tempor suscipit diam nulla vel leo. Nullam eget nisl. Pellentesque pretium lectus id turpis. Proin in tellus sit amet nibh dignissim sagittis. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Etiam commodo dui eget wisi. Nunc auctor. Vivamus porttitor turpis ac leo. Nullam sapien sem, ornare ac, nonummy non, lobortis a enim. In sem justo, commodo ut, suscipit at, pharetra vitae, orci.
-