decidim-verifications 0.23.3 → 0.24.1

data/config/locales/sv.yml

@@ -34,16 +34,8 @@ sv:
             confirm: Återkallande av auktorisering före datum kan inte ångras. Vill du fortsätta?
             confirm_all: Det går inte att ångra återkallande av alla auktoriseringar. Vill du fortsätta?
           destroy_nok: Det gick inte att återkalla auktoriseringar.
-          destroy_ok: Alla auktoriseringar som överensstämmer har återkallats!
           info: Det finns totalt %{count} verifierade deltagare.
           no_data: Inga verifierade deltagare
-          title: Återkallande av verifiering
-        authorization_workflows: Verifieringar
-    admin_log:
-      organization:
-        update_id_documents_config: "%{user_name} uppdaterade konfiguration för verifikation av identitetshandlingar"
-      user:
-        grant_id_documents_offline_verification: "%{user_name} verifierade %{resource_name} hjälp av offlineverifiering av identitetshandlingar"
     authorization_handlers:
       admin:
         csv_census:
@@ -131,7 +123,6 @@ sv:
             title: Aktuella medlemsuppgifter
           instructions:
             body: För att göra detta måste du öppna systemadministrationen och lägga till godkännande via csv_census till organisationen
-            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 bara en kolumn med e-postadressen:'

data/config/locales/tr-TR.yml

@@ -34,16 +34,8 @@ tr:
             confirm: Tarihten önce iptal yetkileri geri alınamaz. Devam etmek istediğine emin misin?
             confirm_all: Tüm yetkilendirmeler geri alınamaz. Devam etmek istediğine emin misin?
           destroy_nok: Yetkilendirmeler iptal edilirken bir sorun oluştu.
-          destroy_ok: Tüm eşleşen yetkiler başarıyla iptal edildi!
           info: Toplam %{count} doğrulanmış katılımcı var.
           no_data: Doğrulanmış katılımcı yok
-          title: Yetkinin iptali
-        authorization_workflows: Doğrulama
-    admin_log:
-      organization:
-        update_id_documents_config: "%{user_name}, Kimlik Belgeleri doğrulama yapılandırmasını güncelledi"
-      user:
-        grant_id_documents_offline_verification: "%{user_name}, çevrimdışı Kimlik Belgeleri doğrulaması kullanarak %{resource_name} öğesini doğruladı"
     authorization_handlers:
       admin:
         csv_census:
@@ -75,6 +67,10 @@ tr:
       postal_letter:
         explanation: Size adresinizi doğrulayabilmemiz için girmeniz gereken bir kod içeren bir posta mektubu göndereceğiz.
         name: Posta mektubu ile kod
+    events:
+      verifications:
+        verify_with_managed_user:
+          notification_title: Katılımcı <a href="%{resource_path}">%{resource_title} </a>, yönetilen katılımcının <a href="%{managed_user_path}">%{managed_user_name} </a> verileriyle kendini doğrulamaya çalıştı
     verifications:
       authorizations:
         authorization_metadata:
@@ -131,7 +127,7 @@ tr:
             title: Geçerli kayıt verisi
           instructions:
             body: Bunu yapmak için sistem yönetimine girmeli ve csv_census yetkilerini kuruluşa eklemelisiniz.
-            title: Bu kuruluş için csv sayımını etkinleştirmeniz gerekir
+            title: Bu kuruluş için CSV sayımını etkinleştirmeniz gerekiyor
           new:
             file: "e-posta verileri içeren .csv dosyası"
             info: 'E-posta adresi içeren yalnızca bir sütuna sahip CSV biçiminde bir dosya olmalıdır:'

data/config/locales/uk.yml

@@ -17,9 +17,6 @@ uk:
         full_address: Повна адреса
         verification_code: Перевірочний код
   decidim:
-    admin:
-      menu:
-        authorization_workflows: Шляхи підтвердження особи
     authorization_handlers:
       admin:
         id_documents:

data/config/locales/zh-CN.yml

@@ -34,16 +34,8 @@ zh-CN:
             confirm: 在日期前撤销授权无法撤销。您确定要继续吗？
             confirm_all: 撤销所有授权无法撤销。您确定要继续吗？
           destroy_nok: 撤销授权时出现问题。
-          destroy_ok: 所有匹配的授权已成功取消！
           info: 共有 %{count} 个已验证的参与者。
           no_data: 没有经过验证的参与者
-          title: 验证已取消
-        authorization_workflows: 验证
-    admin_log:
-      organization:
-        update_id_documents_config: "%{user_name} 更新了身份文档验证配置"
-      user:
-        grant_id_documents_offline_verification: "%{user_name} 使用离线身份证件验证了 %{resource_name}"
     authorization_handlers:
       admin:
         csv_census:
@@ -131,7 +123,6 @@ zh-CN:
             title: 目前的普查数据
           instructions:
             body: 要做到这一点，您必须输入系统管理并将csv_census授权添加到组织
-            title: 您需要激活此组织的 csv 调查
           new:
             file: "带有电子邮件数据的.csv 文件"
             info: '必须是 CSV 格式的文件，其中只有一个列有电子邮件地址：'

data/db/migrate/20201028161118_create_decidim_verifications_conflicts.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateDecidimVerificationsConflicts < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_verifications_conflicts do |t|
+      t.references :current_user, index: { name: "authorization_current_user" }, foreign_key: { to_table: :decidim_users }
+      t.references :managed_user, index: { name: "authorization_managed_user" }, foreign_key: { to_table: :decidim_users }
+      t.integer :times, default: 0
+      t.string :unique_id
+      t.boolean :solved, default: false
+
+      t.timestamps
+    end
+  end
+end

data/lib/decidim/verifications/default_action_authorizer.rb

@@ -42,15 +42,15 @@ module Decidim
       #
       def authorize
         if !authorization
-          [:missing, action: :authorize]
+          [:missing, { action: :authorize }]
         elsif authorization_expired?
-          [:expired, action: :authorize]
+          [:expired, { action: :authorize }]
         elsif !authorization.granted?
-          [:pending, action: :resume]
+          [:pending, { action: :resume }]
         elsif unmatched_fields.any?
-          [:unauthorized, fields: unmatched_fields]
+          [:unauthorized, { fields: unmatched_fields }]
         elsif missing_fields.any?
-          [:incomplete, fields: missing_fields, action: :reauthorize, cancel: true]
+          [:incomplete, { fields: missing_fields, action: :reauthorize, cancel: true }]
         else
           [:ok, {}]
         end

data/lib/decidim/verifications/test/factories.rb

@@ -8,4 +8,11 @@ FactoryBot.define do
     email { generate(:email) }
     organization
   end
+
+  factory :conflict, class: "Decidim::Verifications::Conflict" do
+    current_user { create(:user) }
+    managed_user { create(:user, managed: true) }
+    unique_id { "12345678X" }
+    times { 1 }
+  end
 end

data/lib/decidim/verifications/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-verifications
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.24.1
 platform: ruby
 authors:
 - David Rodriguez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 description: Several verification methods for your decidim instance
 email:
 - deivid.rodriguez@riseup.net
@@ -91,6 +91,7 @@ files:
 - app/controllers/decidim/verifications/postal_letter/admin/postages_controller.rb
 - app/controllers/decidim/verifications/postal_letter/authorizations_controller.rb
 - app/controllers/decidim/verifications/sms/authorizations_controller.rb
+- app/events/decidim/verifications/managed_user_error_event.rb
 - app/forms/decidim/verifications/admin/revocations_before_date_form.rb
 - app/forms/decidim/verifications/csv_census/admin/census_data_form.rb
 - app/forms/decidim/verifications/csv_census/census_form.rb
@@ -107,6 +108,7 @@ files:
 - app/jobs/decidim/verifications/csv_census/application_job.rb
 - app/jobs/decidim/verifications/csv_census/remove_duplicates_job.rb
 - app/models/decidim/verifications/application_record.rb
+- app/models/decidim/verifications/conflict.rb
 - app/models/decidim/verifications/csv_census/data.rb
 - app/models/decidim/verifications/csv_census/status.rb
 - app/models/decidim/verifications/csv_datum.rb
@@ -207,6 +209,7 @@ files:
 - config/locales/zh-TW.yml
 - db/migrate/20171030133426_move_authorizations_to_new_api.rb
 - db/migrate/20181227135423_create_decidim_verifications_csv_data.rb
+- db/migrate/20201028161118_create_decidim_verifications_conflicts.rb
 - lib/decidim/verifications.rb
 - lib/decidim/verifications/adapter.rb
 - lib/decidim/verifications/csv_census.rb
@@ -246,14 +249,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim verifications module