decidim-trusted_ids 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2add148a8358a933c509c5e86641e8f067f44e7d6d0f890652dc59e233e336f1
-  data.tar.gz: 516b88091bf1caa1105eb4d3c3374c1e1743a48e4e9230db0a2843f0e371d83d
+  metadata.gz: 1b7f4bc28edbb47bd7dc527d03d4d7e1f24dc93dc499c5c3b182193f5d9cfc4c
+  data.tar.gz: 95cd5a3983405d107072f2c1a847899ce69a1a0b6b59d8ab6a94b5a3627900ab
 SHA512:
-  metadata.gz: 844a68f0ffe486b8f4c98606e05800b586a91a4c01360c5b924d67bf5f1a429321c646c4623cf2fdc42120fbeb9dd6b85b232daf613148811feb2dbc62fb16f5
-  data.tar.gz: bc7c4a6275fb737551f1a3e0fa73544abaa49808449f28c5dd7a7542bba604fd8f03227beb8cff72bea240fe6420145726f6e24b1fe2dd196cca845191524230
+  metadata.gz: 71c723aa05ab5f68ede805083abf98c138805f83241b440236088206c4a0f0b4fa9235ff3b4d39007c38a9a8ca7a2922b56321d3d30820886380177a0c11ffd4
+  data.tar.gz: 8d92bd7edc4eba33035e2109e94f6f47c3756c3a43e6d68eb5351126ee6db79fadd6135823029c968022ec1d0706496cf50211efcd0b1eb010fb6b5e8c2e135d

data/README.md

@@ -1,4 +1,4 @@
-# Decidim :: Trusted IDs
+# Decidim :: Authenticated identities for the public sector
 
 [![[CI] Lint](https://github.com/ConsorciAOC-PRJ/decidim-module-trusted-ids/actions/workflows/lint.yml/badge.svg)](https://github.com/ConsorciAOC-PRJ/decidim-module-trusted-ids/actions/workflows/lint.yml)
 [![[CI] Test](https://github.com/ConsorciAOC-PRJ/decidim-module-trusted-ids/actions/workflows/test.yml/badge.svg)](https://github.com/ConsorciAOC-PRJ/decidim-module-trusted-ids/actions/workflows/test.yml)
@@ -170,21 +170,25 @@ If you are using a different source for your settings, you can also configure th
 For instance, create a file `config/initializers/decidim_trusted_ids.rb` with the following content:
 
 ```ruby
-Decidim::TrustedIds.configure do |config|
-  # The name of the omniauth provider, must be registered in Decidim.
-  config.omniauth_provider = "valid"
-  config.omniauth = {
-    enabled: true,
-    client_id: "my-client-id",
-    client_secret: "my-client-secret",
-    site: "https://valid.aoc.cat",
-    scope: "autenticacio_usuari",
-    icon: "media/images/valid-icon.png"
-  },
-  ...
-end
+Decidim::TrustedIds.omniauth_provider = "valid"
+Decidim::TrustedIds.omniauth = {
+  enabled: true,
+  client_id: "my-client-id",
+  client_secret: "my-client-secret",
+  site: "https://valid.aoc.cat",
+  scope: "autenticacio_usuari",
+  icon_path: "media/images/valid-icon.png"
+}
+Decidim::TrustedIds.census_authorization = {
+  handler: :via_oberta_handler,
+  form: "Decidim::ViaOberta::Verifications::ViaObertaHandler",
+  env: "production",
+  system_attributes: %w(nif ine municipal_code province_code organization_name)
+}
 ```
 
+Set only the values you need to override. The available settings are the accessors defined in [`lib/decidim/trusted_ids.rb`](lib/decidim/trusted_ids.rb); assign them directly on `Decidim::TrustedIds` as shown above.
+
 For the complete list of available options, see the [trusted_ids](lib/decidim/trusted_ids.rb) file.
 
 ### Screenshots

data/app/commands/concerns/decidim/trusted_ids/system/needs_census_config.rb

@@ -8,7 +8,7 @@ module Decidim
 
         included do
           def save_census_config!(organization)
-            conf = Decidim::TrustedIds::OrganizationConfig.find_or_initialize_by(organization: organization)
+            conf = Decidim::TrustedIds::OrganizationConfig.find_or_initialize_by(organization:)
             conf.handler = TrustedIds.census_authorization[:handler]
             return if conf.handler.blank?
 

data/app/controllers/concerns/decidim/trusted_ids/admin/impersonations_controller_override.rb

@@ -13,13 +13,13 @@ module Decidim
           helper Decidim::OmniauthHelper
 
           # the internal 1st step verification shouldn't be used for impersonations as it is linked with an OAuth login
-          def other_available_authorization_handlers
+          def other_available_authorization_handlers # rubocop:disable Decidim/EnforcePermissionTo
             Decidim::Verifications::Adapter.from_collection(
               current_organization.available_authorization_handlers - [handler_name, "trusted_ids_handler"]
             )
           end
 
-          def available_authorization_handlers
+          def available_authorization_handlers # rubocop:disable Decidim/EnforcePermissionTo
             Decidim::Verifications::Adapter.from_collection(
               current_organization.available_authorization_handlers - ["trusted_ids_handler"]
             )

data/app/controllers/concerns/decidim/trusted_ids/check_omniauth_email_on_login.rb

@@ -17,7 +17,7 @@ module Decidim
           return if current_user.email == verified_email
 
           flash[:alert] = I18n.t("decidim.trusted_ids.sessions.different_omniauth_emails")
-          redirect_back fallback_location: account_path
+          redirect_back_or_to(account_path)
         end
       end
     end

data/app/forms/decidim/trusted_ids/verifications/trusted_ids_handler.rb

@@ -14,8 +14,8 @@ module Decidim
 
         def metadata
           super.merge(
-            uid: uid,
-            provider: provider,
+            uid:,
+            provider:,
             extra: extra_attributes
           )
         end

data/app/forms/decidim/via_oberta/verifications/via_oberta_handler.rb

@@ -59,7 +59,7 @@ module Decidim
         end
 
         def census_response
-          @census_response ||= ViaOberta::Api::Request.new(document_id: document_id, document_type: document_type, organization: organization).response
+          @census_response ||= ViaOberta::Api::Request.new(document_id:, document_type:, organization:).response
         end
 
         def existing_via_oberta_identity
@@ -91,7 +91,7 @@ module Decidim
         end
 
         def trusted_authorization
-          @trusted_authorization ||= Decidim::Authorization.find_by(name: "trusted_ids_handler", user: user)
+          @trusted_authorization ||= Decidim::Authorization.find_by(name: "trusted_ids_handler", user:)
         end
 
         def organization

data/app/jobs/decidim/trusted_ids/omniauth_verification_job.rb

@@ -34,7 +34,7 @@ module Decidim
       end
 
       def handler
-        @handler ||= Decidim::AuthorizationHandler.handler_for("trusted_ids_handler", user: user, uid: data[:uid], provider: data[:provider], raw_data: data[:raw_data])
+        @handler ||= Decidim::AuthorizationHandler.handler_for("trusted_ids_handler", user:, uid: data[:uid], provider: data[:provider], raw_data: data[:raw_data])
       end
 
       def authorization

data/app/models/decidim/trusted_ids/organization_config.rb

@@ -5,6 +5,7 @@ module Decidim
     class OrganizationConfig < ApplicationRecord
       include Decidim::TranslatableResource
       include Decidim::TranslatableAttributes
+
       self.table_name = "organization_trusted_ids_configs"
 
       belongs_to :organization,

data/config/locales/de.yml

@@ -31,12 +31,12 @@ de:
     authorization_handlers:
       trusted_ids_handler:
         explanation: This authorization is granted to all users who use a login method
-          with a trusted identifier.
+          with an authenticated identity.
         fields:
           extra: Additional information
           provider: Provider
           uid: ID
-        name: Trusted identifier
+        name: Authenticated identities
       via_oberta_handler:
         explanation: This authorization is granted to all users who are in the Via
           Oberta census database.
@@ -89,8 +89,8 @@ de:
       providers:
         default:
           description: This authorization is granted to all users who use a login
-            method with a trusted identifier.
-          name: Trusted identifier
+            method with an authenticated identity.
+          name: Authenticated identities
         valid:
           description: VÀLid is a service that AOC provides to Catalan public administrations
             to integrate the different available digital identification mechanisms (idCAT

data/config/locales/en.yml

@@ -32,12 +32,12 @@ en:
     authorization_handlers:
       trusted_ids_handler:
         explanation: This authorization is granted to all users who use a login method
-          with a trusted identifier.
+          with an authenticated identity.
         fields:
           extra: Additional information
           provider: Provider
           uid: ID
-        name: Trusted identifier
+        name: Authenticated identities
       via_oberta_handler:
         explanation: This authorization is granted to all users who are in the Via
           Oberta census database.
@@ -90,8 +90,8 @@ en:
       providers:
         default:
           description: This authorization is granted to all users who use a login
-            method with a trusted identifier.
-          name: Trusted identifier
+            method with an authenticated identity.
+          name: Authenticated identities
         valid:
           description: VÀLid is a service that AOC provides to Catalan public administrations
             to integrate the different available digital identification mechanisms

data/config/locales/fr.yml

@@ -31,12 +31,12 @@ fr:
     authorization_handlers:
       trusted_ids_handler:
         explanation: This authorization is granted to all users who use a login method
-          with a trusted identifier.
+          with an authenticated identity.
         fields:
           extra: Additional information
           provider: Provider
           uid: ID
-        name: Trusted identifier
+        name: Authenticated identities
       via_oberta_handler:
         explanation: This authorization is granted to all users who are in the Via
           Oberta census database.
@@ -89,8 +89,8 @@ fr:
       providers:
         default:
           description: This authorization is granted to all users who use a login
-            method with a trusted identifier.
-          name: Trusted identifier
+            method with an authenticated identity.
+          name: Authenticated identities
         valid:
           description: VÀLid is a service that AOC provides to Catalan public administrations
             to integrate the different available digital identification systems (idCAT

data/config/locales/it.yml

@@ -31,12 +31,12 @@ it:
     authorization_handlers:
       trusted_ids_handler:
         explanation: This authorization is granted to all users who use a login method
-          with a trusted identifier.
+          with an authenticated identity.
         fields:
           extra: Additional information
           provider: Provider
           uid: ID
-        name: Trusted identifier
+        name: Authenticated identities
       via_oberta_handler:
         explanation: This authorization is granted to all users who are in the Via
           Oberta census database.
@@ -89,8 +89,8 @@ it:
       providers:
         default:
           description: This authorization is granted to all users who use a login
-            method with a trusted identifier.
-          name: Trusted identifier
+            method with an authenticated identity.
+          name: Authenticated identities
         valid:
           description: VÀLid is a service that AOC provides to Catalan public administrations
             to integrate the different available digital identification mechanisms (idCAT

data/lib/decidim/trusted_ids/version.rb

@@ -3,8 +3,8 @@
 module Decidim
   # This holds the decidim-trusted_ids version.
   module TrustedIds
-    VERSION = "0.12.0"
-    DECIDIM_VERSION = "0.31.7"
-    COMPAT_DECIDIM_VERSION = [">= 0.31", "< 0.32"].freeze
+    VERSION = "0.13.0"
+    DECIDIM_VERSION = "0.32.2"
+    COMPAT_DECIDIM_VERSION = [">= 0.32", "< 0.33"].freeze
   end
 end

data/lib/decidim/trusted_ids.rb

@@ -5,8 +5,6 @@ require "decidim/trusted_ids/engine"
 
 module Decidim
   module TrustedIds
-    include ActiveSupport::Configurable
-
     def self.omniauth_env(key, default = nil)
       ENV.fetch("#{TrustedIds.omniauth_provider.upcase}_#{key}", default)
     end
@@ -24,33 +22,35 @@ module Decidim
       end
     end
 
+    # Note that initialization on this module is done in the engine.rb file, as it needs to be done using dynamic values from the environment.
+
     # The name of the omniauth provider, must be registered in Decidim.
     # Leave it empty to disable omniauth authentication.
-    config_accessor :omniauth_provider
+    mattr_accessor :omniauth_provider
 
     # From the data obtained we extract metadata to be saved as part of the authorization
     # This data can later be used by the census_authorization handler as to call the webservice
     # A hash with keys and how to find it inside hash comming from the OAuth
-    config_accessor :authorization_metadata
+    mattr_accessor :authorization_metadata
 
     # setup a hash with :client_id, :client_secret and :site to enable omniauth authentication
-    config_accessor :omniauth
+    mattr_accessor :omniauth
 
     # which of the former attributes can not set a the /system configuration, there are all the same for all tenants
-    config_accessor :omniauth_global_attributes
+    mattr_accessor :omniauth_global_attributes
 
     # wheter to use a custom login screen or the default one
-    config_accessor :custom_login_screen
+    mattr_accessor :custom_login_screen
 
     # 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
+    mattr_accessor :verification_expiration_time
 
     # if false, no notifications will be send to users when automatic verifications are performed
-    config_accessor :send_verification_notifications
+    mattr_accessor :send_verification_notifications
 
     # Linked authorization method that will automatically verify users after getting a valid TrustedIds verification
-    config_accessor :census_authorization
+    mattr_accessor :census_authorization
 
     def self.census_config_attributes
       return [] if TrustedIds.census_authorization[:handler].blank?