decidim-verifications 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a57e34b1317afd65451dc3a5727c29accd3d31ef4fe63972f72b48069ea65bb
-  data.tar.gz: f9bab0f27634fb8aa6bfe3b668f4f27f9f03af9132e078113b2552c5e67aec86
+  metadata.gz: 2031448fe03c504353397420e98549ea5f90c353591ac4b7846f3f119e3413df
+  data.tar.gz: 5d27d011a65c64c4cc2c8b5c2a6e5b75bbaaccca6a4af0f9998e76d7d23661a2
 SHA512:
-  metadata.gz: 4284cbc4947adb36c66ff2bf4e22720c15b77a1c1d88d42ca1fc68b9fe9e1159db6074e4ab820f4e0ac0b4685b9c1bdda8cd32297f4e0c185f0fde550795d16f
-  data.tar.gz: 35cbd8d30e70dc582e9951475acdc7a72223fa0e7834a0f403fd561ac62e67a4378e83bd7974cbd5c5d78f3e9a4b40ace8f7feeec141f68fd01a8d15c71bbc87
+  metadata.gz: ce6e22177bebe2537209cb415a70127fb53aff4a85822d271f5296c4893ff8fa7ae33da902b5b1abcf0a7c3de2ec48c2cb7d5532dca346ae88086b84c6e5fda0
+  data.tar.gz: 8dd934602ce6e073edc198e964207dec7ea3d6d052dea2a78f145ff6a13c0d5c25779e3b4b3abaa8e9c3adc440da99d57c05d4597a5465adf6688c8e288ec418

data/app/commands/decidim/verifications/confirm_user_authorization.rb

@@ -31,6 +31,8 @@ module Decidim
         else
           broadcast(:invalid)
         end
+      rescue StandardError => e
+        broadcast(:invalid, e.message)
       end
 
       protected

data/app/controllers/decidim/verifications/authorizations_controller.rb

@@ -36,7 +36,7 @@ module Decidim
         AuthorizeUser.call(handler) do
           on(:ok) do
             flash[:notice] = t("authorizations.create.success", scope: "decidim.verifications")
-            redirect_to params[:redirect_url] || authorizations_path
+            redirect_to redirect_url || authorizations_path
           end
 
           on(:invalid) do
@@ -88,9 +88,9 @@ module Decidim
       end
 
       def store_current_location
-        return if params[:redirect_url].blank? || !request.format.html?
+        return if redirect_url.blank? || !request.format.html?
 
-        store_location_for(:user, params[:redirect_url])
+        store_location_for(:user, redirect_url)
       end
     end
   end

data/app/controllers/decidim/verifications/csv_census/admin/census_controller.rb

@@ -5,26 +5,19 @@ module Decidim
     module CsvCensus
       module Admin
         class CensusController < Decidim::Admin::ApplicationController
-          include NeedsPermission
-
           layout "decidim/admin/users"
 
           before_action :show_instructions,
                         unless: :csv_census_active?
 
-          register_permissions(::Decidim::Verifications::CsvCensus::Admin::CensusController,
-                               ::Decidim::Verifications::CsvCensus::Admin::Permissions,
-                               ::Decidim::Admin::Permissions,
-                               ::Decidim::Permissions)
-
           def index
-            enforce_permission_to :index, CsvDatum
+            enforce_permission_to :index, :authorization
             @form = form(CensusDataForm).instance
             @status = Status.new(current_organization)
           end
 
           def create
-            enforce_permission_to :create, CsvDatum
+            enforce_permission_to :create, :authorization
             @form = form(CensusDataForm).from_params(params)
             CreateCensusData.call(@form, current_organization) do
               on(:ok) do
@@ -39,7 +32,7 @@ module Decidim
           end
 
           def destroy_all
-            enforce_permission_to :destroy, CsvDatum
+            enforce_permission_to :destroy, :authorization
             CsvDatum.clear(current_organization)
 
             redirect_to census_path, notice: t(".success")
@@ -48,20 +41,13 @@ module Decidim
           private
 
           def show_instructions
+            enforce_permission_to :index, :authorization
             render :instructions
           end
 
           def csv_census_active?
             current_organization.available_authorizations.include?("csv_census")
           end
-
-          def permission_class_chain
-            ::Decidim.permissions_registry.chain_for(::Decidim::Verifications::CsvCensus::Admin::CensusController)
-          end
-
-          def permission_scope
-            :admin
-          end
         end
       end
     end

data/app/controllers/decidim/verifications/id_documents/authorizations_controller.rb

@@ -13,11 +13,13 @@ module Decidim
 
         def choose
           return redirect_to action: :new, using: verification_type if available_methods.count == 1
+
           render :choose
         end
 
         def new
           raise ActionController::RoutingError, "Method not available" unless available_methods.include?(verification_type)
+
           enforce_permission_to :create, :authorization, authorization: @authorization
 
           @form = UploadForm.from_params(id_document_upload: { verification_type: verification_type })
@@ -92,6 +94,7 @@ module Decidim
 
         def authorization_verification_type
           return unless @authorization
+
           @authorization.verification_metadata["verification_type"]
         end
 

data/app/controllers/decidim/verifications/postal_letter/admin/postages_controller.rb

@@ -24,7 +24,7 @@ module Decidim
               end
 
               on(:invalid) do
-                render json: { error: I18n.t("postages.create.error", scope: "decidim.verifications.postal_letter.admin") }, status: 422
+                render json: { error: I18n.t("postages.create.error", scope: "decidim.verifications.postal_letter.admin") }, status: :unprocessable_entity
               end
             end
           end

data/app/controllers/decidim/verifications/sms/authorizations_controller.rb

@@ -21,7 +21,7 @@ module Decidim
             on(:ok) do
               flash[:notice] = t("authorizations.create.success", scope: "decidim.verifications.sms")
               authorization_method = Decidim::Verifications::Adapter.from_element(authorization.name)
-              redirect_to authorization_method.resume_authorization_path(redirect_url: params[:redirect_url])
+              redirect_to authorization_method.resume_authorization_path(redirect_url: redirect_url)
             end
             on(:invalid) do
               flash.now[:alert] = t("authorizations.create.error", scope: "decidim.verifications.sms")
@@ -45,8 +45,8 @@ module Decidim
             on(:ok) do
               flash[:notice] = t("authorizations.update.success", scope: "decidim.verifications.sms")
 
-              if params[:redirect_url]
-                redirect_to params[:redirect_url]
+              if redirect_url
+                redirect_to redirect_url
               else
                 redirect_to decidim_verifications.authorizations_path
               end

data/app/forms/decidim/verifications/sms/mobile_phone_form.rb

@@ -25,6 +25,7 @@ module Decidim
         # When there's a phone number, sanitize it allowing only numbers and +.
         def mobile_phone_number
           return unless super
+
           super.gsub(/[^\+0-9]/, "")
         end
 
@@ -43,6 +44,7 @@ module Decidim
           return @verification_code if defined?(@verification_code)
 
           return unless sms_gateway.new(mobile_phone_number, generated_code).deliver_code
+
           @verification_code = generated_code
         end
 

data/app/models/decidim/verifications/csv_census/data.rb

@@ -20,7 +20,7 @@ module Decidim
           @values = []
           @errors = []
 
-          CSV.foreach(@file, headers: true) do |row|
+          CSV.foreach(@file) do |row|
             process_row(row)
           end
         end
@@ -28,8 +28,8 @@ module Decidim
         private
 
         def process_row(row)
-          user_mail = row["email"]
-          if user_mail.present?
+          user_mail = row.first
+          if user_mail.present? && user_mail.match?(Devise.email_regexp)
             values << user_mail
           else
             errors << row

data/app/models/decidim/verifications/csv_datum.rb

@@ -6,6 +6,8 @@ module Decidim
       belongs_to :organization, foreign_key: :decidim_organization_id,
                                 class_name: "Decidim::Organization"
 
+      validates :email, format: { with: ::Devise.email_regexp }
+
       def self.inside(organization)
         where(organization: organization)
       end

data/app/views/decidim/verifications/authorizations/new.html.erb

@@ -10,9 +10,7 @@
       <div class="columns large-6 medium-centered">
         <div class="card">
           <div class="card__content">
-            <%= authorization_form_for(handler, url: authorizations_path(redirect_url: params[:redirect_url])) do |form| %>
-              <%= form.error_for(:base) %>
-
+            <%= authorization_form_for(handler, url: authorizations_path(redirect_url: redirect_url)) do |form| %>
               <% if lookup_context.exists?(handler.to_partial_path, [], true) %>
                 <%= render partial: handler.to_partial_path, locals: { handler: handler, form: form } %>
               <% else %>

data/app/views/decidim/verifications/csv_census/admin/census/index.html.erb

@@ -28,6 +28,12 @@
   </div>
   <div class="card-section">
     <p><%= t("decidim.verifications.csv_census.admin.new.info") %></p>
+    <pre class="code-block">
+    user@example.org
+    user2@example.org
+    ...
+    ...
+    </pre>
     <%= form_tag census_path, multipart: true, class: "form" do %>
       <%= label_tag :name, t("admin.new.file", scope: "decidim.verifications.csv_census") %>
       <%= file_field_tag :file %>

data/app/views/decidim/verifications/sms/authorizations/edit.html.erb

@@ -10,7 +10,7 @@
       <div class="columns large-6 medium-centered">
         <div class="card">
           <div class="card__content">
-            <%= decidim_form_for(@form, url: authorization_path(redirect_url: params[:redirect_url]), method: :put) do |form| %>
+            <%= decidim_form_for(@form, url: authorization_path(redirect_url: redirect_url), method: :put) do |form| %>
               <div class="field">
                 <%= form.text_field :verification_code %>
               </div>

data/app/views/decidim/verifications/sms/authorizations/new.html.erb

@@ -10,7 +10,7 @@
       <div class="columns large-6 medium-centered">
         <div class="card">
           <div class="card__content">
-            <%= decidim_form_for(@form, url: authorization_path(redirect_url: params[:redirect_url])) do |form| %>
+            <%= decidim_form_for(@form, url: authorization_path(redirect_url: redirect_url)) do |form| %>
               <div class="field">
                 <%= form.text_field :mobile_phone_number %>
               </div>

data/config/locales/ar.yml

@@ -104,7 +104,6 @@ ar:
             title: تحتاج إلى تنشيط التعداد CSV لهذه المنظمة
           new:
             file: ".csv ملف مع بيانات رسائل البريد الإلكتروني"
-            info: 'يجب أن يكون ملفًا بتنسيق CSV مع عمود واحد: البريد الإلكتروني'
             submit: رفع ملف
             title: تحميل إحصاء جديد
         authorizations:

data/config/locales/ca.yml

@@ -104,7 +104,7 @@ ca:
             title: Necessites activar el cens csv d'aquesta organització
           new:
             file: "fitxer .csv amb dades de correus electrònics"
-            info: 'Ha de ser un fitxer amb format CSV amb una columna: correu electrònic'
+            info: 'Ha de ser un document en format CSV amb una única columna indicant les adreces electròniques:'
             submit: Puja un document
             title: Puja un nou cens
         authorizations:

data/config/locales/cs.yml

@@ -104,7 +104,7 @@ cs:
             title: Pro tuto organizaci musíte aktivovat csv sčítání
           new:
             file: ".csv soubor s daty e-mailů"
-            info: 'Musí být soubor ve formátu CSV s jedním sloupcem: e-mail'
+            info: 'Must být souborem ve formátu CSV s pouze jedním sloupcem s e-mailovou adresou:'
             submit: Nahrát soubor
             title: Nahrajte nové sčítání
         authorizations:

data/config/locales/de.yml

@@ -104,7 +104,6 @@ de:
             title: Sie müssen die csv-Zählung für diese Organisation aktivieren
           new:
             file: "CSV-Datei mit E-Mail-Daten"
-            info: 'Muss eine Datei im CSV-Format mit einer Spalte sein: E-Mail'
             submit: Datei hochladen
             title: Laden Sie eine neue Volkszählung hoch
         authorizations:

data/config/locales/en.yml

@@ -105,7 +105,7 @@ en:
             title: You need to activate the csv census for this organization
           new:
             file: ".csv file with emails data"
-            info: 'Must be a file with CSV format with one column: email'
+            info: 'Must be a file in CSV format with only one column with the email address:'
             submit: Upload file
             title: Upload a new census
         authorizations:

data/config/locales/es-MX.yml

@@ -104,7 +104,7 @@ es-MX:
             title: Necesitas activar el censo csv para esta organización.
           new:
             file: "archivo .csv con datos de correos electrónicos"
-            info: 'Debe ser un archivo con formato CSV con una columna: correo electrónico'
+            info: 'Debe ser un archivo en formato CSV con sólo una columna con la dirección de correo electrónico:'
             submit: Subir archivo
             title: Subir un nuevo censo
         authorizations:

data/config/locales/es-PY.yml

@@ -104,7 +104,7 @@ es-PY:
             title: Necesitas activar el censo csv para esta organización.
           new:
             file: "archivo .csv con datos de correos electrónicos"
-            info: 'Debe ser un archivo con formato CSV con una columna: correo electrónico'
+            info: 'Debe ser un archivo en formato CSV con sólo una columna con la dirección de correo electrónico:'
             submit: Subir archivo
             title: Subir un nuevo censo
         authorizations:

data/config/locales/es.yml

@@ -104,7 +104,7 @@ es:
             title: Necesitas activar el censo csv para esta organización.
           new:
             file: "archivo .csv con datos de correos electrónicos"
-            info: 'Debe ser un archivo con formato CSV con una columna: correo electrónico'
+            info: 'Debe ser un archivo en formato CSV con sólo una columna con la dirección de correo electrónico:'
             submit: Subir archivo
             title: Subir un nuevo censo
         authorizations:

data/config/locales/eu.yml

@@ -104,7 +104,6 @@ eu:
             title: Erakunde honetarako Csv errolda aktibatu behar duzu
           new:
             file: ".csv fitxategia helbide elektronikoen datuekin"
-            info: 'Fitxategi bat CSV formatuarekin izan behar da zutabe batekin: posta elektronikoa'
             submit: Kargatu fitxategia
             title: Kargatu zentsu berri bat
         authorizations:

data/config/locales/fi-plain.yml

@@ -104,7 +104,7 @@ fi-pl:
             title: Sinun on aktivoitava CSV-rekisteritiedot tälle organisaatiolle
           new:
             file: "sähköpostiosoitteet sisältävä .csv-tiedosto"
-            info: 'On oltava CSV-muotoinen tiedosto, jossa on yksi sarake: sähköposti (sarakenimi "email")'
+            info: 'On oltava CSV-tiedosto, jossa on vain yksi sarake sähköpostiosoitteille:'
             submit: Lataa tiedosto
             title: Lataa uusi rekisteri
         authorizations:

data/config/locales/fi.yml

@@ -104,7 +104,7 @@ fi:
             title: Sinun on aktivoitava CSV-rekisteritiedot tälle organisaatiolle
           new:
             file: "sähköpostiosoitteet sisältävä .csv-tiedosto"
-            info: 'On oltava CSV-muotoinen tiedosto, jossa on yksi sarake: sähköposti (sarakenimi "email")'
+            info: 'On oltava CSV-tiedosto, jossa on vain yksi sarake sähköpostiosoitteille:'
             submit: Lataa tiedosto
             title: Lataa uusi rekisteri
         authorizations:

data/config/locales/fr.yml

@@ -104,7 +104,7 @@ fr:
             title: Vous devez activer le recensement CSV pour cette organisation
           new:
             file: "Fichier .csv avec données de courrier électronique"
-            info: 'Doit être un fichier au format CSV avec une colonne: email'
+            info: 'Doit être un fichier au format CSV avec une seule colonne avec l''adresse e-mail :'
             submit: Téléverser un fichier
             title: Télécharger un nouveau recensement
         authorizations:

data/config/locales/gl.yml

@@ -104,7 +104,6 @@ gl:
             title: Debe activar o censo de csv para esta organización
           new:
             file: "Ficheiro .csv con datos de correo electrónico"
-            info: 'Debe ser un ficheiro con formato CSV cunha columna: correo electrónico'
             submit: Cargar ficheiro
             title: Suba un novo censo
         authorizations:

data/config/locales/hu.yml

@@ -104,7 +104,7 @@ hu:
             title: Ennek a szervezetnek aktiválnia kell a csv népszámlálást
           new:
             file: ".csv fájl e-mail adatokkal"
-            info: 'CSV formátumú fájlnak kell lennie egy oszlopban: e-mail'
+            info: 'CSV formátumú fájl lehet csak egy oszloppal, amely az email címeket tartalmazza:'
             submit: Fájl feltöltés
             title: Töltsön fel egy új népszámlálást
         authorizations:

data/config/locales/id-ID.yml

@@ -104,7 +104,6 @@ id:
             title: Anda perlu mengaktifkan sensus csv untuk organisasi ini
           new:
             file: "File .csv dengan data email"
-            info: 'Harus berupa file dengan format CSV dengan satu kolom: email'
             submit: Unggah data
             title: Unggah sensus baru
         authorizations:

data/config/locales/it.yml

@@ -104,7 +104,6 @@ it:
             title: È necessario attivare il censimento CSV per questa organizzazione
           new:
             file: "file .csv con dati di posta elettronica"
-            info: 'Deve essere un file con formato CSV con una colonna: email'
             submit: Caricare un file
             title: Carica un nuovo censimento
         authorizations:

data/config/locales/nl.yml

@@ -54,7 +54,7 @@ nl:
         explanation: Wordt geverifieerd aan de hand van de volkstelling van de organisatie
         name: De volkstelling van de organisatie
       direct: direct
-      help: Helpen
+      help: Help
       id_documents:
         explanation: Upload uw identiteitsdocumenten zodat we uw identiteit kunnen controleren
         name: Identiteitsdocumenten
@@ -104,7 +104,7 @@ nl:
             title: U moet de csv-telling voor deze organisatie activeren
           new:
             file: ".csv-bestand met e-mailgegevens"
-            info: 'Moet een bestand zijn met CSV-indeling met één kolom: e-mail'
+            info: 'Moet een bestand zijn in CSV formaat met slechts één kolom met het e-mailadres:'
             submit: Upload bestand
             title: Upload een nieuwe telling
         authorizations:

data/config/locales/pl.yml

@@ -104,7 +104,6 @@ pl:
             title: Musisz aktywować spis csv dla tej organizacji
           new:
             file: "Plik .csv z danymi e-maili"
-            info: 'Musi to być plik w formacie CSV z jedną kolumną: e-mail'
             submit: Przesyłanie pliku
             title: Prześlij nowy spis ludności
         authorizations:

data/config/locales/pt-BR.yml

@@ -104,7 +104,6 @@ pt-BR:
             title: Você precisa ativar o censo csv para esta organização
           new:
             file: "arquivo .csv com dados de e-mails"
-            info: 'Deve ser um arquivo com formato CSV com uma coluna: email'
             submit: Subir arquivo
             title: Carregar um novo censo
         authorizations:

data/config/locales/pt.yml

@@ -104,7 +104,6 @@ pt:
             title: Você precisa ativar o censo csv para esta organização
           new:
             file: "arquivo .csv com dados de e-mails"
-            info: 'Deve ser um arquivo com formato CSV com uma coluna: email'
             submit: Subir arquivo
             title: Carregar um novo censo
         authorizations:

data/config/locales/sv.yml

@@ -104,7 +104,6 @@ sv:
             title: Du måste aktivera medlemsuppgifter via CSV för organisationen
           new:
             file: ".csv-fil med e-postadresser"
-            info: 'Måste vara en fil i CSV-format med en kolumn: e-postadress'
             submit: Skicka in fil
             title: Skicka in nya medlemsuppgifter
         authorizations:

data/config/locales/tr-TR.yml

@@ -104,7 +104,6 @@ tr:
             title: Bu kuruluş için csv sayımını etkinleştirmeniz gerekir
           new:
             file: "e-posta verileri içeren .csv dosyası"
-            info: 'Tek sütunlu CSV biçiminde bir dosya olmalı: e-posta'
             submit: Dosya yükleme
             title: Yeni bir nüfus sayımı yükleyin
         authorizations:

data/lib/decidim/verifications/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-verifications version.
   module Verifications
     def self.version
-      "0.18.1"
+      "0.19.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-verifications
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - David Rodriguez
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 description: Several verification methods for your decidim instance
 email:
 - deivid.rodriguez@riseup.net
@@ -100,7 +100,6 @@ files:
 - app/models/decidim/verifications/csv_census/data.rb
 - app/models/decidim/verifications/csv_census/status.rb
 - app/models/decidim/verifications/csv_datum.rb
-- app/permissions/decidim/verifications/csv_census/admin/permissions.rb
 - app/presenters/decidim/verifications/id_documents/authorization_presenter.rb
 - app/presenters/decidim/verifications/postal_letter/authorization_presenter.rb
 - app/queries/decidim/verifications/authorizations.rb

data/app/permissions/decidim/verifications/csv_census/admin/permissions.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Verifications
-    module CsvCensus
-      module Admin
-        class Permissions < Decidim::DefaultPermissions
-          def permissions
-            return permission_action if permission_action.scope != :admin
-            if user.organization.available_authorizations.include?("csv_census")
-              allow! if permission_action.subject == Decidim::Verifications::CsvDatum
-              permission_action
-            end
-          end
-        end
-      end
-    end
-  end
-end