decidim-direct_verifications 0.22.1 → 1.0

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "decidim/core/test/factories"
+
+FactoryBot.modify do
+  factory :authorization do
+    trait :direct_verification do
+      name { "direct_verifications" }
+    end
+  end
+end

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

@@ -2,8 +2,9 @@
 
 shared_examples_for "checking users" do |params|
   context "when check without mails" do
+    before { params[:userslist] = "" }
+
     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
@@ -14,8 +15,9 @@ shared_examples_for "checking users" do |params|
   end
 
   context "when check with mails" do
+    before { params[:userslist] = "mail@example.com" }
+
     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
@@ -58,13 +60,16 @@ end
 
 shared_examples_for "revoking users" do |params|
   context "when there are valid emails" do
-    it "creates notice message" do
+    before do
       create(
         :authorization,
         :granted,
         name: verification_type,
         user: authorized_user
       )
+    end
+
+    it "creates notice message" do
       perform_enqueued_jobs do
         post :create, params: params
         expect(flash[:notice]).not_to be_empty

data/lib/decidim/direct_verifications/user_processor.rb

@@ -1,131 +1,47 @@
 # frozen_string_literal: true
 
+require "decidim/direct_verifications/register_user"
+require "decidim/direct_verifications/authorize_user"
+require "decidim/direct_verifications/revoke_user"
+require "decidim/direct_verifications/instrumenter"
+
 module Decidim
   module DirectVerifications
     class UserProcessor
-      def initialize(organization, current_user, session)
+      def initialize(organization, current_user, session, instrumenter)
         @organization = organization
         @current_user = current_user
         @authorization_handler = :direct_verifications
-        @errors = { registered: [], authorized: [], revoked: [] }
-        @processed = { registered: [], authorized: [], revoked: [] }
+
         @emails = {}
         @session = session
+        @instrumenter = instrumenter
       end
 
-      attr_reader :organization, :current_user, :session, :errors, :processed, :emails
-      attr_accessor :authorization_handler
-
-      def emails=(email_list)
-        @emails = email_list.map { |k, v| [k.to_s.downcase, v.presence || k.split("@").first] }.to_h
-      end
+      attr_reader :organization, :current_user, :session, :errors, :processed
+      attr_accessor :authorization_handler, :emails
 
       def register_users
-        @emails.each do |email, name|
-          next if find_user(email)
-
-          form = register_form(email, name)
-          begin
-            InviteUser.call(form) do
-              on(:ok) do
-                add_processed :registered, email
-                log_action find_user(email)
-              end
-              on(:invalid) do
-                add_error :registered, email
-              end
-            end
-          rescue StandardError
-            add_error :registered, email
-          end
+        emails.each do |email, data|
+          RegisterUser.new(email, data, organization, current_user, instrumenter).call
         end
       end
 
       def authorize_users
-        @emails.each do |email, _name|
-          if (u = find_user(email))
-            auth = authorization(u)
-            next unless !auth.granted? || auth.expired?
-
-            Verification::ConfirmUserAuthorization.call(auth, authorize_form(u), session) do
-              on(:ok) do
-                add_processed :authorized, email
-              end
-              on(:invalid) do
-                add_error :authorized, email
-              end
-            end
-          else
-            add_error :authorized, email
-          end
+        emails.each do |email, data|
+          AuthorizeUser.new(email, data, session, organization, instrumenter, authorization_handler).call
         end
       end
 
       def revoke_users
-        @emails.each do |email, _name|
-          if (u = find_user(email))
-            auth = authorization(u)
-            next unless auth.granted?
-
-            Verification::DestroyUserAuthorization.call(auth) do
-              on(:ok) do
-                add_processed :revoked, email
-              end
-              on(:invalid) do
-                add_error :revoked, email
-              end
-            end
-          else
-            add_error :revoked, email
-          end
+        emails.each do |email, _name|
+          RevokeUser.new(email, organization, instrumenter, authorization_handler).call
         end
       end
 
       private
 
-      def find_user(email)
-        User.find_by(email: email, decidim_organization_id: @organization.id)
-      end
-
-      def register_form(email, name)
-        OpenStruct.new(name: name.presence || email.split("@").first,
-                       email: email.downcase,
-                       organization: organization,
-                       admin: false,
-                       invited_by: current_user,
-                       invitation_instructions: "direct_invite")
-      end
-
-      def authorization(user)
-        Authorization.find_or_initialize_by(
-          user: user,
-          name: authorization_handler
-        )
-      end
-
-      def authorize_form(user)
-        Verification::DirectVerificationsForm.new(email: user.email, name: user.name)
-      end
-
-      def add_processed(type, email)
-        @processed[type] << email unless @processed[type].include? email
-      end
-
-      def add_error(type, email)
-        @errors[type] << email unless @errors[type].include? email
-      end
-
-      def log_action(user)
-        Decidim.traceability.perform_action!(
-          "invite",
-          user,
-          current_user,
-          extra: {
-            invited_user_role: "participant",
-            invited_user_id: user.id
-          }
-        )
-      end
+      attr_reader :instrumenter
     end
   end
 end

data/lib/decidim/direct_verifications/user_stats.rb

@@ -22,7 +22,7 @@ module Decidim
       end
 
       def unconfirmed
-        registered_users.where("decidim_users.confirmed_at IS NULL").count
+        registered_users.where(decidim_users: { confirmed_at: nil }).count
       end
 
       def authorized
@@ -30,7 +30,7 @@ module Decidim
       end
 
       def authorized_unconfirmed
-        authorized_users.where("decidim_users.confirmed_at IS NULL").count
+        authorized_users.where(decidim_users: { confirmed_at: nil }).count
       end
 
       private
@@ -41,10 +41,10 @@ module Decidim
           filter[:email] = emails unless emails.empty?
           return User.where(filter).where.not(email: "")
         end
-        authorized_users(false)
+        authorized_users(strict: false)
       end
 
-      def authorized_users(strict = true)
+      def authorized_users(strict: true)
         q = Decidim::Authorization.joins(:user)
         unless authorization_handler.empty?
           q = q.where(name: authorization_handler)
@@ -56,7 +56,7 @@ module Decidim
         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)
+        q.where(decidim_users: { email: emails })
       end
 
       def expires_in

data/lib/decidim/direct_verifications/verification/admin_engine.rb

@@ -10,12 +10,17 @@ module Decidim
         routes do
           resources :direct_verifications, only: [:index, :create, :stats]
           resources :stats, only: [:index]
+          resources :authorizations, only: [:index, :destroy]
+          resources :imports, only: [:new, :create]
 
           root to: "direct_verifications#index"
         end
 
         initializer "decidim_direct_verifications.admin_assets" do |app|
-          app.config.assets.precompile += %w(direct_verifications_admin_manifest.js)
+          app.config.assets.precompile += %w(
+            direct_verifications_admin_manifest.js
+            direct_verifications_admin_manifest.css
+          )
         end
       end
     end

data/lib/decidim/direct_verifications/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-direct_verifications
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: '1.0'
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2021-07-09 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.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.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:
@@ -49,23 +49,51 @@ files:
 - LICENSE-AGPLv3.txt
 - README.md
 - Rakefile
+- app/assets/config/direct_verifications_admin_manifest.css
 - app/assets/config/direct_verifications_admin_manifest.js
 - app/assets/javascripts/decidim/direct_verifications/verification/admin/direct_verifications_admin.js.es6
+- app/assets/stylesheets/decidim/direct_verifications/authorizations.scss
 - app/commands/decidim/direct_verifications/verification/confirm_user_authorization.rb
+- app/commands/decidim/direct_verifications/verification/create_import.rb
 - app/commands/decidim/direct_verifications/verification/destroy_user_authorization.rb
+- app/controllers/decidim/direct_verifications/verification/admin/authorizations_controller.rb
 - app/controllers/decidim/direct_verifications/verification/admin/direct_verifications_controller.rb
+- app/controllers/decidim/direct_verifications/verification/admin/imports_controller.rb
 - app/controllers/decidim/direct_verifications/verification/admin/stats_controller.rb
 - app/controllers/decidim/direct_verifications/verification/authorizations_controller.rb
+- app/forms/decidim/direct_verifications/registration_form.rb
+- app/forms/decidim/direct_verifications/verification/create_import_form.rb
 - app/forms/decidim/direct_verifications/verification/direct_verifications_form.rb
+- app/jobs/decidim/direct_verifications/authorize_users_job.rb
+- app/jobs/decidim/direct_verifications/base_import_job.rb
+- app/jobs/decidim/direct_verifications/register_users_job.rb
+- app/jobs/decidim/direct_verifications/revoke_users_job.rb
+- app/mailers/decidim/direct_verifications/import_mailer.rb
+- app/mailers/decidim/direct_verifications/stats.rb
+- app/views/decidim/direct_verifications/import_mailer/finished_processing.html.erb
+- app/views/decidim/direct_verifications/import_mailer/finished_processing.text.erb
+- app/views/decidim/direct_verifications/verification/admin/authorizations/index.html.erb
 - app/views/decidim/direct_verifications/verification/admin/direct_verifications/index.html.erb
+- app/views/decidim/direct_verifications/verification/admin/imports/new.html.erb
 - app/views/decidim/direct_verifications/verification/admin/stats/index.html.erb
 - app/views/devise/mailer/direct_invite.html.erb
 - app/views/devise/mailer/direct_invite.text.erb
+- config/initializers/mail_previews.rb
 - config/locales/ca.yml
+- config/locales/cs.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/fr.yml
 - lib/decidim/direct_verifications.rb
-- lib/decidim/direct_verifications/config.rb
+- lib/decidim/direct_verifications/authorize_user.rb
+- lib/decidim/direct_verifications/instrumenter.rb
+- lib/decidim/direct_verifications/parsers.rb
+- lib/decidim/direct_verifications/parsers/base_parser.rb
+- lib/decidim/direct_verifications/parsers/metadata_parser.rb
+- lib/decidim/direct_verifications/parsers/name_parser.rb
+- lib/decidim/direct_verifications/register_user.rb
+- lib/decidim/direct_verifications/revoke_user.rb
+- lib/decidim/direct_verifications/tests/factories.rb
 - lib/decidim/direct_verifications/tests/verification_controller_examples.rb
 - lib/decidim/direct_verifications/user_processor.rb
 - lib/decidim/direct_verifications/user_stats.rb
@@ -87,14 +115,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      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.4
 signing_key: 
 specification_version: 4
 summary: A decidim batch direct registration and verification module

data/lib/decidim/direct_verifications/config.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module DirectVerifications
-    class << self
-      attr_accessor :config
-      def configure
-        yield self.config ||= Config.new
-      end
-    end
-
-    class Config
-      attr_reader :manage_workflows
-      def manage_workflows=(manage_workflows)
-        @manage_workflows.concat(manage_workflows).uniq!
-      end
-
-      def initialize
-        @manage_workflows = ["direct_verifications"]
-      end
-    end
-  end
-end