decidim-direct_verifications 0.17.7 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdece320908b5c93c6b1312fae64fbb23814d8c48e99bd258cdee55dcb2b37b3
-  data.tar.gz: 0d70c5cf75fd68c848ce52328589cce67524197f5cc95dbcbd2ff5cc7d559ed5
+  metadata.gz: 860fec657e68dab8325cde196bbfaa66059ede6b76414bb250a549d5639ebe6e
+  data.tar.gz: f40a1f9bb946c0254c518cba3dd05a1e1764bd23729270e80554076cd07ffc12
 SHA512:
-  metadata.gz: ce76ca5c3dcf855eba9f1ecd0d963bfb03791a80ed9fbee729e891932a96390b94df9ca748e19f73aaefb03afd5f55b0a1b873eb470eccf3d67b9e116118d23f
-  data.tar.gz: 761e7647eeb5d859c17694a8c681d9538cd6ffd680071d7f9f4cbe7d3aa3c718fac5451ed9624fdfad8a0e5101cd95690a3cce3d3e514e11ba7d2fa708478082
+  metadata.gz: 87f25e203fe473612d2b53ae4986a5452d2096f12543d00eba10c1a8ba7d04c09471cbc9a15eed4916281ea07186152c61d630d0e40320c27d63cde699b6b7a0
+  data.tar.gz: b3c34eccfd75f9849c5866fc402969fc7c0e2c99313983bd302fe025254e299356790697ed34ab9f96ef8c4cace2c335dd3bb6f4dbb412f9073c4316c1554d10

data/README.md

@@ -1,6 +1,8 @@
 # Decidim::DirectVerifications
 
-[![Build Status](https://travis-ci.org/Platoniq/decidim-verifications-direct_verifications.svg?branch=master)](https://travis-ci.org/Platoniq/decidim-verifications-direct_verifications)
+![Test](https://github.com/Platoniq/decidim-verifications-direct_verifications/workflows/Test/badge.svg)
+[![Maintainability](https://api.codeclimate.com/v1/badges/2195deb4de6c6354a6bc/maintainability)](https://codeclimate.com/github/Platoniq/decidim-verifications-direct_verifications/maintainability)
+[![codecov](https://codecov.io/gh/Platoniq/decidim-verifications-direct_verifications/branch/master/graph/badge.svg?token=FR1zkV71S2)](https://codecov.io/gh/Platoniq/decidim-verifications-direct_verifications)
 
 A [Decidim](https://github.com/decidim/decidim) that provides a verification method called `Direct verification`. Works only on the admin side, final users do not intervene in the verification process.
 
@@ -84,6 +86,11 @@ en:
       direct_verifications_managers:
         name: Organization managers
         explanation: Direct Verifications Subgroup explanation
+    verifications:
+      authorizations:
+        first_login:
+          actions:
+            direct_verifications_managers: Organization managers
 ```
 
 Similarly, you can also overwrite the default title "Direct verification" by creating the key again in your locales:
@@ -95,6 +102,11 @@ en:
       direct_verifications:
         name: Generic organization members
         explanation: Direct Verifications Subgroup explanation
+    verifications:
+      authorizations:
+        first_login:
+          actions:
+            direct_verifications: Generic organization members
 ```
 
 

data/app/controllers/decidim/direct_verifications/verification/admin/direct_verifications_controller.rb

@@ -6,73 +6,98 @@ module Decidim
       module Admin
         class DirectVerificationsController < Decidim::Admin::ApplicationController
           include NeedsPermission
+          helper_method :workflows, :current_authorization_handler
 
           layout "decidim/admin/users"
 
           def index
             enforce_permission_to :index, :authorization
-            @authorization_handler = :direct_verifications
-            @workflows = workflows
           end
 
           def create
             enforce_permission_to :create, :authorization
 
-            @userlist = params[:userlist]
-            @workflows = workflows
-            processor = UserProcessor.new(current_organization, current_user)
-            processor.emails = extract_emails_to_hash @userlist
-            processor.authorization_handler = authorization_handler(params[:authorization_handler])
-            stats = UserStats.new(current_organization)
-            stats.authorization_handler = processor.authorization_handler
-            if params[:register]
-              processor.register_users
-              flash[:warning] = t(".registered", count: processor.emails.count,
-                                                 registered: processor.processed[:registered].count,
-                                                 errors: processor.errors[:registered].count)
-            end
-            if params[:authorize] == "in"
-              processor.authorize_users
-              flash[:notice] = t(".authorized", handler: t("#{processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
-                                                count: processor.emails.count,
-                                                authorized: processor.processed[:authorized].count,
-                                                errors: processor.errors[:authorized].count)
-            elsif params[:authorize] == "out"
-              processor.revoke_users
-              flash[:notice] = t(".revoked", handler: t("#{processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
-                                             count: processor.emails.count,
-                                             revoked: processor.processed[:revoked].count,
-                                             errors: processor.errors[:revoked].count)
-            else
-              stats.emails = processor.emails.keys
-              flash[:info] = t(".info", handler: t("#{processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
-                                        count: processor.emails.count,
-                                        authorized: stats.authorized,
-                                        unconfirmed: stats.unconfirmed,
-                                        registered: stats.registered)
-              render(action: :index) && return
-            end
+            @userslist = params[:userslist]
+            @processor = UserProcessor.new(current_organization, current_user, session)
+            @processor.emails = extract_emails_to_hash @userslist
+            @processor.authorization_handler = current_authorization_handler
+            @stats = UserStats.new(current_organization)
+            @stats.authorization_handler = @processor.authorization_handler
+            register_users
+            authorize_users
+            revoke_users
+
+            render(action: :index) && return if show_users_info
+
             redirect_to direct_verifications_path
           end
 
           private
 
+          def register_users
+            return unless params[:register]
+
+            @processor.register_users
+            flash[:warning] = t(".registered", count: @processor.emails.count,
+                                               registered: @processor.processed[:registered].count,
+                                               errors: @processor.errors[:registered].count)
+          end
+
+          def authorize_users
+            return unless params[:authorize] == "in"
+
+            @processor.authorize_users
+            flash[:notice] = t(".authorized", handler: t("#{@processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
+                                              count: @processor.emails.count,
+                                              authorized: @processor.processed[:authorized].count,
+                                              errors: @processor.errors[:authorized].count)
+          end
+
+          def revoke_users
+            return unless params[:authorize] == "out"
+
+            @processor.revoke_users
+            flash[:notice] = t(".revoked", handler: t("#{@processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
+                                           count: @processor.emails.count,
+                                           revoked: @processor.processed[:revoked].count,
+                                           errors: @processor.errors[:revoked].count)
+          end
+
+          def show_users_info
+            return if params[:authorize].in? %w(in out)
+
+            @stats.emails = @processor.emails.keys
+            flash.now[:info] = t(".info", handler: t("#{@processor.authorization_handler}.name", scope: "decidim.authorization_handlers"),
+                                          count: @processor.emails.count,
+                                          authorized: @stats.authorized,
+                                          unconfirmed: @stats.unconfirmed,
+                                          registered: @stats.registered)
+            true
+          end
+
           def extract_emails_to_hash(txt)
-            reg = /([^@\r\n]*)\b([A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,})\b/i
-            txt.scan(reg).map do |m|
-              [
-                m[1].delete("<>").strip,
-                m[0].gsub(/[^[:print:]]|[\"\$\<\>\|\\]/, "").strip
-              ]
-            end .to_h
+            reg = /([A-Z0-9+._-]+@[A-Z0-9._-]+\.[A-Z0-9_-]+)\b/i
+            emails = {}
+            txt.split(/[\r\n;,]/).each do |line|
+              reg.match line do |m|
+                n = line.split(m[0]).first
+                emails[m[0]] = (n.presence || "").gsub(/[^[:print:]]|[\"\$\<\>\|\\]/, "").strip
+              end
+            end
+            emails
           end
 
           def authorization_handler(authorization_handler)
             @authorization_handler = authorization_handler.presence || :direct_verifications
           end
 
+          def current_authorization_handler
+            authorization_handler(params[:authorization_handler])
+          end
+
           def configured_workflows
             return Decidim::DirectVerifications.config.manage_workflows if Decidim::DirectVerifications.config
+
             ["direct_verifications"]
           end
 

data/app/views/decidim/direct_verifications/verification/admin/direct_verifications/index.html.erb

@@ -1,40 +1,40 @@
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t('admin.index.title', scope: 'decidim.direct_verifications.verification') %>
-      <%= link_to t("admin.index.stats", scope: 'decidim.direct_verifications.verification'), stats_path, class: "button tiny button--title" %>
+      <%= t("admin.index.title", scope: "decidim.direct_verifications.verification") %>
+      <%= link_to t("admin.index.stats", scope: "decidim.direct_verifications.verification"), stats_path, class: "button tiny button--title" %>
     </h2>
   </div>
   <div class="card-section">
-    <p><%= t('decidim.direct_verifications.verification.admin.new.info') %></p>
-    <%= form_tag direct_verifications_path, multipart: true, class: 'form' do %>
-      <%= label_tag :userlist, t('admin.new.textarea', scope: 'decidim.direct_verifications.verification') %>
-      <%= text_area_tag :userlist, @userlist, rows: 10 %>
+    <p><%= t("decidim.direct_verifications.verification.admin.new.info") %></p>
+    <%= form_tag direct_verifications_path, multipart: true, class: "form" do %>
+      <%= label_tag :userslist, t("admin.new.textarea", scope: "decidim.direct_verifications.verification") %>
+      <%= text_area_tag :userslist, @userslist, rows: 10 %>
       <label>
         <%= check_box_tag :register %>
-        <%= t('admin.new.register', scope: 'decidim.direct_verifications.verification') %>
+        <%= t("admin.new.register", scope: "decidim.direct_verifications.verification") %>
         <div data-alert class="callout alert hide">
-          <%= t('admin.direct_verifications.gdpr_disclaimer', scope: 'decidim.direct_verifications.verification') %>
+          <%= t("admin.direct_verifications.gdpr_disclaimer", scope: "decidim.direct_verifications.verification") %>
         </div>
       </label>
       <label>
-        <%= radio_button_tag :authorize, 'in' %>
-        <%= t('admin.new.authorize', scope: 'decidim.direct_verifications.verification') %>
+        <%= radio_button_tag :authorize, "in" %>
+        <%= t("admin.new.authorize", scope: "decidim.direct_verifications.verification") %>
       </label>
       <label>
-        <%= radio_button_tag :authorize, 'out' %>
-        <%= t('admin.new.revoke', scope: 'decidim.direct_verifications.verification') %>
+        <%= radio_button_tag :authorize, "out" %>
+        <%= t("admin.new.revoke", scope: "decidim.direct_verifications.verification") %>
       </label>
       <label>
-        <%= radio_button_tag :authorize, 'check', true %>
-        <%= t('admin.new.check', scope: 'decidim.direct_verifications.verification') %>
+        <%= radio_button_tag :authorize, "check", true %>
+        <%= t("admin.new.check", scope: "decidim.direct_verifications.verification") %>
       </label>
 
-      <%= label_tag :authorization_handler, t('admin.new.authorization_handler', scope: 'decidim.direct_verifications.verification') %>
+      <%= label_tag :authorization_handler, t("admin.new.authorization_handler", scope: "decidim.direct_verifications.verification") %>
 
-      <%= select_tag :authorization_handler, options_for_select(@workflows, @authorization_handler) %>
+      <%= select_tag :authorization_handler, options_for_select(workflows, current_authorization_handler) %>
 
-      <%= submit_tag t('admin.new.submit', scope: 'decidim.direct_verifications.verification'), class: 'button' %>
+      <%= submit_tag t("admin.new.submit", scope: "decidim.direct_verifications.verification"), class: "button" %>
 
     <% end %>
 

data/app/views/decidim/direct_verifications/verification/admin/stats/index.html.erb

@@ -1,15 +1,15 @@
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t('admin.index.stats', scope: 'decidim.direct_verifications.verification') %>
-      <%= link_to t("admin.index.title", scope: 'decidim.direct_verifications.verification'), direct_verifications_path, class: "button tiny button--title" %>
+      <%= t("admin.index.stats", scope: "decidim.direct_verifications.verification") %>
+      <%= link_to t("admin.index.title", scope: "decidim.direct_verifications.verification"), direct_verifications_path, class: "button tiny button--title" %>
     </h2>
   </div>
   <div class="card-section">
     <table class="table-list">
       <thead>
         <tr>
-          <th><%= t("admin.new.authorization_handler", scope: 'decidim.direct_verifications.verification') %></th>
+          <th><%= t("admin.new.authorization_handler", scope: "decidim.direct_verifications.verification") %></th>
           <th><%= t(".registered") %></th>
           <th><%= t(".authorized") %></th>
           <th><%= t(".unconfirmed") %></th>

data/config/locales/ca.yml

@@ -59,6 +59,11 @@ ca:
         authorizations:
           new:
             no_action: Aquest mètode requereix que un administrador us verifiqui
+    verifications:
+      authorizations:
+        first_login:
+          actions:
+            direct_verifications: Verificació directa
   devise:
     mailer:
       direct_invite:

data/config/locales/en.yml

@@ -57,6 +57,11 @@ en:
         authorizations:
           new:
             no_action: This method requires an administrator that verifies you
+    verifications:
+      authorizations:
+        first_login:
+          actions:
+            direct_verifications: Direct verification
   devise:
     mailer:
       direct_invite:

data/config/locales/es.yml

@@ -59,6 +59,11 @@ es:
         authorizations:
           new:
             no_action: Este método requiere que un administrador os verifique
+    verifications:
+      authorizations:
+        first_login:
+          actions:
+            direct_verifications: Verificación directa
   devise:
     mailer:
       direct_invite:

data/lib/decidim/direct_verifications/tests/verification_controller_examples.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+shared_examples_for "checking users" do |params|
+  context "when check without mails" do
+    it "renders the index with info message" do
+      params[:userslist] = ""
+      perform_enqueued_jobs do
+        post :create, params: params
+        expect(flash[:info]).not_to be_empty
+        expect(flash[:info]).to include("0 users detected")
+        expect(subject).to render_template("decidim/direct_verifications/verification/admin/direct_verifications/index")
+      end
+    end
+  end
+
+  context "when check with mails" do
+    it "renders the index with info message" do
+      params[:userslist] = "mail@example.com"
+      perform_enqueued_jobs do
+        post :create, params: params
+        expect(flash[:info]).not_to be_empty
+        expect(flash[:info]).to include("1 users detected")
+        expect(subject).to render_template("decidim/direct_verifications/verification/admin/direct_verifications/index")
+      end
+    end
+  end
+end
+
+shared_examples_for "registering users" do |params|
+  context "when there are valid emails" do
+    it "creates warning message" do
+      perform_enqueued_jobs do
+        post :create, params: params
+        expect(flash[:warning]).not_to be_empty
+        expect(flash[:warning]).to include("1 detected")
+        expect(flash[:warning]).to include("0 errors")
+        expect(flash[:warning]).to include("1 users")
+        expect(flash[:warning]).to include("registered")
+      end
+    end
+  end
+end
+
+shared_examples_for "authorizing users" do |params|
+  context "when there are valid emails" do
+    it "creates notice message" do
+      perform_enqueued_jobs do
+        post :create, params: params
+        expect(flash[:notice]).not_to be_empty
+        expect(flash[:notice]).to include("1 detected")
+        expect(flash[:notice]).to include("0 errors")
+        expect(flash[:notice]).to include("1 users")
+        expect(flash[:notice]).to include("verified")
+      end
+    end
+  end
+end
+
+shared_examples_for "revoking users" do |params|
+  context "when there are valid emails" do
+    it "creates notice message" do
+      create(
+        :authorization,
+        :granted,
+        name: verification_type,
+        user: authorized_user
+      )
+      perform_enqueued_jobs do
+        post :create, params: params
+        expect(flash[:notice]).not_to be_empty
+        expect(flash[:notice]).to include("1 detected")
+        expect(flash[:notice]).to include("0 errors")
+        expect(flash[:notice]).to include("1 users")
+        expect(flash[:notice]).to include("revoked")
+      end
+    end
+  end
+end

data/lib/decidim/direct_verifications/user_processor.rb

@@ -3,16 +3,17 @@
 module Decidim
   module DirectVerifications
     class UserProcessor
-      def initialize(organization, current_user)
+      def initialize(organization, current_user, session)
         @organization = organization
         @current_user = current_user
         @authorization_handler = :direct_verifications
         @errors = { registered: [], authorized: [], revoked: [] }
         @processed = { registered: [], authorized: [], revoked: [] }
         @emails = {}
+        @session = session
       end
 
-      attr_reader :organization, :current_user, :errors, :processed, :emails
+      attr_reader :organization, :current_user, :session, :errors, :processed, :emails
       attr_accessor :authorization_handler
 
       def emails=(email_list)
@@ -22,6 +23,7 @@ module Decidim
       def register_users
         @emails.each do |email, name|
           next if find_user(email)
+
           form = register_form(email, name)
           begin
             InviteUser.call(form) do
@@ -44,7 +46,8 @@ module Decidim
           if (u = find_user(email))
             auth = authorization(u)
             next unless !auth.granted? || auth.expired?
-            Verification::ConfirmUserAuthorization.call(auth, authorize_form(u)) do
+
+            Verification::ConfirmUserAuthorization.call(auth, authorize_form(u), session) do
               on(:ok) do
                 add_processed :authorized, email
               end
@@ -63,6 +66,7 @@ module Decidim
           if (u = find_user(email))
             auth = authorization(u)
             next unless auth.granted?
+
             Verification::DestroyUserAuthorization.call(auth) do
               on(:ok) do
                 add_processed :revoked, email

data/lib/decidim/direct_verifications/user_stats.rb

@@ -39,7 +39,7 @@ module Decidim
         if authorization_handler.empty?
           filter = { decidim_organization_id: organization.id }
           filter[:email] = emails unless emails.empty?
-          return User.where(filter)
+          return User.where(filter).where.not(email: "")
         end
         authorized_users(false)
       end
@@ -53,19 +53,22 @@ module Decidim
             q = q.where("decidim_authorizations.granted_at >= :date", date: Time.current - expires_in) if expires_in
           end
         end
-        q = q.where("decidim_users.decidim_organization_id=:org", org: organization.id)
+        q = q.where("decidim_users.decidim_organization_id=:org and decidim_users.email!=''", org: organization.id)
         return q if emails.empty?
+
         q.where("decidim_users.email IN (:emails)", emails: emails)
       end
 
       def expires_in
         return unless workflow_manifest
         return if workflow_manifest.expires_in.zero?
+
         workflow_manifest.expires_in
       end
 
       def workflow_manifest
         return if authorization_handler.empty?
+
         @workflow_manifest ||= Decidim::Verifications.find_workflow_manifest(authorization_handler)
       end
     end

data/lib/decidim/direct_verifications/version.rb

@@ -3,7 +3,8 @@
 module Decidim
   # This holds the decidim-direct_verifications version.
   module DirectVerifications
-    VERSION = "0.17.7"
-    DECIDIM_VERSION = ">= 0.17.0"
+    VERSION = "0.22.1"
+    DECIDIM_VERSION = "0.22"
+    MIN_DECIDIM_VERSION = ">= 0.22.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-direct_verifications
 version: !ruby/object:Gem::Version
-  version: 0.17.7
+  version: 0.22.1
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.22.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:
@@ -66,6 +66,7 @@ files:
 - config/locales/es.yml
 - lib/decidim/direct_verifications.rb
 - lib/decidim/direct_verifications/config.rb
+- lib/decidim/direct_verifications/tests/verification_controller_examples.rb
 - lib/decidim/direct_verifications/user_processor.rb
 - lib/decidim/direct_verifications/user_stats.rb
 - lib/decidim/direct_verifications/verification.rb