symphonia 4.1.0 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eec90ba27010e7ef24336cca4a4294f7bd697c533adc5e46fa0a6454bfab0dba
-  data.tar.gz: f833fbdeea1516e4c1093beb95494a49db1c4aecea3dfd0f2a382164420677a1
+  metadata.gz: d64b152203dc6bf578501b1095fbd81e2cbe5ede1fd34a4eb020ffdf54ee8f57
+  data.tar.gz: 1c87c27bf654326f38c574bfb4afcf0eb0d7a19e442fa2581438d90953b7bbe9
 SHA512:
-  metadata.gz: 6c15251d18a8b59efd80c8c6b6d6c9c5739b2e35eba9a441658a07f4459902f822fb8337f096b7f0961a7bd0354ac78b5c4822f210bd6ec7a2ddf55d4086927c
-  data.tar.gz: d49ee80bfb5db3c3e1c84000278f139e001a73d3da136a2bef1e75085b439dbdf6fb404ad51b04dd59154db9a41cc14da992ad19da3e800066396ffe64a799df
+  metadata.gz: a328cfbc0aae03353f32c05a5516f1a75525fb79660eaa01addbd3562a471b7d38be4aa0f0f7618328cd77bd55e7296e830a9205043d78c6a3f7df17971619ea
+  data.tar.gz: 14d656d24c7c1741d52ee4faa3cff9eebfabaea0b6ff1de737c7b99e1329e12f6fcad977a76bcec1a07fecd072429f132c7fe9446649cd51502b93f8ecf979c2

data/.rubocop.yml

@@ -19,6 +19,8 @@ Metrics/BlockLength:
   Enabled: false
 Metrics/MethodLength:
   Enabled: false
+Naming/VariableNumber:
+  Enabled: false
 
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -5,6 +5,19 @@ 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]
+## [4.1.3] - 2022-03-02
+### Changed
+- update sidekiq
+## [4.1.2] - 2022-01-20
+### Removed
+- Recaptcha conditions
+### Changed
+- registration/login autocomplete
+- cleanup controller extensions
+
+## [4.1.1] - 2021-12-26
+### Fixed
+- user activation
 ## [4.1.0] - 2021-10-23
 ### Fixed
 - missing default settings template in generator:setup

data/app/assets/stylesheets/symphonia/basic.scss

@@ -43,9 +43,7 @@
         content: "\f05d"
     }
 }
-flash.recaptcha_error {
-    display: none;
-}
+
 .nodata, .no-data {
     @extend .flash;
     @extend .info;

data/app/controllers/symphonia/accounts_controller.rb

@@ -5,8 +5,6 @@ module Symphonia
     before_action -> { menu_item(:my_account) }, only: [:show, :edit, :update]
     before_action :prepare_user, only: [:register, :create]
 
-    helper Recaptcha::ClientHelper if defined? Recaptcha
-
     def show
       @user = current_account
 
@@ -32,7 +30,7 @@ module Symphonia
         if @user.valid? && verify_registration && @user.save(validate: false)
           Notifier.activation_user(@user).deliver_later
           Notifier.user_registered(@user).deliver_later
-          format.html { redirect_to '/', notice: t(:text_user_registered) }
+          format.html { redirect_to login_path, notice: t(:text_user_registered) }
           format.json { render status: :created }
         else
           format.html { render action: 'register' }
@@ -71,14 +69,14 @@ module Symphonia
       @user = find_account_by_mail(params.require(:email))
       if @user
         if @user.active?
-          redirect_to root_path, flash: { error: t(:text_user_alerady_active) }
+          redirect_to login_path, flash: { error: t(:text_user_alerady_active) }
         else
           @user.reset_perishable_token!
           Notifier.activation_user(@user).deliver_later
-          redirect_to root_path, notice: t(:text_activation_resend)
+          redirect_to login_path, notice: t(:text_activation_resend)
         end
       else
-        redirect_to root_path, flash: { error: t(:text_user_not_found) }
+        redirect_to login_path, flash: { error: t(:text_user_not_found) }
       end
     end
 
@@ -88,7 +86,7 @@ module Symphonia
         @user.activate!
         redirect_to login_path, notice: t(:text_activation_success)
       else
-        redirect_to root_path, flash: { error: t(:text_user_not_found_or_token_invalid) }
+        redirect_to login_path, flash: { error: t(:text_user_not_found_or_token_invalid) }
       end
     end
 
@@ -159,11 +157,7 @@ module Symphonia
 
     # @return [Boolean]
     def verify_registration
-      if defined?(Recaptcha)
-        verify_recaptcha(model: @user)
-      else
-        true
-      end
+      true
     end
 
   end

data/app/helpers/symphonia/application_helper.rb

@@ -28,7 +28,7 @@ module Symphonia
         end
       end
 
-      return s.html_safe
+      s.html_safe
     end
 
     def render_menu(menu, options = {})
@@ -38,7 +38,7 @@ module Symphonia
       end
       options[:container_class] ||= 'mr-auto'
 
-      return content_tag(:ul, s.html_safe, itemscope: '', itemtype: 'http://schema.org/BreadcrumbList', class: "navbar-nav #{options[:container_class]}", id: menu.to_s)
+      content_tag(:ul, s.html_safe, itemscope: '', itemtype: 'http://schema.org/BreadcrumbList', class: "navbar-nav #{options[:container_class]}", id: menu.to_s)
     end
 
     def render_menu_node(menu, item, options = {})

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

@@ -9,11 +9,9 @@
   </div>
   <div class="col-lg-8">
     <%= f.text_field :first_name, required: true %>
-
   </div>
   <div class="col-lg-8">
     <%= f.text_field :last_name, required: true %>
-
   </div>
   <div class="col-lg-8">
     <% if f.object.external_id.blank? %>
@@ -21,5 +19,3 @@
     <% end %>
   </div>
 </div>
-
-

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

@@ -8,20 +8,10 @@
         <%= symphonia_form_for(@user, url: account_register_path) do |f| %>
           <div style="width:1px;height: 1px;visibility: hidden"><%= check_box_tag :terms, true %></div>
           <%= f.error_messages %>
-          <%= f.email_field :mail, required: true, prepend: "@" %>
-          <%= f.text_field :name, required: true, prepend: icon("user") %>
-          <%= f.password_field :password, required: true, prepend: icon('key') %>
-          <% if defined? Recaptcha %>
-            <fieldset>
-              <%= content_tag(:legend, t(:text_explanation_recaptcha)) %>
-              <div class="form-group">
-                <div class="col-sm-offset-4 col-sm-5">
-                  <%#= invisible_recaptcha_tags %>
-                  <%= recaptcha_tags(:display => { :theme => 'white' }) %>
-                </div>
-              </div>
-            </fieldset>
-          <% end %>
+          <%= f.text_field :name, required: true, autocomplete: "off", prepend: icon("user") %>
+          <%= f.email_field :mail, required: true, autocomplete: "username", prepend: "@" %>
+          <%= f.password_field :password, autocomplete: "new-password", required: true, prepend: icon('key') %>
+
           <%= f.primary t(:button_register), class: 'btn btn-primary btn-block' %>
         <% end %>
       </div>

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

@@ -1,8 +1,8 @@
 <%= f.error_messages %>
-<%= hidden_field_tag(:back_url, params[:back_url].presence || request.env['HTTP_REFERER'].presence || session[:back_url]) %>
-<%= f.text_field :login, required: true, autofocus: true %>
+<%= hidden_field_tag(:back_url, back_url || session[:back_url]) %>
+<%= f.text_field :login, required: true, autofocus: true, autocomplete: "username" %>
 
-<%= f.password_field :password, required: true %>
+<%= f.password_field :password, required: true, autocomplete: "current-password" %>
 
 <%= f.form_group :remember_me do %>
   <%= f.check_box :remember_me %>

data/config/locales/cs.yml

@@ -79,10 +79,6 @@ cs:
           role_id: 'Role'
           ssl: Používat SSL?
 
-  recaptcha:
-    errors:
-      verification_failed: 'Nesprávný text z obrázku'
-
   helpers:
       submit:
         create: Vytvořit
@@ -144,7 +140,6 @@ cs:
   text_user_not_found: Účet nenalezen
   text_activation_resend: Aktivační odkaz odeslán
   text_reset_password_resend: Informace o změně hesla odeslány
-  text_explanation_recaptcha: 'Opište prosím tato dvě slova:'
   text_or: nebo
   text_confirm_send_unlock_mail: Po aktivaci účtu bude uživateli zaslán email.
   text_error_no_data_file_input: Nebyl vybrán žádný soubor

data/lib/generators/symphonia/setup/templates/Gemfile

@@ -14,5 +14,4 @@ end
 
 # gem 'bootswatch-rails'
 # gem 'jquery-colorbox-rails'
-# gem 'recaptacha'
-# gem 'ckeditor-rails'
+# gem 'ckeditor-rails'

data/lib/generators/symphonia/setup/templates/app/config/initializers/settings.rb.tt

@@ -1,10 +1,5 @@
 # encoding: utf-8
 
-# Recaptcha.configure do |config|
-#   config.site_key  = '6LejxOESAAAAALC3ohQCddKilokhYnTNXfYVItZe'
-#   config.secret_key = '6LejxOESAAAAANf-9T4nyHCDGW6Ok78Zo7GaG2GK'
-# end
-
 WillPaginate.per_page = 20
 # Rails.application.config.i18n.available_locales = %i[en cs ru pl]
 

data/lib/symphonia/admin_constraint.rb

@@ -1,10 +1,12 @@
 module Symphonia
   class AdminConstraint
+
     def matches?(request)
       return false if (credentials = request.session["symphonia/user_credentials"]).blank?
 
       user = User.find_by_persistence_token(credentials.split(':')[0])
       user&.admin?
     end
+
   end
-end
+end

data/lib/symphonia/controller_extensions.rb

@@ -3,69 +3,39 @@ module Symphonia
 
     extend ActiveSupport::Concern
 
+    class Unauthorized < RuntimeError
+    end
 
     included do
-      class Unauthorized < Exception;
-      end
 
       before_action :current_user, :menu_item
       before_action :set_default_locale
 
-      # force_ssl if: -> {Rails.env.production? && User.current.ssl?}
-
       add_flash_types :notice
       add_flash_types :info
       add_flash_types :warning
       add_flash_types :error
 
-      rescue_from ::ActiveRecord::RecordNotFound do
-        render_404
-      end
-
-      rescue_from Unauthorized do
-        render_403
-      end
-
-      helper_method :current_user
+      rescue_from ::ActiveRecord::RecordNotFound, with: :render_404
+      rescue_from Unauthorized, with: :render_403
 
+      helper_method :current_user, :back_url
     end
 
     def back_url
-      url = params[:back_url]
-      if url.nil? && (referer = request.env['HTTP_REFERER'])
+      url = params[:back_url].presence
+      if url.nil? && (referer = request.env['HTTP_REFERER'].presence)
         url = CGI.unescape(referer.to_s)
       end
       url
     end
 
-    # def redirect_back_or_default(default, options={})
-    #   back_url = params[:back_url].to_s
-    #   if back_url.present?
-    #     begin
-    #       uri = URI.parse(back_url)
-    #       # do not redirect user to another host or to the login or register page
-    #       if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
-    #         redirect_to(back_url)
-    #         return
-    #       end
-    #     rescue URI::InvalidURIError
-    #       logger.warn("Could not redirect to invalid URL #{back_url}")
-    #       # redirect to default
-    #     end
-    #   elsif options[:referer]
-    #     redirect_to_referer_or default
-    #     return
-    #   end
-    #   redirect_to default, options
-    #   false
-    # end
-
     # Redirects to the request referer if present, redirects to args or call block otherwise.
     def redirect_to_referer_or(*args, &block)
       redirect_to :back
     rescue ::ActionController::RedirectBackError
       if args.any?
-        redirect_to *args
+        redirect_to(*args)
       elsif block_given?
         block.call
       else
@@ -76,7 +46,10 @@ module Symphonia
     # private
 
     def set_locale
-      client_lang = Array(params.fetch(:locale, nil).presence || session[:locale].presence || request.env['HTTP_ACCEPT_LANGUAGE'].to_s.split(',').collect { |l| l.scan(/^[a-z]{2}/) }.flatten)
+      params_locale = params.fetch(:locale, nil).presence
+      params_locale ||= session[:locale].presence
+      params_locale ||= request.env['HTTP_ACCEPT_LANGUAGE'].to_s.split(',').collect { |l| l.scan(/^[a-z]{2}/) }.flatten
+      client_lang = Array(params_locale).compact
       client_lang.unshift current_user.language if current_user.language
       @client_lang = client_lang.detect { |l| I18n.available_locales.include?(l.to_sym) }
 
@@ -87,53 +60,57 @@ module Symphonia
     end
 
     def set_default_locale
-      if (enforce_default = Symphonia.config.default_locale)
-        I18n.locale = enforce_default
-      end
+      return unless (enforce_default = Symphonia.config.default_locale)
+
+      I18n.locale = enforce_default
     end
 
     # protected
 
-    def login_require(format = nil)
+    def login_require(_format = nil)
       if current_user.nil? || !current_user.logged_in?
         respond_to do |format|
           format.html do
             store_location
             redirect_to symphonia.login_path, flash: { error: t(:text_login_require) }
           end
-          format.json { render json: { errors: 'You must be logged in to access this endpoint' }, status: 401 }
-          format.any { head 401 }
+          format.json do
+            render json: { errors: 'You must be logged in to access this endpoint' }, status: :unauthorized
+          end
+          format.any { head :unauthorized }
         end
         return false
       end
       true
     end
 
-    alias_method :require_login, :login_require
-    alias_method :require_user, :login_require
+    alias require_login login_require
+    alias require_user login_require
 
     def admin_require
       return unless login_require
 
       unless current_user.admin?
         render_403
-        return false
+        false
       end
     end
 
-    alias_method :require_admin, :admin_require
+    alias require_admin admin_require
 
     def render_403
       respond_to do |format|
-        format.html { render template: 'common/403', message: :notice_not_authorized, status: 403 }
-        format.js { render plain: "alert('#{t :text_access_deny}')", message: :notice_not_authorized, status: 403 }
+        format.html { render template: 'common/403', message: :notice_not_authorized, status: :forbidden }
+        format.js do
+          render plain: "alert('#{t :text_access_deny}')", message: :notice_not_authorized, status: :forbidden
+        end
         format.any { head 403, message: :notice_not_authorized }
       end
     end
 
     def render_404
       respond_to do |format|
-        format.html { render template: 'common/404', message: :notice_page_not_found, status: 404 }
+        format.html { render template: 'common/404', message: :notice_page_not_found, status: :not_found }
         format.any { head 404, message: :not_found }
       end
     end
@@ -161,35 +138,32 @@ module Symphonia
     def current_user
       return (Symphonia::User.current ||= @current_user) if defined?(@current_user)
 
-      @current_user = current_user_session && current_user_session.user
+      @current_user = current_user_session&.user
       Symphonia::User.current = @current_user || Symphonia::User::Anonymous.new
     end
 
     def authorize
       if Symphonia::User.current.authorize?(controller_name, action_name)
         return true
+      elsif Symphonia::User.current.logged_in?
+        raise Unauthorized
       else
-        if Symphonia::User.current.logged_in?
-          raise Unauthorized
-        else
-          respond_to do |format|
-            format.html do
-              return redirect_to(symphonia.login_path(back_url: request.path), error: t(:text_error_login_required))
-            end
-            format.any { return head 401 }
+        respond_to do |format|
+          format.html do
+            return redirect_to(symphonia.login_path(back_url: request.path), error: t(:text_error_login_required))
           end
+          format.any { return head 401 }
         end
       end
+
       raise Unauthorized
     end
 
     def handle_unverified_request
       # raise an exception
-      fail ActionController::InvalidAuthenticityToken
+      raise ActionController::InvalidAuthenticityToken
       # or destroy session, redirect
-      if current_user_session
-        current_user_session.destroy
-      end
+      current_user_session&.destroy
       redirect_to main_app.root_url
     end
 

data/lib/symphonia/user_management.rb

@@ -11,7 +11,6 @@ module Symphonia
 
       validates :email, presence: true, uniqueness: { case_sensitive: false }
       validates :login, presence: true, uniqueness: { case_sensitive: false }
-      validates :first_name, presence: true
 
       before_validation :set_uuid, only: -> { uuid.blank? }
       before_validation :set_login, only: -> { login.blank? }

data/lib/symphonia/version.rb

@@ -1,5 +1,5 @@
 module Symphonia
 
-  VERSION = '4.1.0'
+  VERSION = '4.1.3'
 
 end

data/spec/controllers/account_controller_spec.rb

@@ -6,8 +6,8 @@ RSpec.describe Symphonia::AccountsController do
 
   let(:regular_user) { FactoryBot.create(:user) }
 
-  context 'logged', logged: true do
-    context '#update' do
+  context 'with logged', logged: true do
+    describe '#update' do
 
       it 'valid' do
         put :update, params: { user: { login: Faker::Internet.user_name } }
@@ -22,53 +22,52 @@ RSpec.describe Symphonia::AccountsController do
     end
   end
 
-  context '#resend_activation' do
+  describe '#resend_activation' do
 
     let(:email) { Faker::Internet.email }
     subject { get :resend_activation, params: { email: email } }
 
     it 'non exist user' do
-      is_expected.to redirect_to :root
+      is_expected.to redirect_to :login
       expect(flash[:error]).not_to be :blank
     end
 
     it 'active user' do
       _user = FactoryBot.create(:user, email: email, status: 'active')
-      is_expected.to redirect_to :root
+      is_expected.to redirect_to :login
       expect(flash[:error]).not_to be :blank
     end
 
+    let(:pending_user) { FactoryBot.create(:user, email: email, status: 'pending') }
     it 'pending user' do
-      user = FactoryBot.create(:user, email: email, status: 'pending')
-      token = user.perishable_token.dup
+      token = pending_user.perishable_token.dup
 
       expect { get :resend_activation, params: { email: email } }.to have_enqueued_job.on_queue('mailers')
-      expect(response).to have_http_status :redirect
 
-      expect(user.reload.perishable_token).not_to eq token
+      expect { pending_user.reload }.to change(pending_user, :perishable_token)
       expect(flash[:error]).to be_nil
       expect(flash[:notice]).not_to be :blank
     end
   end
 
-  context '#activation' do
-    let(:token) { SecureRandom.hex(3) }
+  describe '#activation' do
     subject { get :activation, params: { activation_code: token } }
+    let(:token) { SecureRandom.hex(3) }
+    let(:pending_user) { FactoryBot.create(:user, status: 'pending') }
 
     it 'valid token' do
-      user = FactoryBot.create(:user, status: 'pending')
-      user.update_columns(perishable_token: token)
+      pending_user.update_columns(perishable_token: token)
       is_expected.to redirect_to :login
-      expect(user.reload.status).to eq 'active'
+      expect { pending_user.reload }.to change(pending_user, :status).to "active"
     end
 
     it 'invalid token' do
-      is_expected.to redirect_to :root
+      is_expected.to redirect_to :login
       expect(flash[:error]).not_to be :blank
     end
   end
 
-  context '#lost_password' do
+  describe '#lost_password' do
 
     it 'with mail' do
       user = FactoryBot.create(:user, status: 'active')
@@ -84,8 +83,9 @@ RSpec.describe Symphonia::AccountsController do
     end
   end
 
-  context "#reset_password" do
+  describe "#reset_password" do
     subject { FactoryBot.create :user }
+
     it "reset" do
       put :reset_password, params: { id: subject.perishable_token, password: "secret-pass-1" }
       expect(response).to redirect_to /login/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.3
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-23 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-pagination
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 6.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 6.4.1
 - !ruby/object:Gem::Dependency
   name: sidekiq-cron
   requirement: !ruby/object:Gem::Requirement
@@ -498,7 +498,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement