decidim-suomifi 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 150ac439de1d3aa6d6b1d4f751a2d9aaa42d71df7258e2ad1ce4ff17dda14908
-  data.tar.gz: d507607ae2555b4b22d264084b0e4ae5b2ea92cec8fd40d99a684649d1ecd914
+  metadata.gz: 297cde0472fa64df7158b219adb6a6f91e03f57ac483c1fc6e05a6572ac4c700
+  data.tar.gz: 999f2c1d88e1c33281414e339e7306a3bcef5e91f3cb4c110201c458531f51bb
 SHA512:
-  metadata.gz: '060508a9c89d455df3abc8ae4c97d0d1fe4cf3602574209dd937f06675c007bdd6a67925c7082138d941e47c4f638bbbd9397d9ea7c1df54ab61337558c6a30e'
-  data.tar.gz: 1632a366514b05b264d90e0d3f47479d0bedd753127de042f654cf49af9e581b18422c2502998095bc90077a630ff7224b970d7b3dc30fb4ccb2d807d623699a
+  metadata.gz: ec37f076bb2edf69be9065a796eef6ee217ab74746c5e3e6a1f08aa370eef76ea2da8c6b36eb7a794009969a1f92962269c4bde0b208be4a99ee57f168c2edd3
+  data.tar.gz: 2e702a242797d54eed6b8254ba1dfb227cc7fc67a9db28c4627101f0e3b477cfc530a41e7214faf30a811a55377aec2d607119e0b014ff1b3638237d4493cf1a

data/README.md

@@ -59,6 +59,9 @@ You need to set the following configuration options inside the initializer:
   sent to Suomi.fi.
 - `:private_key_file` - Path to the local private key (corresponding to the
   certificate). Will be used to decrypt messages coming from Suomi.fi.
+
+Optionally you can also configure the module with the following options:
+
 - `:auto_email_domain` - Defines the auto-email domain in case the user's domain
   is not stored at Suomi.fi. In case this is not set (default), emails will not
   be auto-generated and users will need to enter them manually in case Suomi.fi
@@ -67,6 +70,14 @@ You need to set the following configuration options inside the initializer:
     `suomifi-756be91097ac490961fd04f121cb9550@example.org`. The email will
     always have the `suomifi-` prefix and the domain part is defined by the
     configuration option.
+  * In case this is not defined, the organization's host will be used as the
+    default.
+- `:use_suomifi_email` - Defines whether the emails stored in Suomi.fi should
+  be used for the user accounts if they are available. Note that not all people
+  have an email address stored in the Suomi.fi database and not everyone keeps
+  it up to date. Another problem with this is that some people may have an old
+  or incorrectly written email address stored in Suomi.fi that may cause wrong
+  email addresses to be used for the use accounts.
 
 For more information about these options and possible other options, please
 refer to the [`omniauth-suomifi`](https://github.com/mainio/omniauth-suomifi)

data/lib/decidim/suomifi.rb

@@ -27,12 +27,28 @@ module Decidim
       :medium_extensive
     end
 
-    # Defines the auto email domain in case the person's email address is not
-    # stored in the Suomi.fi database. In case this is defined, the user will
-    # be automatically assigned an email such as
-    # "suomifi-identifier@auto-email-domain.fi" upon their registration.
+    # Defines the email domain for the auto-generated email addresses for the
+    # user accounts. You can also use the person's own email address possibly
+    # stored in the Suomi.fi database with the option `use_suomifi_email`. Not
+    # all people have email address stored in Suomi.fi and some people may have
+    # incorrect email address stored there.
+    #
+    # In case this is defined, the user will be automatically assigned an email
+    # such as "suomifi-identifier@auto-email-domain.fi" upon their registration.
+    #
+    # In case this is not defined, the default is the organization's domain.
     config_accessor :auto_email_domain
 
+    # Defines whether to use the person's email address stored in the Suomi.fi
+    # database for the user account. Some people do not actively update these
+    # email addresses and some people may have a wrong email address stored in
+    # the Suomi.fi database which can belong to another person in the worst case
+    # scenario which can cause confusion among the participants. Use this option
+    # with caution!
+    config_accessor :use_suomifi_email do
+      false
+    end
+
     config_accessor :sp_entity_id, instance_reader: false
 
     # The certificate string for the application

data/lib/decidim/suomifi/authentication/authenticator.rb

@@ -13,10 +13,10 @@ module Decidim
 
         def verified_email
           @verified_email ||= begin
-            if saml_attributes[:email]
+            if Decidim::Suomifi.use_suomifi_email && saml_attributes[:email]
               saml_attributes[:email]
-            elsif Decidim::Suomifi.auto_email_domain
-              domain = Decidim::Suomifi.auto_email_domain
+            else
+              domain = Decidim::Suomifi.auto_email_domain || organization.host
               "suomifi-#{person_identifier_digest}@#{domain}"
             end
           end

data/lib/decidim/suomifi/test/runtime.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "webmock"
+
 module Decidim
   module Suomifi
     module Test
@@ -32,15 +34,7 @@ module Decidim
         end
 
         def instance_initialize
-          yield self
-
-          # Setup the Suomi.fi OmniAuth strategy for Devise
-          # ::Devise.setup do |config|
-          #   config.omniauth(
-          #     :suomifi,
-          #     Decidim::Suomifi.omniauth_settings
-          #   )
-          # end
+          yield self if block_given?
         end
       end
     end

data/lib/decidim/suomifi/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Suomifi
-    VERSION = "0.18.1"
-    DECIDIM_VERSION = "~> 0.18.0"
+    VERSION = "0.19.0"
+    DECIDIM_VERSION = "~> 0.19.0"
   end
 end

data/lib/generators/templates/suomifi_initializer_test.rb

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
+require "decidim/suomifi/test/runtime"
+
 Decidim::Suomifi::Test::Runtime.initialize

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-suomifi
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Antti Hukkanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: henkilotunnus
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: xmlenc
   requirement: !ruby/object:Gem::Requirement