symphonia 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8399b31088e0c0ebd1514b698be2fd97940c32e8cebd2313f524b3fb3455559
-  data.tar.gz: f35d459eaa67c75f5c6e1fdee759f56eb37373f518f1ad1a212dc2d24386ba26
+  metadata.gz: 20a17b10267da2cdedcc2d9c61b342985891da3c01897e97bcd407a535c55e61
+  data.tar.gz: d0bab66a323651ac3d8616b3b99b1a7ba1905326922f06efb67cee29df201790
 SHA512:
-  metadata.gz: df35e4035a31df68cc8c230d0605ec6c897fa2b43f79cc5bf77a1b1e77de3b98c3674af336517d0b577c3794ef02e47eac8b011da72e3b4bb27f5020c53ad2cc
-  data.tar.gz: d6666bbf5cd821d6ee4e662ec7e5574bbcfd09ef63d9979c4fca32062cd5d35c36f60ceb908a281dbc567660f941550695d8433dfeaed12b8c527b5fc4eb308c
+  metadata.gz: 9b69046408165cd02eff6feb800c07b1a0e693016dbefbebd41b5e3e0cbc0624cbf5b1d719f2d08cf99c824cc3ef0de04b459a22c0983098d9720eaef03b40e3
+  data.tar.gz: e4c433771edd87a948bd9a0f961e7bd6872b8421cc6cd50aa6ecab3cd9e316e231a741c8bb0135133f2fa64258919a75972a2c01506a93de7f0ee5bac19ae4c3

data/app/controllers/symphonia/accounts_controller.rb

@@ -68,7 +68,7 @@ module Symphonia
     end
 
     def resend_activation
-      @user = find_account_by_mail(params.require(:mail))
+      @user = find_account_by_mail(params.require(:email))
       if @user
         if @user.active?
           redirect_to root_path, flash: { error: t(:text_user_alerady_active) }
@@ -115,7 +115,7 @@ module Symphonia
     end
 
     def lost_password
-      @user = find_account_by_mail(params[:mail]) if params[:mail]
+      @user = find_account_by_mail(params[:email]) if params[:email]
       if @user
         if @user.active?
           @user.reset_perishable_token!

data/app/helpers/symphonia/application_helper.rb

@@ -191,7 +191,7 @@ module Symphonia
     end
 
     def link_to_new_entity(options = {})
-      return '' unless User.current.allowed_to?(:"manage_#{controller_name}")
+      return '' if !options.has_key?(:skip_permission_check) && !User.current.allowed_to?(:"manage_#{controller_name}")
 
       anchor = options.has_key?(:anchor) ? options.delete(:anchor) : 'page_header'
       label = options.delete(:label) || t("label_#{controller_name.singularize}_new")

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

@@ -1,6 +1,6 @@
 <%= form_tag symphonia.lost_password_account_path do %>
 <div class="form-group required">
-  <%= label_tag(:mail, t(:'attributes.mail'), required: true, class: 'sr-only') %>
-  <%= email_field_tag(:mail, nil, autofocus: true, placeholder: t(:'attributes.mail'), required: true, size: 35, class: 'form-control') %>
+  <%= 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') %>
 </div>
 <% end %>

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

@@ -1,11 +1,14 @@
-<%= content_tag(:h2, t(:label_send_activation_again)) %>
-<%= form_tag({:action => 'resend_activation'}, :class => 'tabular') do %>
-  <p>
-    <%= label_tag(:mail, Symphonia::User.human_attribute_name(:mail), :required => true) %>
-    <%= email_field_tag(:mail, nil, :required => true, :size => 35) %>
-  </p>
+<%= title :label_send_activation_again %>
 
-  <p class="buttons">
-    <%= submit_tag(t(:button_submit)) %>
-  </p>
+<%= symphonia_form_tag({ action: 'resend_activation' }) do |f| %>
+  <div class="row">
+    <div class="col-md-6 col-xs-12 mx-auto">
+      <div class="card w-75 mx-auto">
+        <div class="card-body">
+          <%= f.email_field :email, required: true, size: 35 %>
+          <%= f.submit t(:button_submit), class: "btn btn-primary btn-block" %>
+        </div>
+      </div>
+    </div>
+  </div>
 <% end %>

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

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

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

@@ -10,7 +10,7 @@
 
 <%= f.form_group class: 'text-center' do %>
   <%= f.submit t(:button_login), class: 'btn btn-primary btn-block' %>
-  <% if f.object.is_a?(Symphonia::User) %>
+  <% 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 ') %>
     <% if Symphonia.config[:allow_registrations] %>
       <%= link_to(t(:button_register), register_path, class: 'btn btn-link btn-sm ') %>

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

@@ -1,7 +1,8 @@
+<h1><%= t(:meta_title) %></h1>
 <p>
   <%= t(:'mailer.text_html_activation_account') %>
 </p>
 <p>
-  <% activation_url = symphonia.new_activation_account_url(@user.perishable_token) %>
+  <% activation_url = symphonia.activation_url(@user.perishable_token) %>
   <%= link_to(activation_url, activation_url) %>
 </p>

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

@@ -1,3 +1,3 @@
 <%= t(:'mailer.text_html_activation_account') %>
 
-<%= symphonia.new_activation_account_url(@user.perishable_token) %>
+<%= symphonia.activation_url(@user.perishable_token) %>

data/config/locales/cs.yml

@@ -18,7 +18,7 @@ cs:
     models:
       user_session: Přihlášení
     attributes:
-      user_session:
+      symphonia/user_session:
         remember_me: Zapamatovat
   time:
     past: Minulost

data/config/routes.rb

@@ -9,8 +9,8 @@ Symphonia::Engine.routes.draw do
   get '/register', to: 'accounts#register', as: 'account_register'
   post '/register', to: 'accounts#create'
 
-  get '/activation/:activation_code', to: 'accounts#activation'
-  get '/reset_password/:id', to: 'accounts#reset_password', as: 'reset_password'
+  get '/activation/:activation_code', to: 'accounts#activation', as: 'activation'
+  match '/reset_password/:id', to: 'accounts#reset_password', as: 'reset_password', via: [:get, :put]
 
   scope 'admin' do
     get 'user/current', to: 'users#show', as: 'user_current'

data/lib/symphonia/version.rb

@@ -1,3 +1,3 @@
 module Symphonia
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end

data/spec/controllers/account_controller_spec.rb

@@ -27,7 +27,7 @@ module Symphonia
     context '#resend_activation' do
 
       let(:email) { Faker::Internet.email }
-      subject { get :resend_activation, params: { mail: email } }
+      subject { get :resend_activation, params: { email: email } }
 
       it 'non exist user' do
         is_expected.to redirect_to :root
@@ -44,7 +44,7 @@ module Symphonia
         user = FactoryBot.create(:user, email: email, status: 'pending')
         token = user.perishable_token.dup
 
-        expect { get :resend_activation, params: { mail: email } }.to have_enqueued_job.on_queue('mailers')
+        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
@@ -75,16 +75,25 @@ module Symphonia
       it 'with mail' do
         user = FactoryBot.create(:user, status: 'active')
 
-        expect { post :lost_password, params: { mail: user.email } }.to have_enqueued_job.on_queue('mailers')
+        expect { post :lost_password, params: { email: user.email } }.to have_enqueued_job.on_queue('mailers')
         expect(flash[:error]).to be_nil
       end
 
       it 'with inactive user' do
         user = FactoryBot.create(:user, status: 'pending')
-        expect { post :lost_password, params: { mail: user.email } }.not_to have_enqueued_job.on_queue('mailers')
+        expect { post :lost_password, params: { email: user.email } }.not_to have_enqueued_job.on_queue('mailers')
         expect(flash[:error]).not_to be :blank
       end
     end
 
+    context "#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 /user\/current/
+        expect { subject.reload }.to change(subject, :crypted_password)
+      end
+    end
+
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Lukas Pokorny