decidim-verifications 0.10.1 → 0.11.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a777c1d628a37d090f6b14dfb8a82131d9b13da467becba8ca6bfcf0286fda5
-  data.tar.gz: 1700efb415b236ec0dd711960a9dec088ea6a94af9a3b77fea5a55871f39b570
+  metadata.gz: 916479beee76ee479c05f1660f025e0bc933d484799b0f6049de9227c7733cd5
+  data.tar.gz: 0246bf40ca64fdd09069b696ae5115e8a0d4ca8580ed8ec35a235f62be8dd4d5
 SHA512:
-  metadata.gz: b9045849b1e4ab203bd3d923f7a0c04e3f9ca26c97f17632516616fd3c4d0281fc99fb164cd4a9eee93528509e5db3086d9396c094cb2fd777527ada4ad6c502
-  data.tar.gz: 14952692f3b960ac7beda6673bc7e498066268c2d821fda29cea93d8855f85ed8c7dc5bae3fe7a241a0c3c16399232716ea02cae4eb027b84106c098353ff948
+  metadata.gz: db7fd1c693a97d658f586e4adc3cb416d7cb6887e0ad6154e674a3918384e1fea729ae6a28674d201a50a626df1bb2b759d19cde07c67f0738f55ea28935a30d
+  data.tar.gz: 3b7c4d7946c1e1dc8f96700bbcdba50792398cdda7b960b4e3c2b9c5ed2cc48dec63954c0a051c6325b88f11d9548b6449ac0369fe71b9b84f50245d753e94d3

data/README.md

@@ -77,10 +77,10 @@ Decidim implements two type of authorization methods:
 
 ## Custom action authorizers
 
-Custom action authorizers are an advanced feature that can be used in both types of
+Custom action authorizers are an advanced component that can be used in both types of
 authorization methods to customize some parts of the authorization process.
 These are particulary useful when used within verification options, which are
-set in the admin zone related to a feature action. As a result, a verification
+set in the admin zone related to a component action. As a result, a verification
 method will be allowed to change the authorization logic and the appearance based
 on the context where the authorization is being performed.
 

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

@@ -18,44 +18,16 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) unless handler.valid? && unique?
+        return broadcast(:invalid) unless handler.valid?
+
+        Authorization.create_or_update_from(handler)
 
-        create_authorization
         broadcast(:ok)
       end
 
       private
 
       attr_reader :handler
-
-      def create_authorization
-        authorization = Authorization.find_or_initialize_by(
-          user: handler.user,
-          name: handler.handler_name
-        )
-
-        authorization.attributes = {
-          unique_id: handler.unique_id,
-          metadata: handler.metadata
-        }
-
-        authorization.grant!
-      end
-
-      def unique?
-        return true if handler.unique_id.nil?
-
-        duplicates = Authorization.where(
-          user: User.where.not(id: handler.user.id).where(organization: handler.user.organization.id),
-          name: handler.handler_name,
-          unique_id: handler.unique_id
-        )
-
-        return true unless duplicates.any?
-
-        handler.errors.add(:base, I18n.t("decidim.authorization_handlers.errors.duplicate_authorization"))
-        false
-      end
     end
   end
 end

data/app/services/decidim/authorization_handler.rb

@@ -20,6 +20,8 @@ module Decidim
     # infer the class name of the authorization handler.
     attribute :handler_name, String
 
+    validate :uniqueness
+
     # A unique ID to be implemented by the authorization handler that ensures
     # no duplicates are created. This uniqueness check will be skipped if
     # unique_id returns nil.
@@ -108,5 +110,23 @@ module Decidim
 
       manifest.form.constantize.from_params(params || {})
     end
+
+    private
+
+    def duplicates
+      Authorization.where(
+        user: User.where.not(id: user.id).where(organization: user.organization),
+        name: handler_name,
+        unique_id: unique_id
+      )
+    end
+
+    def uniqueness
+      return true if unique_id.nil? || duplicates.none?
+
+      errors.add(:base, I18n.t("decidim.authorization_handlers.errors.duplicate_authorization"))
+
+      false
+    end
   end
 end

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

@@ -17,10 +17,11 @@
                 <%= render partial: handler.to_partial_path, locals: { handler: handler, form: form } %>
               <% else %>
                 <%= form.all_fields %>
-                <div class="actions">
-                  <%= form.submit t(".authorize"), class: "button expanded" %>
-                </div>
               <% end %>
+
+              <div class="actions">
+                <%= form.submit t(".authorize"), class: "button expanded" %>
+              </div>
             <% end %>
             <p class="text-center skip">
               <%= t("decidim.verifications.authorizations.skip_verification", link: link_to(t("decidim.verifications.authorizations.start_exploring"), cta_button_path).html_safe).html_safe %>.

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

@@ -1,6 +1,6 @@
 <div class="wrapper">
   <div class="row column">
-    <div class="callout announcement <%= authorization.rejected? ? 'alert' : 'secondary' %>">
+    <div class="callout announcement <%= authorization.rejected? ? "alert" : "secondary" %>">
       <div class="row">
         <div class="columns medium-8 large-9">
           <% if authorization.rejected? %>

data/app/views/dummy_authorization/_form.html.erb

@@ -1,8 +1,8 @@
 <% if request["postal_codes"]
-  postal_codes = request["postal_codes"].split("-")%>
+  postal_codes = request["postal_codes"].split("-") %>
   <p><%= t("extra_explanation", scope: "decidim.verifications.dummy_authorization", postal_codes: postal_codes.join(", "), count: postal_codes.count) %></p>
 <% end %>
-<%= form.all_fields %>
-<div class="actions partial-demo">
-  <%= form.submit t("decidim.verifications.authorizations.new.authorize"), class: "button expanded" %>
-</div>
+
+<div class="partial-demo">
+  <%= form.all_fields %>
+</div>

data/config/locales/fr.yml

@@ -8,7 +8,7 @@ fr:
         document_number: Numéro de document (avec lettre)
         document_type: Type de votre document
         user: Utilisateur
-        verification_attachment: Copie scannée de votre document
+        verification_attachment: Copie scannée du document
       postal_letter_address:
         full_address: Adresse complète
       postal_letter_confirmation:
@@ -35,7 +35,7 @@ fr:
             - Vous marquez la lettre comme envoyée.
             - Une fois que vous avez coché la lettre, l'utilisateur sera en mesure de présenter le code et d'être vérifié.
       direct: Direct
-      help: Aidez-moi
+      help: Texte d'aide
       id_documents:
         explanation: Téléchargez vos documents d'identité afin que nous puissions vérifier votre identité
         name: Documents d'identité

data/config/locales/nl.yml

@@ -12,10 +12,10 @@ nl:
       postal_letter_address:
         full_address: Volledig adres
       postal_letter_confirmation:
-        verification_code: Verificatie code
+        verification_code: Verificatiecode
       postal_letter_postage:
         full_address: Volledig adres
-        verification_code: Verificatie code
+        verification_code: Verificatiecode
   decidim:
     admin:
       menu:
@@ -64,7 +64,7 @@ nl:
         start_exploring: begin met verkennen
       dummy_authorization:
         extra_explanation:
-          one: Deelname is beperkt tot gebruikers met de postcode %{postal_codes}.
+          one: Deelname is beperkt tot gebruikers met postcode %{postal_codes}.
           other: 'Deelname is beperkt tot gebruikers met een van de volgende postcodes: %{postal_codes}.'
       id_documents:
         admin:

data/db/migrate/20171030133426_move_authorizations_to_new_api.rb

@@ -22,8 +22,8 @@ class MoveAuthorizationsToNewApi < ActiveRecord::Migration[5.1]
     self.table_name = :decidim_organizations
   end
 
-  class Feature < ApplicationRecord
-    self.table_name = :decidim_features
+  class Component < ApplicationRecord
+    self.table_name = :decidim_components
   end
 
   def up
@@ -35,10 +35,10 @@ class MoveAuthorizationsToNewApi < ActiveRecord::Migration[5.1]
       organization.update!(available_authorizations: migrated_authorizations)
     end
 
-    Feature.find_each do |feature|
-      next if feature.permissions.nil?
+    Component.find_each do |component|
+      next if component.permissions.nil?
 
-      feature.permissions.transform_values! do |value|
+      component.permissions.transform_values! do |value|
         next if value.nil?
 
         {
@@ -47,7 +47,7 @@ class MoveAuthorizationsToNewApi < ActiveRecord::Migration[5.1]
         }
       end
 
-      feature.save!
+      component.save!
     end
   end
 
@@ -60,14 +60,14 @@ class MoveAuthorizationsToNewApi < ActiveRecord::Migration[5.1]
       organization.update!(available_authorizations: migrated_authorizations)
     end
 
-    Feature.find_each do |feature|
-      feature.permissions.transform_values! do |value|
+    Component.find_each do |component|
+      component.permissions.transform_values! do |value|
         workflow = Decidim::Verifications.find_workflow_manifest(value)
 
         workflow.form.underscore
       end
 
-      feature.save!
+      component.save!
     end
   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.10.1"
+      "0.11.0.pre1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-verifications
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0.pre1
 platform: ruby
 authors:
 - David Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-26 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.10.1
+        version: 0.11.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 description: Several verification methods for your decidim instance
 email:
 - deivid.rodriguez@riseup.net
@@ -146,9 +146,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3