decidim-idcat_mobil 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a927c46e7526679976cc90ba4177fab538391701909048db1e633833812c739
-  data.tar.gz: 6e4daa2b14aac1694f959394a35eafe44a6e9ea7e9fafa6fc88892610885fa9e
+  metadata.gz: 1c8aa5a39998d9667154240a66c8bb92a97d399a567af9d6efd42abe2a8f4ca9
+  data.tar.gz: 1b7ad428aac1cb7fef51ee494f3d739e9102b47b8a9c56038756fbf8272bced8
 SHA512:
-  metadata.gz: e61b85ffc84b1a35a04e718736115c51363f330911b78d4b0a06477598c17fd1b97745c30e7ddf344fdaaeccb8d6ae84ce9ee3dd08f4d72da781bcc27fd34ef0
-  data.tar.gz: 742948914bdc94ce92ceecefcfd2659647412440c49b480f3a20e996f252c5a38fb400285c39064a452c708240c108b23f947bcd979dd9a979b6813b792319bf
+  metadata.gz: 4805fdc8c0d6592d9f0716a68a0ff07b61c5e799fe93901b3b8be0bbb0e85021f770bdd8745cdcdd1651ba5a26157e3ce16cbf36c9fa8d9436a930fcd1a5f5e6
+  data.tar.gz: 8e09a5186316beaaf46d16c2ac212440f77f93b6652c345b6dd8fcbaaed846c247e3f85e3a60cb98daec02a60b1ff3b7fb1df13eea47066c9a5bd6f41ce5f9f6

data/README.md

@@ -3,7 +3,7 @@
 User registration and login through IdCat Mòbil, an authentication method that uses OAuth 2.0 protocol.
 _IdCat mòbil_ is an identity validator from VÀLid (Validador d'Identitats del Consorci AOC).
 
-User verification via IdCat Mòbil was started but is incomplete.
+User is also verified with a VÀLid authorization.
 
 ## Installation
 
@@ -19,6 +19,13 @@ And then execute:
 bundle install
 ```
 
+Verifications by default will expire after 90 days but optionally you can set it to your needs by setting the `VERIFICATION_EXPIRATION_TIME` environment variable.
+
+```bash
+# change default value from 90 days to a whole year
+VERIFICATION_EXPIRATION_TIME=365
+```
+
 ## Usage
 
 To use it you have to first configure the omniauth-idcat_mobil.

data/app/events/decidim/idcat_mobil/verification_invalid_notification.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module IdcatMobil

data/app/events/decidim/idcat_mobil/verification_success_notification.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module IdcatMobil

data/app/forms/decidim/verifications/{id_cat_mobil_handler.rb → valid_handler.rb}

@@ -2,8 +2,8 @@
 
 module Decidim
   module Verifications
-    # A Handler form object that just holds OAuth2 data provided by AOC when performing "IdCat mòbil" authentication.
-    class IdCatMobilHandler < AuthorizationHandler
+    # A Handler form object that just holds OAuth2 data provided by AOC when performing "VÀLid" authentication.
+    class ValidHandler < AuthorizationHandler
       attribute :oauth_data, Hash
 
       validates :unique_id, presence: true
@@ -18,7 +18,11 @@ module Decidim
       end
 
       def user
-        Decidim::User.find(oauth_data[:user_id])
+        Decidim::User.find_by(id: oauth_data[:user_id])
+      end
+
+      def to_partial_path
+        "decidim/valid/verifications/form"
       end
 
       #-----------------------------------------------------------
@@ -29,14 +33,14 @@ module Decidim
       def idcatmobil_method?
         return true if oauth_data["method"] == "idcatmobil"
 
-        errors.add(:base, I18n.t("decidim.verifications.idcat_mobil.errors.invalid_method"))
+        errors.add(:base, I18n.t("decidim.verifications.valid.errors.invalid_method"))
         false
       end
 
       def has_ok_status?
         return true if oauth_data["status"] == "ok"
 
-        errors.add(:base, I18n.t("decidim.verifications.idcat_mobil.errors.invalid_status"))
+        errors.add(:base, I18n.t("decidim.verifications.valid.errors.invalid_status"))
         false
       end
     end

data/app/jobs/decidim/{idcat_mobil → valid}/application_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  module IdcatMobil
+  module Valid
     class ApplicationJob < ActiveJob::Base
     end
   end

data/app/jobs/decidim/{idcat_mobil → valid}/verification_job.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 module Decidim
-  module IdcatMobil
+  module Valid
     class VerificationJob < ApplicationJob
       queue_as :default
 
       def perform(oauth_data)
+        authorization ||= Decidim::Authorization.find_by(unique_id: handler.unique_id)
+        return if authorization&.granted?
+
         handler = retrieve_handler(oauth_data)
         Decidim::Verifications::AuthorizeUser.call(handler) do
           on(:ok) do
@@ -25,7 +28,7 @@ module Decidim
 
       # Retrieves handler from Verification workflows registry.
       def retrieve_handler(oauth_data)
-        Decidim::AuthorizationHandler.handler_for("idcat_mobil", oauth_data: oauth_data)
+        Decidim::AuthorizationHandler.handler_for(:valid, oauth_data:)
       end
 
       def notify_user(user, status, handler)
@@ -36,7 +39,7 @@ module Decidim
           # resource: result,
           recipient_ids: [user.id],
           extra: {
-            status: status,
+            status:,
             errors: handler.errors.full_messages
           }
         )

data/app/packs/entrypoints/decidim-idcat_mobil.js

@@ -1,2 +1,4 @@
 // Images
 require.context("../images", true)
+
+import "entrypoints/decidim_valid_idcat_mobil.scss";

data/app/packs/entrypoints/decidim_valid_idcat_mobil.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/valid_idcat_mobil";

data/app/packs/stylesheets/decidim/valid_idcat_mobil.scss

@@ -0,0 +1,11 @@
+.social-register,.cancel {
+  margin: 2em 3em;
+}
+
+.actions {
+  display: none;
+}
+
+.skip {
+  display: none;
+}

data/app/views/decidim/valid/verifications/_form.html.erb

@@ -0,0 +1,29 @@
+<%
+  provider_str = t("decidim.authorization_handlers.valid_handler.name")
+%>
+<% if Devise.mappings[:user].omniauthable? && current_organization.enabled_omniauth_providers.dig(:idcat_mobil, :enabled) %>
+
+  <h5><%= t("decidim.authorization_handlers.trusted_ids_handler.explanation") %></h5>
+
+  <p><%= t(".description_html", provider: provider_str, link: t("devise.shared.links.log_in_with_provider", provider: provider_str)) %></p>
+  <div class="callout secondary"><%= t(".warning_html", email: current_user.email, provider: provider_str) %></div>
+
+  <div class="social-register">
+    <%= link_to decidim.send("user_idcat_mobil_omniauth_authorize_path"), class: "button button--social button--#{normalize_provider_name(idcat_mobil)}", method: :post do %>
+      <span class="button--social__icon">
+        <%= oauth_icon provider %>
+      </span>
+      <span class="button--social__text">
+        <%= t("devise.shared.links.log_in_with_provider", provider: provider_str) %>
+      </span>
+    <% end %>
+  </div>
+<% else %>
+  <p><%= t(".error_provider_html", provider: provider_str) %></p>
+<% end %>
+
+<div class="cancel">
+  <%= form.submit t(".cancel"), class: "button expanded secondary hollow" %>
+</div>
+
+<%= append_stylesheet_pack_tag "valid_idcat_mobil" %>

data/config/locales/ca.yml

@@ -1,14 +1,18 @@
 ---
 ca:
   decidim:
-    components:
-      idcat_mobil:
-        name: IdCat Mòbil
+    authorization_handlers:
+      valid_handler:
+        name: VÀLid
+      valid:
+        explanation: Verificació d'identitat a través de VÀLid
+        name: VÀLid
     verifications:
-      idcat_mobil:
+      valid:
         errors:
           invalid_method: No us heu pogut verificar. El mètode de verificació OAuth2 no era "idcat_mobil" tal com s'esperava.
           invalid_status: No us heu pogut verificar. La verificació OAuth2 ha estat correcta.
+      idcat_mobil:
         invalid:
           email_intro: No s'ha pogut concedir l'autorització d'IdCat Mòbil.
           email_outro: Si us plau, poseu-vos en contacte amb el suport de la vostra plataforma per comprovar l'error que s'ha produït.

data/config/locales/en.yml

@@ -1,14 +1,18 @@
 ---
 en:
   decidim:
-    components:
-      idcat_mobil:
-        name: IdCat Mòbil
+    authorization_handlers:
+      valid_handler:
+        name: VÀLid
+      valid:
+        explanation: Identity verification through VÀLid
+        name: VÀLid
     verifications:
-      idcat_mobil:
+      valid:
         errors:
           invalid_method: Could not verify you. OAuth2 verification method was not 'idcat_mobil' as expected.
           invalid_status: Could not verify you. OAuth2 verification was not ok.
+      idcat_mobil:
         invalid:
           email_intro: It has not been possible to grant you the IdCat Mòbil authorization.
           email_outro: Please, contact the support at your platform to check what has gone wrong.

data/config/locales/es.yml

@@ -1,14 +1,18 @@
 ---
 es:
   decidim:
-    components:
-      idcat_mobil:
-        name: IdCat Mòbil
+    authorization_handlers:
+      valid_handler:
+        name: VÀLid
+      valid:
+        explanation: Verificación de identidad a través de VÀLid
+        name: VÀLid
     verifications:
-      idcat_mobil:
+      valid:
         errors:
           invalid_method: No se pudo verificar. El método de verificación OAuth2 no fue 'idcat_mobil' como se esperaba.
           invalid_status: No se pudo verificar. La verificación OAuth2 no ha sido correcta.
+      idcat_mobil:
         invalid:
           email_intro: No ha sido posible otorgarle la autorización IdCat Mòbil.
           email_outro: Por favor, póngase en contacto con el soporte en su plataforma para comprobar qué ha fallado.

data/config/locales/oc.yml

@@ -1,14 +1,18 @@
 ---
 oc:
   decidim:
-    components:
-      idcat_mobil:
-        name: IdCat Mòbil
+    authorization_handlers:
+      valid_handler:
+        name: VÀLid
+      valid:
+        explanation: Verificació d'identitat a través de VÀLid
+        name: VÀLid
     verifications:
-      idcat_mobil:
+      valid:
         errors:
           invalid_method: No vos auetz pogut verificar. Eth metòde de verificacion OAuth2 non ère "idcat_mobil" tau coma se demoraue.
           invalid_status: No vos auetz pogut verificar. Era verificacion OAuth2 a estat corrècta.
+      idcat_mobil:
         invalid:
           email_intro: Non s'a pogut concedir era autorizacion de IdCat Mòbil.
           email_outro: Se vos platz, metetz-vos eth contacte damb eth supòrt dera vòsta plataforma entà verificar er error que s'a produsit.

data/lib/decidim/idcat_mobil/engine.rb

@@ -16,6 +16,13 @@ module Decidim
         # root to: "idcat_mobil#index"
       end
 
+      initializer "decidim_valid.authorizations" do
+        # Triggers user verification after login/registration
+        ActiveSupport::Notifications.subscribe "decidim.user.omniauth_registration" do |_name, data|
+          Decidim::Valid::OnOmniauthRegistrationListener.on_omniauth_registration(data)
+        end
+      end
+
       initializer "decidim_idcat_mobil.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end

data/lib/decidim/idcat_mobil/version.rb

@@ -4,11 +4,11 @@ module Decidim
   module IdcatMobil
     def self.version
       # See CHANGELOG.md to see what changed
-      "0.4.0"
+      "0.7.0"
     end
 
     def self.decidim_version
-      "0.27.0"
+      "0.29.0"
     end
   end
 end

data/lib/decidim/idcat_mobil.rb

@@ -3,12 +3,25 @@
 require "decidim/admin"
 require "decidim/verifications"
 
-require "decidim/idcat_mobil/on_omniauth_registration_listener"
 require "decidim/idcat_mobil/engine"
+require "decidim/valid/on_omniauth_registration_listener"
 
 module Decidim
   # This namespace holds the logic of the `IdcatMobil` component. This component
   # allows users to create idcat_mobil in a participatory space.
   module IdcatMobil
   end
+
+  # The VÀLid module is only used for the user Verification.
+  module Valid
+    include ActiveSupport::Configurable
+
+    # how long the verification will be valid, defaults to 90 days
+    # if empty or nil, the verification will never expire
+    config_accessor :verification_expiration_time do
+      ENV.fetch("VERIFICATION_EXPIRATION_TIME", 90).to_i.days
+    end
+  end
 end
+
+require "decidim/valid/workflow"

data/lib/decidim/{idcat_mobil → valid}/on_omniauth_registration_listener.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  module IdcatMobil
+  module Valid
     #
     # Simply delegates the management of verifying IdCat mòbil to the VerificationJob.
     #

data/lib/decidim/valid/workflow.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Verify the user with a VÀLid authentication when registered via OAuth
+Decidim::Verifications.register_workflow(:valid) do |workflow|
+  workflow.form = "Decidim::Verifications::ValidHandler"
+  workflow.expires_in = Decidim::Valid.verification_expiration_time.to_i
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-idcat_mobil
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Oliver Valls
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-26 00:00:00.000000000 Z
+date: 2026-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim
@@ -16,56 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: omniauth-idcat_mobil
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: decidim-dev
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.6.0
 description: User registration, login and verification though VÀLid's IdCat mòbil..
 email:
 - oliver.vh@coditramuntana.com
@@ -80,13 +66,16 @@ files:
 - app/controllers/decidim/idcat_mobil/application_controller.rb
 - app/events/decidim/idcat_mobil/verification_invalid_notification.rb
 - app/events/decidim/idcat_mobil/verification_success_notification.rb
-- app/forms/decidim/verifications/id_cat_mobil_handler.rb
+- app/forms/decidim/verifications/valid_handler.rb
 - app/helpers/decidim/idcat_mobil/application_helper.rb
-- app/jobs/decidim/idcat_mobil/application_job.rb
-- app/jobs/decidim/idcat_mobil/verification_job.rb
+- app/jobs/decidim/valid/application_job.rb
+- app/jobs/decidim/valid/verification_job.rb
 - app/models/decidim/idcat_mobil/application_record.rb
 - app/packs/entrypoints/decidim-idcat_mobil.js
+- app/packs/entrypoints/decidim_valid_idcat_mobil.scss
 - app/packs/images/idcat_mobil-icon.svg
+- app/packs/stylesheets/decidim/valid_idcat_mobil.scss
+- app/views/decidim/valid/verifications/_form.html.erb
 - config/assets.rb
 - config/i18n-tasks.yml
 - config/initializers/omniauth_idcat_mobil.rb
@@ -95,13 +84,11 @@ files:
 - config/locales/es.yml
 - config/locales/oc.yml
 - lib/decidim/idcat_mobil.rb
-- lib/decidim/idcat_mobil/admin.rb
-- lib/decidim/idcat_mobil/admin_engine.rb
-- lib/decidim/idcat_mobil/component.rb
 - lib/decidim/idcat_mobil/engine.rb
-- lib/decidim/idcat_mobil/on_omniauth_registration_listener.rb
 - lib/decidim/idcat_mobil/test/factories.rb
 - lib/decidim/idcat_mobil/version.rb
+- lib/decidim/valid/on_omniauth_registration_listener.rb
+- lib/decidim/valid/workflow.rb
 homepage: https://github.com/decidim/decidim-idcat_mobil
 licenses:
 - AGPL-3.0
@@ -115,14 +102,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.6
+      version: 3.2.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A decidim idcat_mobil module

data/lib/decidim/idcat_mobil/admin.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-# # frozen_string_literal: true
-
-# module Decidim
-#   module IdcatMobil
-#     # This module contains all the domain logic associated to Decidim's IdcatMobil
-#     # component admin panel.
-#     module Admin
-#     end
-#   end
-# end

data/lib/decidim/idcat_mobil/admin_engine.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-# # frozen_string_literal: true
-
-# module Decidim
-#   module IdcatMobil
-#     # This is the engine that runs on the public interface of `IdcatMobil`.
-#     class AdminEngine < ::Rails::Engine
-#       isolate_namespace Decidim::IdcatMobil::Admin
-
-#       paths["db/migrate"] = nil
-#       paths["lib/tasks"] = nil
-
-#       routes do
-#         # Add admin engine routes here
-#         # resources :idcat_mobil do
-#         #   collection do
-#         #     resources :exports, only: [:create]
-#         #   end
-#         # end
-#         # root to: "idcat_mobil#index"
-#       end
-
-#       def load_seed
-#         nil
-#       end
-#     end
-#   end
-# end

data/lib/decidim/idcat_mobil/component.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-# # frozen_string_literal: true
-
-# require_dependency "decidim/components/namer"
-
-# Decidim.register_component(:idcat_mobil) do |component|
-#   component.engine = Decidim::IdcatMobil::Engine
-#   component.admin_engine = Decidim::IdcatMobil::AdminEngine
-#   component.icon = "decidim/idcat_mobil/icon.svg"
-
-#   # component.on(:before_destroy) do |instance|
-#   #   # Code executed before removing the component
-#   # end
-
-#   # These actions permissions can be configured in the admin panel
-#   # component.actions = %w()
-
-#   # component.settings(:global) do |settings|
-#   #   # Add your global settings
-#   #   # Available types: :integer, :boolean
-#   #   # settings.attribute :vote_limit, type: :integer, default: 0
-#   # end
-
-#   # component.settings(:step) do |settings|
-#   #   # Add your settings per step
-#   # end
-
-#   # component.register_resource(:some_resource) do |resource|
-#   #   # Register a optional resource that can be references from other resources.
-#   #   resource.model_class_name = "Decidim::IdcatMobil::SomeResource"
-#   #   resource.template = "decidim/idcat_mobil/some_resources/linked_some_resources"
-#   # end
-
-#   # component.register_stat :some_stat do |context, start_at, end_at|
-#   #   # Register some stat number to the application
-#   # end
-
-#   # component.seeds do |participatory_space|
-#   #   # Add some seeds for this component
-#   # end
-# end