ecm_user_area2 1.0.3 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf5f9a9ac06ef8e44670fa8baff5a2b91da83d73
-  data.tar.gz: a225a17f1e82295f09fb5eac9e230152043404a9
+  metadata.gz: 9635e24f9a824653acf3610b2f42cf217bdaa386
+  data.tar.gz: 76ae0d36bd4fa4910c2c7a5d5d36784665760009
 SHA512:
-  metadata.gz: fdf1595f854da352918613621ef38233bba501e8e2a82b47edfb809970dd46af5ebb9e58946b7f787d0d4268c95a48d79926fe3f2d6ca753e828a45df4184c74
-  data.tar.gz: b933337fb116a17ef0a43c0a9e319748245daa2cbc1fcc487dfc66f2c385fb8fe1494ffc395f65fb5b0fc2bb32bfa57f57d15ba9f9af8c78e6b37bb49453661c
+  metadata.gz: dbec2012fa3c19cfc12c4e22fb7c60d9108fb2a9a17d628a1b3272a982c00a33d8906ee0d8a42bc7c9fca84ff701a2c2e5317d0e5900d1d4c985db5739d23b10
+  data.tar.gz: b3e61cc87beac95f27fcee2325e3019f6eef8bba69448c78917a6c0b6578978a34dab051e79db42316adec0c6bccd4b389d12d8b06c26b101fb0c40a110c3c9c

data/app/controllers/ecm/user_area/password_reset_requests/base_controller.rb

@@ -0,0 +1,44 @@
+module Ecm::UserArea
+  class PasswordResetRequests::BaseController < Ecm::UserArea::Configuration.base_controller.constantize
+    include Controller::ResourceConcern
+    include Controller::ResourceInflectionsConcern
+    include Controller::ResourceUrlsConcern
+    include Controller::RestActionsConcern
+    include Controller::RedirectBackConcern
+    
+    if Rails.version < '5'
+      skip_before_action :authenticate_user!
+    else
+      skip_before_action :authenticate_user!, raise: false
+    end
+
+    def create
+      @resource = resource_class.new(permitted_params)
+      @resource.host = request.host
+      @resource.save
+      respond_with @resource, location: after_create_location
+    end
+
+    def edit
+      @resource = load_user_by_token
+      unless @resource
+        flash[:error] = t('.user_not_found')
+        redirect_to new_user_session_path
+        return
+      end
+      respond_with @resource
+    end
+
+
+    private
+
+    def load_user_by_token
+      User.find_using_perishable_token(params[:token])
+    end
+
+
+    def permitted_params
+      params.require(resource_class.name.demodulize.underscore.to_sym).permit(:email)
+    end
+  end
+end

data/app/controllers/ecm/user_area/password_resets/base_controller.rb

@@ -0,0 +1,44 @@
+module Ecm::UserArea
+  class PasswordResets::BaseController < Ecm::UserArea::Configuration.base_controller.constantize
+    include Controller::ResourceConcern
+    include Controller::ResourceInflectionsConcern
+    include Controller::ResourceUrlsConcern
+    include Controller::RestActionsConcern
+    include Controller::RedirectBackConcern
+    
+    if Rails.version < '5'
+      skip_before_action :authenticate_user!
+    else
+      skip_before_action :authenticate_user!, raise: false
+    end
+
+    before_action :find_using_perishable_token
+
+    private
+
+    def load_resource
+      @resource
+    end
+
+    def load_resource
+      User.find_using_perishable_token(params[:token])
+    end
+
+    def permitted_params
+      params.require(:user).permit(:password, :password_confirmation)
+    end
+
+    def after_update_location
+      new_user_session_path
+    end
+
+    def handle_user_not_found
+      redirect_to new_user_session_path, notice: t("messages.failures.ecm_user_area.perishable_token_invalid")
+    end
+    
+    def find_using_perishable_token
+      @resource =  User.find_using_perishable_token(params[:token])
+      handle_user_not_found if @resource.nil?
+    end
+  end
+end

data/app/controllers/ecm/user_area/sessions/base_controller.rb

@@ -6,7 +6,7 @@ module Ecm::UserArea
     include Controller::RestActionsConcern
     include Controller::RedirectBackConcern
 
-    skip_before_action :authenticate_user!, only: [:new, :create]
+    skip_before_action :authenticate_user!, only: [:new, :create], raise: false
 
     def new
       @session = initialize_resource
@@ -18,7 +18,11 @@ module Ecm::UserArea
 
       if @session.save
         flash[:notice] = I18n.t('messages.success.ecm_user_area.signed_in') unless request.xhr?
-        redirect_back_or(after_sign_in_url)
+        if Configuration.force_after_sign_in_url
+          redirect_to(after_sign_in_url)
+        else
+          redirect_back_or(after_sign_in_url)
+        end
         return
       else
         render action: :new
@@ -38,11 +42,15 @@ module Ecm::UserArea
     private
 
     def after_sign_in_url
-      "/#{I18n.locale}" unless defined?(super)
+      defined?(super) ? super : "/#{I18n.locale}"
     end
 
     def permitted_params
-      params.require(resource_class.name.demodulize.underscore.tr('/', '_')).permit(:email, :password)
+      if Rails.version < '5'
+        params.require(resource_class.name.demodulize.underscore.tr('/', '_')).permit(:email, :password)
+      else
+        params.require(resource_class.name.demodulize.underscore.tr('/', '_')).permit(:email, :password).to_hash
+      end
     end
   end
 end

data/app/controllers/ecm/user_area/user_password_reset_requests_controller.rb

@@ -0,0 +1,13 @@
+module Ecm::UserArea
+  class UserPasswordResetRequestsController < PasswordResetRequests::BaseController
+    def self.resource_class
+      UserPasswordResetRequest
+    end
+
+    private
+
+    def after_create_location
+      new_user_session_path
+    end
+  end
+end

data/app/controllers/ecm/user_area/user_password_resets_controller.rb

@@ -0,0 +1,7 @@
+module Ecm::UserArea
+  class UserPasswordResetsController < PasswordResets::BaseController
+    def self.resource_class
+      User
+    end
+  end
+end

data/app/mailers/ecm/user_area/user_mailer.rb

@@ -0,0 +1,12 @@
+module Ecm::UserArea
+  class UserMailer < Ecm::UserArea::Configuration.base_mailer.constantize
+    default from: Configuration.email_from_address.call
+
+    def password_reset_email(user, host, application_name = nil)
+      @host = host
+      @user = user
+      @application_name = application_name || Configuration.application_name
+      mail(to: @user.email)
+    end
+  end
+end

data/app/models/ecm/user_area/user.rb

@@ -2,26 +2,17 @@ require 'bcrypt'
 
 module Ecm::UserArea
   class User < ActiveRecord::Base
-    scope :autocomplete, ->(matcher) { where("LOWER(email) LIKE ?", "%#{matcher.downcase}%") }
-
-    def self.current_id=(id)
-      Thread.current[:user_id] = id
-    end
+    acts_as_authentic &Ecm::UserArea::Configuration.acts_as_authentic_options
 
-    def self.current_id
-      Thread.current[:user_id]
-    end
+    scope :autocomplete, ->(matcher) { where("LOWER(email) LIKE ?", "%#{matcher.downcase}%") }
 
-    acts_as_authentic do |config|
-      # config.session_class = Ecm::UserArea:UserSession
-      # c.crypto_provider = Authlogic::CryptoProviders::BCrypt
-      config.crypto_provider = Authlogic::CryptoProviders::BCrypt
-      config.login_field = :email
+    # def self.current_id=(id)
+    #   Thread.current[:user_id] = id
+    # end
 
-      # def self.find_by_downcase_email(email)
-      #   find_by_email(email.downcase)
-      # end
-    end
+    # def self.current_id
+    #   Thread.current[:user_id]
+    # end
 
     def as_json(options = {})
       options.reverse_merge!(style: :default)

data/app/models/ecm/user_area/user_password_reset_request.rb

@@ -0,0 +1,42 @@
+module Ecm
+  module UserArea
+    class UserPasswordResetRequest
+      include ActiveModel::Model
+      extend ActiveModel::Callbacks
+      include ActiveModel::Validations::Callbacks
+
+      attr_accessor :user, :email, :host
+
+      def self.call(attributes)
+        new(attributes).save
+      end
+
+      def self.i18n_scope
+        :activerecord
+      end
+
+      validates :email, :host, presence: true
+      validates :user, presence: true
+
+      before_validation :load_user
+      after_validation :delete_error_on_user, if: ->() { errors.get(:email).present? }
+
+      def save
+        return unless valid?
+        self.user.reset_perishable_token
+        self.user.save
+        Ecm::UserArea::UserMailer.password_reset_email(self.user, host).deliver_later
+      end
+
+      private
+
+      def load_user
+        self.user = Ecm::UserArea::User.where(email: self.email).first
+      end
+
+      def delete_error_on_user
+        errors.delete(:user)
+      end
+    end
+  end
+end

data/app/sessions/ecm/user_area/user_session.rb

@@ -8,5 +8,6 @@ module Ecm::UserArea
 
     params_key "#{self.name.demodulize.tableize.gsub('_sessions', '')}_api_key"
     single_access_allowed_request_types = :json
+    generalize_credentials_error_messages true
   end
 end

data/app/views/ecm/user_area/_navigation.html.haml

@@ -9,4 +9,5 @@
     %li= link_to t('.sign_out'), ecm_user_area.user_session_path, method: :delete
   - else
     %li= link_to t('.sign_in'), ecm_user_area.new_user_session_path
-    %li= link_to t('.new'), ecm_user_area.new_user_path
+    - if Ecm::UserArea::Configuration.enable_registrations    
+      %li= link_to t('.new'), ecm_user_area.new_user_path

data/app/views/ecm/user_area/_navigation_dropdown.html.haml

@@ -12,4 +12,5 @@
         %li= link_to t('.sign_out'), ecm_user_area.user_session_path, method: :delete
       - else
         %li= link_to t('.sign_in'), ecm_user_area.new_user_session_path
-        %li= link_to t('.new'), ecm_user_area.new_user_path
+        - if Ecm::UserArea::Configuration.enable_registrations
+          %li= link_to t('.new'), ecm_user_area.new_user_path

data/app/views/ecm/user_area/password_reset_requests/base/_form.html.haml

@@ -0,0 +1 @@
+= form.input :email

data/app/views/ecm/user_area/password_reset_requests/base/_form_errors.html.haml

@@ -0,0 +1,6 @@
+- if resource.errors.any?
+  .error-explanation.alert.alert-danger
+    .error-heading= t('errors.template.header', count: resource.errors.count, model: resource.model_name.human)
+    %ul
+      - resource.errors.full_messages.each do |msg|
+        %li= msg

data/app/views/ecm/user_area/password_reset_requests/base/new.haml

@@ -0,0 +1,15 @@
+%div.panel.panel-default
+  %div.panel-heading
+    %h1= t('.title', inflections)
+  %div.panel-body
+    = simple_form_for(@resource, url: user_password_reset_request_path) do |f|
+      = render partial: 'form_errors', locals: { resource: f.object }
+      = render 'form', form: f
+      = f.button :submit, class: 'btn btn-success'
+  %div.panel-footer
+
+.well.well-sm
+  .btn-container-right
+    = link_to new_user_session_path, class: 'btn btn-default btn-responsive' do
+      %span.glyphicon.glyphicon-arrow-left
+      %span.btn-text= t('.back')

data/app/views/ecm/user_area/password_resets/base/_form.html.haml

@@ -0,0 +1,2 @@
+= form.input :password
+= form.input :password_confirmation

data/app/views/ecm/user_area/password_resets/base/_form_errors.html.haml

@@ -0,0 +1,6 @@
+- if resource.errors.any?
+  .error-explanation.alert.alert-danger
+    .error-heading= t('errors.template.header', count: resource.errors.count, model: resource.model_name.human)
+    %ul
+      - resource.errors.full_messages.each do |msg|
+        %li= msg

data/app/views/ecm/user_area/password_resets/base/edit.haml

@@ -0,0 +1,15 @@
+%div.panel.panel-default
+  %div.panel-heading
+    %h1= t('.title', resource: @resource.email)
+  %div.panel-body
+    = simple_form_for(@resource, url: update_user_password_reset_path(@resource.to_param, @resource.perishable_token)) do |f|
+      = render partial: 'form_errors', locals: { resource: f.object }
+      = render 'form', form: f
+      = f.button :submit, class: 'btn btn-success'
+  %div.panel-footer
+
+.well.well-sm
+  .btn-container-right
+    = link_to new_user_session_path, class: 'btn btn-default btn-responsive' do
+      %span.glyphicon.glyphicon-arrow-left
+      %span.btn-text= t('.back')

data/app/views/ecm/user_area/sessions/base/_form_errors.html.haml

@@ -1,6 +1,6 @@
 - if resource.errors.any?
   .error-explanation.alert.alert-danger
-    .error-heading= t('errors.template.header', count: resource.errors.count, model: resource.model_name.human)
+    .error-heading= t('.errors.template.header', count: resource.errors.count, model: resource.model_name.human)
     %ul
       - resource.errors.full_messages.each do |msg|
         %li= msg

data/app/views/ecm/user_area/sessions/base/new.html.haml

@@ -6,6 +6,8 @@
       = render partial: 'form_errors', locals: { resource: f.object }
       = render 'form', form: f
       = f.button :submit, class: 'btn btn-success'
+      = link_to new_user_password_reset_request_path do
+        = t(".password.new", resource_name: Ecm::UserArea::UserPasswordResetRequest.model_name.human)
   %div.panel-footer
 
 .well.well-sm

data/app/views/ecm/user_area/user_mailer/password_reset_email.de.html.erb

@@ -0,0 +1,11 @@
+<h1><%= @user.email %></h1>
+ 
+<p>Jemand hat Instruktionen zum zurücksetzen des Passworts ihres <%= @application_name %> Accounts angefordert.</p>
+
+<div class="text-center">
+  <%= link_to('Passwort zurücksetzen', ecm_user_area.edit_user_password_reset_url(host: @host, token: @user.perishable_token), class: 'btn btn-primary') %>
+</div>
+
+<p>Link: <%= link_to ecm_user_area.edit_user_password_reset_url(host: @host, token: @user.perishable_token), ecm_user_area.edit_user_password_reset_url(host: @host, token: @user.perishable_token) %></p>
+
+<p>Sollten Sie das Zurücksetzen des Passworts nicht angefordert haben, dann können Sie diese E-Mail ignorieren oder uns informieren. Ihr Passwort ändert sich nicht, so lange Sie kein neues eingegeben haben.</p>

data/app/views/ecm/user_area/user_mailer/password_reset_email.de.text.erb

@@ -0,0 +1,9 @@
+<%= @user.email %>
+<%= "=" * @user.email.length %>
+ 
+Jemand hat Instruktionen zum zurücksetzen des Passworts ihres <%= @application_name %> Accounts angefordert.
+
+Klicken Sie auf folgenden Link, um ihr Passwort zurückzusetzen: <%= ecm_user_area.edit_user_password_reset_url(host: @host, token: @user.perishable_token) %>
+
+
+Sollten Sie das Zurücksetzen des Passworts nicht angefordert haben, dann können Sie diese E-Mail ignorieren oder uns informieren. Ihr Passwort ändert sich nicht, so lange Sie kein neues eingegeben haben.

data/app/views/ecm/user_area/user_mailer/password_reset_email.en.html.erb

@@ -0,0 +1,12 @@
+<h1><%= @user.email %></h1>
+ 
+<p>Someone requested that the password of your <%= @application_name %> account be reset.</p>
+
+<div class="text-center">
+  <%= link_to('Reset my password', ecm_user_area.edit_user_password_reset_url(host: @host, token: @user.perishable_token), class: 'btn btn-primary') %>
+</div>
+
+<p>Copyable link: <%= link_to ecm_user_area.edit_user_password_reset_url(host: @host, token: @user.perishable_token), ecm_user_area.edit_user_password_reset_url(host: @host, token: @user.perishable_token) %></p>
+
+
+<p>If you didn't request this, you can ignore this email or let us know. Your password won't change until you create a new password.</p>

data/app/views/ecm/user_area/user_mailer/password_reset_email.en.text.erb

@@ -0,0 +1,9 @@
+<%= @user.email %>
+<%= "=" * @user.email.length %>
+ 
+Someone requested that the password of your <%= @application_name %> account be reset.
+
+Click the following link to reset your password: <%= ecm_user_area.edit_user_password_reset_url(host: @host, token: @user.perishable_token) %>
+
+
+If you didn't request this, you can ignore this email or let us know. Your password won't change until you create a new password.

data/app/views/ecm/user_area/users/base/_show.html.haml

@@ -1,2 +1,15 @@
-- resource_class.attribute_names.delete_if { |name| [:id].include?(name.to_sym) }.each do |name|
-  = table.row name
+= table.row :fullname
+= table.row :email
+= table.row :single_access_token
+= table.row :login_count
+= table.row :failed_login_count
+= table.row :last_request_at
+= table.row :current_login_at
+= table.row :last_login_at
+= table.row :current_login_ip
+= table.row :last_login_ip
+= table.row :active
+= table.row :approved
+= table.row :approved
+= table.row :created_at
+= table.row :updated_at

data/app/views/ecm/user_area/users/base/show.html.haml

@@ -6,9 +6,10 @@
       %h1= @resource.human
     .col-xs-4
       #page-actions.btn-container-right
-        = link_to(resource_path(@resource), method: :delete, class: 'btn btn-danger btn-responsive', 'data-confirm': I18n.t('confirmations.delete')) do
-          %span.glyphicon.glyphicon-fire
-          %span.btn-text= t('.destroy')
+        - if Ecm::UserArea::Configuration.allow_users_to_destroy_self
+          = link_to(resource_path(@resource), method: :delete, class: 'btn btn-danger btn-responsive', 'data-confirm': I18n.t('confirmations.delete')) do
+            %span.glyphicon.glyphicon-fire
+            %span.btn-text= t('.destroy')
 
 .panel.panel-default.panel-with-actions
   %table.table.table-striped.table-condensed.table-hover
@@ -20,7 +21,7 @@
 = render 'show_extras', resource: @resource
 
 .well.well-sm
-  = link_to(ecm_user_area.edit_users_path, class: 'btn btn-primary btn-responsive') do
+  = link_to(ecm_user_area.edit_user_path(@resource), class: 'btn btn-primary btn-responsive') do
     %span.glyphicon.glyphicon-pencil
     %span.btn-text= t('.edit')
   = link_to main_app.root_path, class: 'btn btn-default btn-responsive pull-right' do

data/config/locales/authlogic.de.yml

@@ -17,7 +17,7 @@ de:
     models:
       user_session: User Session
     attributes:
-      user_session:
+      ecm/user_area/user_session:
         login: Benutzername
         email: E-Mail
         password: Passwort

data/config/locales/de.yml

@@ -1,14 +1,29 @@
 de:
   activerecord:
     attributes:
+      ecm/user_area/user_password_reset_request:
+        email: E-Mail
+        user: Benutzer
       ecm/user_area/user:
         active: Aktiv
         approved: Genehmigt
         confirmed: Bestätigt
+        email: E-Mail
+        password: Passwort
+        password_confirmation: Passwort wiederholen
     models:
+      ecm/user_area/user_password_reset_request:
+        one: Passwort
+        other: Passwörter
       ecm/user_area/user:
         one: Benutzer
         other: Benutzer
+    errors:
+      models:
+        ecm/user_area/user_password_reset_request:
+          attributes:
+            user:
+              blank: 'nicht bekannt'
   classes:
     ecm/user_area/create_default_user_service: 'Dienst zum Erstellen eines Standard-Benutzers'
   ecm:
@@ -21,11 +36,27 @@ de:
         sign_out: Ausloggen
       navigation_dropdown: 
         <<: *navigation
+      password_reset_requests:
+        base:
+          new:
+            back: Zurück
+            title: 'Passwort zurücksetzen'
+      password_resets:
+        base:
+          edit:
+            back: Zurück
+            title: 'Neues Passwort für %{resource} setzen'
       sessions:
         base:
+          form_errors:
+            errors:
+              template:
+                header: 'Login fehlgeschlagen'
           new:
             back: Zurück
             title: Einloggen
+            password:
+              new: 'Passwort vergessen'
       users:
         base:
           edit:
@@ -35,8 +66,23 @@ de:
           new:
             back: Zurück
             title: Registrieren
+          show:
+            back: Zurück
+            destroy: 'Löschen'
+            edit: 'Bearbeiten'
+  flash:
+    ecm:
+      user_area:
+        user_password_resets:
+          update:
+            notice: 'Passwort aktualisiert'
+        user_password_reset_requests:
+          create:
+            notice: 'Anweisungen zum zurücksetzen des Passworts versandt'
   helpers:
     submit:
+      user_password_reset_request:
+        create: 'Weiter'
       user_session:
         create: 'Einloggen'
       user:
@@ -53,5 +99,8 @@ de:
     failures:
       ecm_user_area:
         authentication_failed: 'Sie müssen sich anmelden oder registrieren, bevor Sie fortfahren können.'
+        perishable_token_invalid: 'Es konnte kein Benutzer mit dem eingegebenen Token gefunden werden oder ihr Token ist zu alt.'
   routes:
+    mount:
+      ecm_user_area: '/auth'
     users: benutzer

data/config/locales/en.yml

@@ -1,4 +1,17 @@
 en:
+  activerecord:
+    attributes:
+      ecm/user_area/user:
+        active: Active
+        approved: Approved
+        confirmed: Confirmed
+        email: E-Mail
+        password: Password
+        password_confirmation: Confirm password
+    models:
+      ecm/user_area/user:
+        one: User
+        other: Users
   classes:
     ecm/user_area/create_default_user_service: 'Create Default User Service'
   ecm:
@@ -11,11 +24,18 @@ en:
         sign_out: Sign out
       navigation_dropdown: 
         <<: *navigation
+      password_reset_requests:
+        base:
+          new:
+            back: Back
+            title: 'Reset password'
       sessions:
         base:
           new:
             back: Back
             title: Sign in
+            password:
+              new: Forgot password
       users:
         base:
           edit:
@@ -25,6 +45,10 @@ en:
           new:
             back: Back
             title: Register
+          show:
+            back: Back
+            destroy: 'Destroy'
+            edit: 'Edit'
   helpers:
     submit:
       user_session:
@@ -32,6 +56,9 @@ en:
       user:
         create: 'Create Account'
         update: 'Update Account'
+  locales:
+    de: Deutsch
+    en: English
   messages:
     confirmations:
       ecm_user_area:
@@ -44,4 +71,6 @@ en:
       ecm_user_area:
         authentication_failed: 'You need to sign in or sign up before continuing.'
   routes:
+    mount:
+      ecm_user_area: '/auth'
     users: users

data/config/routes.rb

@@ -1,5 +1,13 @@
 Ecm::UserArea::Engine.routes.draw do
-  resource :user, except: [:index, :destroy, :show]
+  resource :user, only: [:show, :edit, :update]
+  resource :user, only: [:new, :create] if Ecm::UserArea::Configuration.enable_registrations
+  resource :user, only: [:destroy] if Ecm::UserArea::Configuration.allow_users_to_destroy_self
+  resource :user_password_reset_request, only: [:new, :create]
+
+  resource :user_password_reset, only: [] do
+    get 'edit/:token' => 'user_password_resets#edit', constraint: { token: /\d+/ }, as: :edit
+    match '/:id/:token' => 'user_password_resets#update', constraint: { token: /\d+/ }, as: :update, via: [:put, :patch]
+  end
 
   resource :user_session, only: [:new, :create, :destroy]
 end

data/lib/ecm/user_area/configuration.rb

@@ -9,8 +9,23 @@ module Ecm
         yield self
       end
 
-      mattr_accessor(:disable_registrations) { false }
+      mattr_accessor(:enable_registrations) { false }
+      mattr_accessor(:allow_users_to_destroy_self) { true }
       mattr_accessor(:base_controller) { 'FrontendController' }
+      mattr_accessor(:base_mailer) { 'ApplicationMailer' }
+      mattr_accessor(:force_after_sign_in_url) { false }
+      mattr_accessor(:acts_as_authentic_options) do
+        ->(config) do
+          config.crypto_provider = Authlogic::CryptoProviders::BCrypt
+          config.login_field     = :email
+        end
+      end
+      mattr_accessor(:application_name) { Rails.application.class.name.deconstantize }
+      mattr_accessor(:email_from_address) do
+        lambda do
+          ENV['ECM_USER_AREA_FROM_ADDRESS'] || 'info@example.com'
+        end
+      end
     end
   end
 end