symphonia 3.2.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d333a60e811eafab34bc7cf19131425076712d3f3b20ab9fee7ddb8fd9f94898
-  data.tar.gz: 38f357ed23b77df8e7dee365b11da243394242f3b2f06895b78d03dae245b9b6
+  metadata.gz: a94d9e18f62261a832ffb94a8392973d1bc7ecad3c147c9a67bf524fde81d061
+  data.tar.gz: 52ab54d867d94ba7029011f416fa854eb34984b33feed8447c920adfb647ca3e
 SHA512:
-  metadata.gz: 9c5ba3f62d587b04eb5a61623149960a5192b1f86ee18e9c8aa6376bd777dbcce204f12d70296c8792c25223af987bfbad549a30a0b5713cd2626d6ad7160667
-  data.tar.gz: 878e92fc583be0808d9647602adf067f0338824bc5ea8f45073fc02681812d9d845fdf81f2b0ab70bdfdd874d9ddab64516cb7b931eaeb2edc8b087fcc7120cc
+  metadata.gz: 98facf3061caf96e02c909469c6812eb07b77f5a8695eee924713e00ab052332949e4d26c9e5cbfea557f2f5c86c441f1568807df52cb5373ebda6d6b3094fe5
+  data.tar.gz: fd12db3ba010a729958fa5c11921528db0b36b2c5e614baf359eab19e5472f46c455fed36aeba2c643b43028a7866ca7a4e351666e39536d162706ac26bdf9b4

data/CHANGELOG.md

@@ -0,0 +1,99 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+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.3] - 2020-10
+### Changed
+- prefill login from email
+- allow login edit for legacy accounts
+## [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 unnecessarily)
+- paperclip support
+- the_sortable_tree
+### Changed
+- upgrade authlogic to 6.2.0
+## [3.2.4] - 2020-05-10
+### Added
+- sidekiq-cron gem
+## [3.2.3] - 2020-05-07
+### Fixed
+- find user by token from session
+## [3.2.2] - 2020-05-05
+### Changed
+- user/account form layout
+- Sidekiq v6
+### Fixed
+- UsersController#update Role should be sorted
+## [3.2.1] - 2020-05-01
+### Added
+- avatar_url to users
+- uuid to users
+- openapi support
+### Changed
+- improve setup generator
+- anonymous user have no "enforced" language
+### Fixed
+- update .rubocop
+- bootstrap_form update to 4.4.0
+- show time in localtime
+### Removed
+- ckeditor-jquery
+## [3.1.5] - 2020-01-20
+### Changed
+- improve split name (Symphonia::UserManagement#name=)
+## [3.1.4] - 2020-01-17
+### Changed
+- improve role form
+## [3.1.3] - 2019-12-21
+### Added
+- bootstrap_modal_helper extended by `link_to_modal` feature
+### Changed
+- helper Symphonia::BootstrapModalHelper in BaseController
+- new argument options in `icon` method (pass into `fa_icon`) 
+## [3.1.2] - 2019-12-07
+### Added
+- skip permission check in link_to_new_entity method
+### Fixed
+- login form additional buttons
+- lost_password form & mail
+- reset_password form & mail
+## [3.1.1] - 2019-12-07
+### Changed
+- accounts registration validation
+- update static 500.html
+## [3.1.0] - 2019-12-07
+### Added
+- BaseController for simplier create CRUD inheritance
+- base views (new, form, edit, show and index)
+- general EntityDecorator
+- input field in model Attribute
+- TextAttribute format
+### Changed
+- registration form refactored
+- update dummy to Rails 6
+### Removed
+- wicked_pdf dependency
+## [3.0.3] - 2019-10-06
+### Changed
+- rubocop.yml
+- use real user in tests instead a dummy object
+## [3.0.1] - 2019-07-08
+### Changed
+- do not require password for SSO users
+- hide password field from form of SSO users
+## [3.0.0] - 2019-07-06
+### Added
+- external_id on user
+### Changed
+- users/show only for logged users
+- upgrade to authlogic 5
+- minor improvements

data/app/controllers/symphonia/accounts_controller.rb

@@ -100,38 +100,39 @@ module Symphonia
 
     end
 
+    # @!group Reset lost password
+
     def reset_password
       @user = find_account_by_token(params.require(:id))
       return render_404 if @user.nil?
 
       if params[:password] # && params[:password_confirmation]
         @user.password = params[:password]
-        # @user.password_confirmation = params[:password_confirmation]
       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/controllers/symphonia/roles_controller.rb

@@ -14,87 +14,26 @@ module Symphonia
     #
     # before_action :authorize
     before_action :load_permissions, only: [:new, :edit, :update, :create]
-    #
-    # #layout 'admin'
-    #
-    # def index
-    #   @query = Symphonia::Role.query.new(self)
-    #   @entities = @query.entities
-    #   respond_to do |format|
-    #     format.html do
-    #       @entities = @entities.page(params[:page])
-    #       render layout: !request.xhr?
-    #     end
-    #     format.xml { render xml: @entities.all }
-    #     format.json { render json: @entities.all }
-    #   end
-    # end
-    #
-    # def show
-    #   @role = Role.find(params[:id])
-    #   respond_to do |format|
-    #     format.html
-    #     format.json { render json: @role }
-    #   end
-    # end
-    #
-    # def new
-    #   @role = Role.new
-    # end
-    #
-    # def edit
-    #   @role = Role.find(params[:id])
-    # end
 
     def create
       @entity = @role = Role.new(entity_params)
       @role.permissions = Symphonia::Permissions.find_all(params[:permissions]).map(&:name)
       super
-      # respond_to do |format|
-      #   if @role.save
-      #     format.html { redirect_to((params[:continue] ? new_role_path : roles_path), notice: t(:text_created)) }
-      #     format.json { render(json: @role, status: :created, location: @role) }
-      #   else
-      #     format.html { render(action: 'new') }
-      #     format.json { render(json: @role.errors, status: :unprocessable_entity) }
-      #   end
-      # end
     end
 
     def update
       @entity = @role = Role.find(params[:id])
       @role.permissions = Symphonia::Permissions.find_all(params[:permissions]).map(&:name)
       super
-      # respond_to do |format|
-      #   if @role.update_attributes(role_params)
-      #     format.html { redirect_to(edit_role_path(@role), notice: t(:text_updated)) }
-      #     format.json { head(:no_content) }
-      #   else
-      #     format.html { render(action: 'edit') }
-      #     format.json { render(json: @role.errors, status: :unprocessable_entity) }
-      #   end
-      # end
+
     end
 
-    # def destroy
-    #   @role = Role.find(params[:id])
-    #   @role.destroy
-    #   respond_to do |format|
-    #     format.html { redirect_to(roles_url, notice: t(:text_destroyed)) }
-    #     format.json { head :no_content }
-    #     format.js { render js: "Symphonia.filters.removeRow('#{view_context.dom_id(@role)}')"}
-    #   end
-    # end
-    #
     private
-    #
+
     def load_permissions
       @permissions = Symphonia::Permissions.all
     end
-    #
-    # def role_params
-    #   params.require(:role).permit(:name, :description, permissions: [])
-    # end
+
   end
 
 end

data/app/controllers/symphonia/users_controller.rb

@@ -1,10 +1,5 @@
 module Symphonia
   class UsersController < ApplicationController
-    include Symphonia::Swagger::BaseController
-    def self.tag_list
-      %w[User admin]
-    end
-    swagger_me entity: "User", base_path: "/admin/users"
 
     helper Symphonia::RendererHelper
 

data/app/helpers/symphonia/application_helper.rb

@@ -38,7 +38,7 @@ module Symphonia
       end
       options[:container_class] ||= 'mr-auto'
 
-      return content_tag(:ul, s.html_safe, itemscope: '', itemtype: 'http://data-vocabulary.org/BreadcrumbList', class: "navbar-nav #{options[:container_class]}", id: menu.to_s)
+      return 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 = {})
@@ -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

@@ -19,8 +19,8 @@ module Symphonia
     end
 
     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: {
@@ -30,31 +30,6 @@ module Symphonia
 
     include UserManagement
 
-    include ::Swagger::Blocks
-    swagger_component do
-      schema :User do
-        key :required, %w[id login email]
-        property :id do
-          key :type, "integer"
-          key :format, "int64"
-        end
-        property :fist_name do
-          key :type, "string"
-        end
-        property :last_name do
-          key :type, "string"
-        end
-        property :email do
-          key :type, "string"
-          key :format, "email"
-        end
-        property :status do
-          key :type, "string"
-          key :enum, Symphonia::User.statuses.keys
-        end
-      end
-    end
-
     attr_writer :password_confirmation
 
     has_and_belongs_to_many :preferences, foreign_key: 'user_id'
@@ -75,9 +50,6 @@ module Symphonia
     before_save do |model|
       Rails.cache.delete_matched('user_allowed_to*') if model.role_id_changed?
     end
-    before_validation do |model|
-      model.login ||= model.email
-    end
 
     def allowed_to?(action)
       return true if admin?

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/_form.html.erb

@@ -1,4 +1,9 @@
 <div class="row justify-content-center">
+  <% if f.object.login != f.object.email %>
+    <div class="col-lg-8">
+      <%= f.text_field :login, required: true %>
+    </div>
+  <% end %>
   <div class="col-lg-8">
     <%= f.email_field :email, required: true %>
   </div>