decidim-direct_verifications 0.2.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ad632a7bef5ab98d4f990f5587e327555eca761460b3101a6abbcc7f3e23ff3
-  data.tar.gz: b4886c0e6960a4272a3e90158f4deac8ae097775394dbe8397078e0547c8ce0a
+  metadata.gz: 05dec8820eeee3edad6573940ea0f4547124f466ebdf45d4987f1312d16b08d1
+  data.tar.gz: 6e9bf471d3a20398786cf371225dab9ba61675a74f202c272a808ef82fbd2bf7
 SHA512:
-  metadata.gz: eba1aa60e620a0d252af787d93e5136524a3eb20e3ce35b3ebf4fe317aad32fd621631fc856012e84ef3f81c65791dd0f7f9169c25600faf210b346c5f66a1f7
-  data.tar.gz: 643c6ed06c6b997684b0c0e6280554300f071cbe029b52320a433a8382c463981818c8e321e0057c4697e9dc13a0cc2faa3d89c2a3e51f1bda2f4a8a186efebf
+  metadata.gz: 83f31f267179f50f6f53ff23d28a3163ce9b53b3faa97dc9e267be47cad1bcea6067fbde6e58c6f4aea9d6416128f27493b13277f1864ae760cb1adecbddf096
+  data.tar.gz: ca793027a34e90db07cf253d3be039de8ec5892fce4de3be83702672dabf6bf0b73df279359845ab6d5d5d87aa570613eaf5b1521d0be63e00bbf4784fcdc538

data/app/commands/decidim/direct_verifications/verification/confirm_user_authorization.rb

@@ -7,12 +7,8 @@ module Decidim
         def call
           return broadcast(:invalid) unless form.valid?
 
-          if confirmation_successful?
-            authorization.grant!
-            broadcast(:ok)
-          else
-            broadcast(:invalid)
-          end
+          authorization.grant!
+          broadcast(:ok)
         end
       end
     end

data/config/locales/ca.yml

@@ -26,8 +26,7 @@ ca:
               authorized: S'han verificat correctament %{authorized} usuaris utilitzant
                 [%{handler}] (%{count} detectats, %{errors} errors)
               info: S'han detectat %{count} usuaris, dels quals %{registered} estan
-                registrats, %{unconfirmed} sense confirmar i %{authorized} autoritzats
-                utilitzant [%{handler}]
+                registrats, %{authorized} autoritzats utilitzant [%{handler}] (%{unconfirmed} sense confirmar)
               registered: S'han registrat correctament %{registered} usuaris (%{count}
                 detectats, %{errors} errors)
               revoked: S'ha revocat correctament la verificació de %{revoked} usuaris

data/config/locales/en.yml

@@ -26,7 +26,7 @@ en:
               authorized: "%{authorized} users have been successfully verified using
                 [%{handler}] (%{count} detected, %{errors} errors)"
               info: "%{count} users detected, of which %{registered} are registered,
-                %{unconfirmed} unconfirmed and %{authorized} authorized using [%{handler}]"
+                 %{authorized} authorized using [%{handler}] (%{unconfirmed} unconfirmed)"
               registered: "%{registered} users have been successfully registered (%{count}
                 detected, %{errors} errors) "
               revoked: Verification from %{revoked} users have been revoked using

data/config/locales/es.yml

@@ -26,8 +26,7 @@ es:
               authorized: Se han verificado correctamente %{authorized} usuarios usando
                 [%{handler}] (%{count} detectados, %{errors} errores)
               info: Se han detectado %{count} usuarios, de los cuales %{registered}
-                están registrados, %{unconfirmed} sin confirmar y %{authorized} autorizados
-                usando [%{handler}]
+                están registrados, %{authorized} autorizados usando [%{handler}] (%{unconfirmed} sin confirmar)
               registered: Se han registrado correctamente %{registered} usuarios (%{count}
                 detectados, %{errors} errores)
               revoked: Se ha revocado correctament la verificación de %{revoked} usuarios

data/lib/decidim/direct_verifications/user_processor.rb

@@ -33,6 +33,8 @@ module Decidim
                 add_error :registered, email
               end
             end
+          rescue
+            add_error :registered, email
           end
         end
       end
@@ -78,16 +80,16 @@ module Decidim
       def total(type)
         if type == :registered
           return User.where(email: @emails.keys, decidim_organization_id: @organization.id)
-                     .where(confirmed_at: nil).count
+                     .count
         end
         if type == :unconfirmed
           return User.where(email: @emails.keys, decidim_organization_id: @organization.id)
-                     .where.not(confirmed_at: nil).count
+                     .where(confirmed_at: nil).count
         end
         if type == :authorized
           return Decidim::Authorization.joins(:user)
                                        .where(name: authorization_handler)
-                                       .where("decidim_users.email IN (:emails) AND decidim_users.decidim_organization_id=:org AND decidim_users.confirmed_at IS NOT NULL",
+                                       .where("decidim_users.email IN (:emails) AND decidim_users.decidim_organization_id=:org",
                                               emails: @emails.keys, org: @organization.id).count
         end
         0

data/lib/decidim/direct_verifications/version.rb

@@ -3,12 +3,7 @@
 module Decidim
   # This holds the decidim-direct_verifications version.
   module DirectVerifications
-    def self.version
-      "0.2.2"
-    end
-
-    def self.decidim_version
-      "~> 0.16"
-    end
+    VERSION = "0.17.3"
+    DECIDIM_VERSION = ">= 0.17.0"
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: decidim-direct_verifications
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.17.0
 description: Provides a verification method that also registers users directly in
   the platform. Can be used to mass verificate user with other verification handlers
 email: