egov_utils 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d483ae93a2a968f5ff4fb74cecac3790bc9942a7e5488dba7500672e8ae570e
-  data.tar.gz: 4324879d422fd21c52dab7193957b4ca25a5e1998f01121df79b527b4c1e052f
+  metadata.gz: 645db7eb940442f396800108992bba65e51e538f37f813ace77d2c6e2834fa62
+  data.tar.gz: e5e345da32a0ca06f627ee8be1fe623eb8f4c67491946a1e58067f6e75195c34
 SHA512:
-  metadata.gz: 4efad04faa1075277da1fa431f0161d5552e696e86d62934a675b18e8fd78f0b2969e9354ac66150acd2a6a4f8a73cd6283c425e34d8d4b4ca938195c7f818f4
-  data.tar.gz: 7f3d2077e44771b85f3e853cc34fe8b016d30d268c4bcd022e8f5e46aa49f8d4bce662eedb9f2da00f79611ed997f46366fa4ae0b09c61b5aa0eaf568cc546d6
+  metadata.gz: 6cde297896021821c290807c06ca689e145e1da3d96d1af1c4d654e1263bb2ff94f874eda73a2c079ded8d0f1050eb8c36ca9d79966aee0c1f1ceb564ec20caa
+  data.tar.gz: 34ea0683107c72945a89726ea377145d75c1f966d41ec1b8600e2204b08fe9693a9d014f461db5483f7c90f720148e89459c98818e33f179b9d383bf049ea8c1

data/app/assets/javascripts/egov_utils/eGovUtilities.coffee.erb

@@ -25,8 +25,15 @@ window.eGovUtilities =
 
   initDatepickers: ($container)->
     $container ||= $(document)
-    pickers = $('[data-provide="datepicker"]', $container)
-    pickers.datetimepicker()
+    if !Modernizr.inputtypes.date
+      pickers = $('[type="date"][data-provide="datepicker"]', $container)
+      pickers.parent().datetimepicker()
+    if !Modernizr.inputtypes.datetime
+      pickers = $('[type="datetime"][data-provide="datepicker"]', $container)
+      pickers.parent().datetimepicker()
+    if !Modernizr.inputtypes['datetime-local']
+      pickers = $('[type="datetime-local"][data-provide="datepicker"]', $container)
+      pickers.parent().datetimepicker()
 
   initSelect2: ($container)->
     $container ||= $(document)

data/app/controllers/egov_utils/sessions_controller.rb

@@ -2,6 +2,7 @@ module EgovUtils
   class SessionsController < ApplicationController
 
     skip_before_action :verify_authenticity_token, only: [:create]
+    skip_before_action :require_login, only: [:new, :create]
 
     def new
       if current_user.logged?
@@ -51,7 +52,7 @@ module EgovUtils
         if params[:autologin]
           set_autologin_cookie(user)
         end
-        redirect_to main_app.root_path
+        redirect_to '/'
         # redirect_back(fallback_location: root_path)
       end
 

data/app/controllers/egov_utils/users_controller.rb

@@ -4,6 +4,8 @@ require_dependency "egov_utils/auth_source"
 module EgovUtils
   class UsersController < ApplicationController
 
+    skip_before_action :require_login, only: [:new, :create, :confirm]
+
     load_and_authorize_resource only: :index
 
     def index
@@ -16,9 +18,11 @@ module EgovUtils
 
     def create
       @user = User.new(create_params)
+      @user.mail ||= @user.login
       respond_to do |format|
         if @user.save
-          format.html{ redirect_to main_app.root_path, notice: t('activerecord.successful.messages.created', model: Group.model_name.human) }
+          UserMailer.confirmation_email(@user).deliver_later unless current_user.logged?
+          format.html{ redirect_to main_app.root_path, notice: t('activerecord.successful.messages.created', model: User.model_name.human) }
           format.json{ render json: @user, status: :created }
         else
           format.html{ render 'new' }
@@ -38,6 +42,14 @@ module EgovUtils
       redirect_back(fallback_location: @user)
     end
 
+    def confirm
+      @user = User.find_by(confirmation_code: params[:id])
+      render_404 and return unless @user || @user.active? || @user.updated_at < (Time.now - 24.hours)
+      @user.update(active: true)
+      logged_user = @user
+      redirect_to('/')
+    end
+
     def search
       authorize!(:read, User)
       authorize!(:read, Group)

data/app/helpers/egov_utils/application_helper.rb

@@ -9,5 +9,17 @@ module EgovUtils
       javascript_tag s
     end
 
+    def main_schema_attribute(schema)
+      schema.available_attributes_hash[schema.main_attribute_name]
+    end
+
+    def role_based_render(name, *attributes)
+      res = ''.html_safe
+      current_user.all_role_names.each do |role_name|
+        res << render(name+'_'+role_name, *attributes) if lookup_context.exists?(name+'_'+role_name, [], true)
+      end
+      res
+    end
+
   end
 end

data/app/helpers/egov_utils/grid_helper.rb

@@ -37,5 +37,8 @@ module EgovUtils
       end
       s << "}"
     end
+
+    def additional_grid_edit_buttons(schema)
+    end
   end
 end

data/app/mailers/egov_utils/application_mailer.rb

@@ -1,6 +1,6 @@
 module EgovUtils
   class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
+    default from: 'noreply@justice.cz'
     layout 'mailer'
   end
 end

data/app/mailers/egov_utils/user_mailer.rb

@@ -0,0 +1,10 @@
+module EgovUtils
+  class UserMailer < ApplicationMailer
+
+    def confirmation_email(user)
+      @user = user
+      mail(to: user.mail, subject: t(:app_name))
+    end
+
+  end
+end

data/app/models/ability.rb

@@ -1,9 +1,11 @@
-begin
-  require_dependency "#{Rails.application.class.parent_name.underscore}/roles"
-rescue LoadError => e
-  Rails.logger.warn "!! You have not defined roles."
-  Rails.logger.warn "!! Please define it in lib/#{Rails.application.class.parent_name.underscore}/roles."
-  Rails.logger.warn "!! EgovUtils roles management will not work without it."
+ActiveSupport::Reloader.to_prepare do
+  begin
+    require_dependency "#{Rails.application.class.parent_name.underscore}/roles"
+  rescue LoadError => e
+    Rails.logger.warn "!! You have not defined roles."
+    Rails.logger.warn "!! Please define it in lib/#{Rails.application.class.parent_name.underscore}/roles."
+    Rails.logger.warn "!! EgovUtils roles management will not work without it."
+  end
 end
 
 class Ability

data/app/models/egov_utils/user.rb

@@ -3,15 +3,23 @@ require 'request_store_rails'
 
 module EgovUtils
   class User < Principal
-    has_secure_password validations: false
 
     serialize :roles, Array
 
-    validates :login, uniqueness: true
+    has_secure_password validations: false
+
+    validates_confirmation_of :password, if: lambda { |m| m.password.present? }
+    validates_presence_of     :password, on: :create, unless: :provider?
+    validates                 :login, uniqueness: true
+
+    before_validation :generate_confirmation_code, unless: :provider?
 
     scope :active, -> { where(active: true) }
     scope :inactive, -> { where(active: false) }
 
+    cattr_accessor :default_role
+    self.default_role = nil
+
     def self.authenticate(login, password, active_only=true)
       login = login.to_s
       password = password.to_s
@@ -90,6 +98,8 @@ module EgovUtils
       @all_role_names ||= Rails.cache.fetch("#{cache_key}/all_role_names", expires_in: 1.hours) do
                             groups.collect{|g| g.roles}.reduce([], :concat) + roles
                           end
+      @all_role_names << self.class.default_role if self.class.default_role && !@all_role_names.any?
+      @all_role_names
     end
 
     def all_roles
@@ -117,5 +127,11 @@ module EgovUtils
       end
     end
 
+    private
+
+      def generate_confirmation_code
+        self.confirmation_code ||= SecureRandom.hex
+      end
+
   end
 end

data/app/views/azahara_schema/outputs/_grid.html.haml

@@ -0,0 +1,5 @@
+- grid_id ||= grid.schema.model.model_name.plural.to_s+'_grid'
+%div{id: grid_id}
+
+:javascript
+  #{raw render 'common/grid', grid_id: grid_id, schema: grid.schema}

data/app/views/common/_grid.html.coffee

@@ -97,8 +97,9 @@ $ ->
         title: " "
         buttons: [
           <% if can?(:update, schema.model) %>
-          {cls: 'btn btn-sm btn-primary', caption: '<%= t('label_edit') %>', click: editRecord}
+          {cls: 'btn btn-sm btn-primary', caption: '<%= t('label_edit') %>', click: editRecord},
           <% end %>
+         <%= additional_grid_edit_buttons(schema) %>
           # <% if can?(:destroy, schema.model) %>
           # {commandName: 'delete', caption: '<%= t('label_delete') %>'}
           # <% end %>

data/app/views/egov_utils/sessions/new.html.haml

@@ -2,4 +2,4 @@
   = f.text_field(:username)
   = f.password_field(:password)
   = f.submit t(:label_login)
--# link_to t('label_register'), new_user_path
+= link_to t('label_signup'), new_user_path, class: 'btn btn-secondary'

data/app/views/egov_utils/user_mailer/confirmation_email.html.erb

@@ -0,0 +1,7 @@
+Dobrý den,<br />
+<br />
+vítejte v aplikaci <%= t(:app_name) %>, pro aktivaci vašeho účtu klikněte prosím <%= link_to 'sem', confirm_user_url(@user.confirmation_code) %>.<br />
+<br />
+S pozdravem<br />
+Ministerstvo spravedlnosti<br />
+Odbor Informatiky

data/app/views/egov_utils/user_mailer/confirmation_email.text.erb

@@ -0,0 +1 @@
+Klikněte prosím na následující url: <%= confirm_user_url(@user.confirmation_code) %>

data/app/views/egov_utils/users/_form.html.haml

@@ -1,5 +1,5 @@
 = form.text_field :login
-= form.text_field :mail
+/= form.text_field :mail
 = form.password_field :password
 = form.password_field :password_confirmation
 = form.text_field :firstname

data/app/views/layouts/egov_utils/_messages.html.haml

@@ -1,7 +1,6 @@
--# Rails flash messages styled for Zurb Foundation
 - flash.each do |name, msg|
   - if msg.is_a?(String)
-    %div{:class => "alert alert-#{name.to_s == 'notice' ? "info" : "alert"} alert-dismissible fade show", "role" => "alert"}
+    %div{:class => "alert alert-#{name.to_s == 'notice' ? "info" : (name.to_s == 'error' ? "alert" : name.to_s)} alert-dismissible fade show", "role" => "alert"}
       %button.close{'type' => 'button', 'data-dismiss' => 'alert'}
         %span{'aria-hidden' => 'true'}= raw '×'
       = msg

data/app/views/layouts/egov_utils/mailer.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/app/views/layouts/egov_utils/mailer.text.erb

@@ -0,0 +1 @@
+<%= yield %>

data/config/locales/cs.yml

@@ -1,11 +1,15 @@
 ---
 cs:
+  time:
+    formats:
+      default: "%a %d. %B %Y %H:%M"
+
   ministery_justice_name: Ministerstvo spravedlnosti ČR
   label_no_records: Žádné záznamy k zobrazení
 
   notice_account_invalid_credentials: Přihlašovací údaje jsou nesprávné
   notice_onthefly_failure: Nemáte oprávnění k přístupu do aplikace
-  notice_account_pending: Váš přístup čeká na schválení správce aplikace
+  notice_account_pending: Váš účet čeká na schválení/ověření
   notice_account_locked: Váš účet byl uzamčen správcem aplikace
   notice_logout: Byl/a jste úspěšně odhlášen/a
 
@@ -15,14 +19,14 @@ cs:
   label_profile: Profil
   label_login: Přihlásit
   label_logout: Odhlásit
+  label_signup: Registrovat
   label_validate_address: Zvalidovat
 
   text_born_on_at: "Narozen %{date} v %{place}"
 
   common_labels:
     new_record: "Nový %{model}"
-    notice_saved: "%{model} vytvořen"
-
+    notice_saved: "%{model} uložen"
 
 
   models: &my_models
@@ -37,6 +41,11 @@ cs:
       other: Adresy
 
   model_attributes: &my_attributes
+    egov_utils/user:
+      login: Přihlašovací email
+      password_confirmation: Potvrzení hesla
+      firstname: Jméno
+      lastname: Příjmení
     egov_utils/address:
       full_address: Adresa
       street: Ulice

data/config/routes.rb

@@ -3,11 +3,13 @@ EgovUtils::Engine.routes.draw do
   get '/login', to: 'sessions#new', as: 'signin'
   post '/login', to: 'sessions#create'
   delete '/logout', to: 'sessions#destroy', as: 'signout'
+  get '/signup', to: 'users#new', as: 'signup'
 
   resources :sessions
   resources :users do
     get :search, on: :collection
     post :approve, on: :member
+    get :confirm, on: :member
   end
 
   resources :people

data/db/migrate/20171115142450_add_confirmation_code_to_users.rb

@@ -0,0 +1,5 @@
+class AddConfirmationCodeToUsers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :egov_utils_users, :confirmation_code, :string
+  end
+end

data/lib/bootstrap_form/datetimepicker.rb

@@ -3,6 +3,7 @@ module BootstrapForm
     def date_field(name, *args)
       options = args.extract_options!.symbolize_keys!
       options[:data] = {provide: 'datepicker', 'date-format' => 'L'}.merge(options[:data] || {})
+      options[:append] = calendar_addon
       args << options
       super
     end
@@ -10,8 +11,23 @@ module BootstrapForm
     def datetime_field(name, *args)
       options = args.extract_options!.symbolize_keys!
       options[:data] = {provide: 'datepicker'}.merge(options[:data] || {})
+      options[:append] = calendar_addon
       args << options
       super
     end
+
+    def datetime_local_field(name, *args)
+      options = args.extract_options!.symbolize_keys!
+      options[:data] = {provide: 'datepicker'}.merge(options[:data] || {})
+      options[:append] = calendar_addon
+      args << options
+      super
+    end
+
+    private
+
+      def calendar_addon
+        content_tag('i', '', class: 'fa fa-calendar')
+      end
   end
 end

data/lib/egov_utils/engine.rb

@@ -3,6 +3,8 @@ require 'cancancan'
 require 'audited'
 require 'azahara_schema'
 
+require 'modernizr-rails'
+
 module EgovUtils
   class Engine < ::Rails::Engine
     isolate_namespace EgovUtils

data/lib/egov_utils/user_utils/application_controller_patch.rb

@@ -7,6 +7,7 @@ module EgovUtils
       included do
 
         before_action :user_setup, :set_locale
+        before_action :require_login
 
         rescue_from CanCan::AccessDenied do |exception|
             respond_to do |format|
@@ -31,7 +32,7 @@ module EgovUtils
       def user_setup
         # Find the current user
         User.current = find_current_user || find_kerberos_user || User.anonymous
-        logger.info("  Current user: " + (User.current.logged? ? "#{User.current.login} (id=#{User.current.id})" : "anonymous")) if logger
+        logger.info("  Current user: " + (User.current.logged? ? "#{User.current.login} (id=#{User.current.id})(roles=#{User.current.all_role_names.join(',')})" : "anonymous")) if logger
         User.current
       end
 
@@ -72,7 +73,7 @@ module EgovUtils
         # Sets the logged in user
         def logged_user=(user)
           reset_session
-          if user && user.is_a?(EgovUtils::User)
+          if user && user.is_a?(EgovUtils::User) && user.active?
             User.current = user
             start_user_session(user)
           else
@@ -84,6 +85,39 @@ module EgovUtils
           session[:user_id] = user.id
         end
 
+        def require_login
+          if require_login? && !current_user.logged?
+            # Extract only the basic url parameters on non-GET requests
+            if request.get?
+              url = request.original_url
+            else
+              url = url_for(:controller => params[:controller], :action => params[:action], :id => params[:id], :project_id => params[:project_id])
+            end
+            respond_to do |format|
+              format.html {
+                if request.xhr?
+                  head :unauthorized
+                else
+                  redirect_to egov_utils.login_path(:back_url => url)
+                end
+              }
+              format.any(:atom, :pdf, :csv) {
+                redirect_to egov_utils.login_path(:back_url => url)
+              }
+              format.xml  { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="'+t(:app_abbrev)+'"' }
+              format.js   { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="'+t(:app_abbrev)+'"' }
+              format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="'+t(:app_abbrev)+'"' }
+              format.any  { head :unauthorized }
+            end
+            return false
+          end
+          true
+        end
+
+        def require_login?
+          false
+        end
+
       private
         def set_locale
           I18n.default_locale = :cs

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.1.17'
+  VERSION = '0.1.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.17'
+- !ruby/object:Gem::Dependency
+  name: modernizr-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: azahara_schema
   requirement: !ruby/object:Gem::Requirement
@@ -303,6 +317,7 @@ files:
 - app/helpers/egov_utils/users_helper.rb
 - app/jobs/egov_utils/application_job.rb
 - app/mailers/egov_utils/application_mailer.rb
+- app/mailers/egov_utils/user_mailer.rb
 - app/models/ability.rb
 - app/models/egov_utils/address.rb
 - app/models/egov_utils/application_record.rb
@@ -319,12 +334,15 @@ files:
 - app/validators/email_validator.rb
 - app/validators/fileuid_validator.rb
 - app/validators/ico_validator.rb
+- app/views/azahara_schema/outputs/_grid.html.haml
 - app/views/common/_grid.html.coffee
 - app/views/common/_modal.html.haml
 - app/views/egov_utils/addresses/_form.html.haml
 - app/views/egov_utils/people/_form.html.haml
 - app/views/egov_utils/roles/index.html.haml
 - app/views/egov_utils/sessions/new.html.haml
+- app/views/egov_utils/user_mailer/confirmation_email.html.erb
+- app/views/egov_utils/user_mailer/confirmation_email.text.erb
 - app/views/egov_utils/users/_form.html.haml
 - app/views/egov_utils/users/index.html.haml
 - app/views/egov_utils/users/new.html.haml
@@ -332,6 +350,8 @@ files:
 - app/views/errors/error_403.html.haml
 - app/views/layouts/egov_utils/_messages.html.haml
 - app/views/layouts/egov_utils/application.html.erb
+- app/views/layouts/egov_utils/mailer.html.erb
+- app/views/layouts/egov_utils/mailer.text.erb
 - config/kraj.csv
 - config/locales/cs.yml
 - config/okres.csv
@@ -346,6 +366,7 @@ files:
 - db/migrate/20170824111701_create_egov_utils_groups.rb
 - db/migrate/20171103141234_add_birth_place_and_residence_to_people.rb
 - db/migrate/20171109172909_add_external_uid_to_groups.rb
+- db/migrate/20171115142450_add_confirmation_code_to_users.rb
 - lib/bootstrap_form/datetimepicker.rb
 - lib/bootstrap_form/fileuid.rb
 - lib/bootstrap_form/helpers/bootstrap4.rb