decidim-idcat_mobil 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df636b40348a962fe4db942aa3c490e9bb02395981fb8181bda991621e19ee22
-  data.tar.gz: 2e466d9cc5f86c12a4b7d632ba13d9c560f1306bdb2e70b7f9cd3bf3264455e3
+  metadata.gz: 23d738c9fde7cd2069188887f0290aa1605e9993c3aaf77aab18dc4f15d15808
+  data.tar.gz: b6f5ccf8a4e8b876d37f1f23f5bb3c2809ef0ae9fd9a56322638003ddaceeff3
 SHA512:
-  metadata.gz: 1c613d378ccc623c09c3e7b6afc5c811e511b0f3f0283a626578c403447cad9c7450986064e24658d372dfe22d076bf78b9fe3410e666de0668fae5da68c345b
-  data.tar.gz: b104c32a81ff8bf27ee0d61ede525c7250753d2f45503f42b67b64768f673c180ae61897a2bcb62ad70656f351fd05d10523368f8a7fc1607874323f85d2022e
+  metadata.gz: b789de69eaee60be5a5e0dd6543d9e521ee11346e76787f1026305048ea5477c2556b587f39ab4dd7666904cf321fea876eabc88e0ce4b421052927771adcd51
+  data.tar.gz: eb16a519d19e55dd74fc74c46b974af258e3aaf456e19caa9cd9947f0f76e9493495e940e707fd4a6ba338694e10a60b82d7e23e1790615393c4722f84c7590a

data/README.md

@@ -1,8 +1,10 @@
 # Decidim::IdcatMobil
 
-User registration, login and verification through IdCat mòbil, an authentication method that uses OAuth 2.0 protocol.
+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.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -19,11 +21,11 @@ bundle install
 
 ## Usage
 
-To use it you have to first configure the omniauth-idcat_mobil and then this gem as a verification handler.
+To use it you have to first configure the omniauth-idcat_mobil.
 
 ### omniauth-idcat_mobil configuration
 `IdCat mòbil` will be available as a configurable OAuth2 strategy.
-Check how to configure the strategy in [Decidim's related documentation](). The summary is that you have to edit your `config/secrets.rb` and simply enable the strategy:
+Check how to configure the strategy in [Decidim's related documentation](https://github.com/decidim/decidim/blob/develop/docs/services/social_providers.md). The summary is that you have to edit your `config/secrets.rb` and simply enable the strategy:
 
 ```yaml
   omniauth:
@@ -32,11 +34,15 @@ Check how to configure the strategy in [Decidim's related documentation](). The
       icon_path: decidim/idcat_mobil/icon.svg
 ```
 
-Omniauth's configuration is setted in `config/initializers/omniauth_idcat_mobil.rb`. Nothing has to be modified there but it expects `IDCAT_MOBIL_CLIENT_ID`, `IDCAT_MOBIL_CLIENT_SECRET` and `IDCAT_MOBIL_SITE_URL` environment variables to be setted.
+Remember to set `IDCAT_MOBIL_CLIENT_ID`, `IDCAT_MOBIL_CLIENT_SECRET` and `IDCAT_MOBIL_SITE_URL` environment variables.
 
 
 Refer to `omniauth-idcat_mobil` gem for further documentation.
 
+## TODO
+
+- User Verification development has to be finished.
+
 ## Contributing
 
 See [Decidim](https://github.com/decidim/decidim).
@@ -46,15 +52,18 @@ See [Decidim](https://github.com/decidim/decidim).
 Create a dummy app in your application (if not present):
 
 ```bash
-bin/rails decidim:generate_external_test_app
+bundle exec rake decidim:generate_external_test_app
 ```
 
 And run tests:
 
 ```bash
-rspec spec
+bundle exec rspec spec/
 ```
 
 ## License
 
-This engine is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
+
+The Department d'Exteriors of [Generalitat de Catalunya](http://gencat.cat) makes this gem available as open source under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE.
+
+Authored by [CodiTramuntana](http://coditramuntana.com).

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

@@ -4,10 +4,11 @@ module Decidim
   module IdcatMobil
     class VerificationInvalidNotification < Decidim::Events::SimpleEvent
       def resource_path
-        'http'
+        "http"
       end
+
       def resource_url
-        'http'
+        "http"
       end
     end
   end

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

@@ -4,10 +4,11 @@ module Decidim
   module IdcatMobil
     class VerificationSuccessNotification < Decidim::Events::SimpleEvent
       def resource_path
-        'http'
+        "http"
       end
+
       def resource_url
-        'http'
+        "http"
       end
     end
   end

data/app/forms/decidim/verifications/id_cat_mobil_handler.rb

@@ -7,14 +7,14 @@ module Decidim
       attribute :oauth_data, Hash
 
       validates :unique_id, presence: true
-      validate :is_idcatmobil_method, :has_ok_status
+      validate :idcatmobil_method?, :has_ok_status?
 
       def unique_id
-        oauth_data['identifier']
+        oauth_data["identifier"]
       end
 
       def metadata
-       oauth_data
+        oauth_data
       end
 
       def user
@@ -23,15 +23,19 @@ module Decidim
 
       #-----------------------------------------------------------
       private
+
       #-----------------------------------------------------------
 
-      def is_idcatmobil_method
-        return true if oauth_data['method'] == 'idcatmobil'
+      def idcatmobil_method?
+        return true if oauth_data["method"] == "idcatmobil"
+
         errors.add(:base, I18n.t("decidim.verifications.idcat_mobil.errors.invalid_method"))
         false
       end
-      def has_ok_status
-        return true if oauth_data['status'] == 'ok'
+
+      def has_ok_status?
+        return true if oauth_data["status"] == "ok"
+
         errors.add(:base, I18n.t("decidim.verifications.idcat_mobil.errors.invalid_status"))
         false
       end

data/app/jobs/decidim/idcat_mobil/verification_job.rb

@@ -6,7 +6,7 @@ module Decidim
       queue_as :default
 
       def perform(oauth_data)
-        handler= retrieve_handler(oauth_data)
+        handler = retrieve_handler(oauth_data)
         Decidim::Verifications::AuthorizeUser.call(handler) do
           on(:ok) do
             notify_user(handler.user, :ok, handler)
@@ -20,15 +20,16 @@ module Decidim
 
       #-----------------------------------------------------------
       private
+
       #-----------------------------------------------------------
 
       # 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("idcat_mobil", oauth_data: oauth_data)
       end
 
       def notify_user(user, status, handler)
-        notification_class= status == :ok ? Decidim::IdcatMobil::VerificationSuccessNotification : Decidim::IdcatMobil::VerificationInvalidNotification
+        notification_class = status == :ok ? Decidim::IdcatMobil::VerificationSuccessNotification : Decidim::IdcatMobil::VerificationInvalidNotification
         Decidim::EventsManager.publish(
           event: "decidim.verifications.idcat_mobil.#{status}",
           event_class: notification_class,

data/config/initializers/omniauth_idcat_mobil.rb

@@ -1,11 +1,20 @@
-OmniAuth.config.logger= Rails.logger
+# frozen_string_literal: true
 
-Devise.setup do |config|
-  config.omniauth :idcat_mobil,
-                  ENV["IDCAT_MOBIL_CLIENT_ID"],
-                  ENV["IDCAT_MOBIL_CLIENT_SECRET"],
-                  ENV["IDCAT_MOBIL_SITE_URL"],
-                  scope: :autenticacio_usuari
-end
+OmniAuth.config.logger = Rails.logger
 
-Decidim::User.omniauth_providers << :idcat_mobil
+if Rails.application.secrets.dig(:omniauth, :idcat_mobil).present?
+  Rails.application.config.middleware.use OmniAuth::Builder do
+    provider(
+      :idcat_mobil,
+      setup: lambda { |env|
+               request = Rack::Request.new(env)
+               organization = Decidim::Organization.find_by(host: request.host)
+               provider_config = organization.enabled_omniauth_providers[:idcat_mobil]
+               env["omniauth.strategy"].options[:client_id] = provider_config[:client_id] || ENV["IDCAT_MOBIL_CLIENT_ID"]
+               env["omniauth.strategy"].options[:client_secret] = provider_config[:client_secret] || ENV["IDCAT_MOBIL_CLIENT_SECRET"]
+               env["omniauth.strategy"].options[:site] = provider_config[:site_url] || ENV["IDCAT_MOBIL_SITE_URL"]
+             },
+      scope: :autenticacio_usuari
+    )
+  end
+end

data/lib/decidim/idcat_mobil/admin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # # frozen_string_literal: true
 
 # module Decidim

data/lib/decidim/idcat_mobil/admin_engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # # frozen_string_literal: true
 
 # module Decidim

data/lib/decidim/idcat_mobil/component.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # # frozen_string_literal: true
 
 # require_dependency "decidim/components/namer"

data/lib/decidim/idcat_mobil/engine.rb

@@ -16,17 +16,17 @@ module Decidim
         # root to: "idcat_mobil#index"
       end
 
-      #
-      # Force `Decidim::CurrentOrganization` to be executed before `Warden::Manager` to avoid path generation problems.
-      # NOTE: Remove this initializer when in Decidim 0.16.0 where it has been fixed.
-      #
-      initializer "decidim.middleware" do |app|
-        # as `app.config.middleware` is just a proxy made available for configuration purposes
-        # and acts as a command recorder that executes deletes always at the end
-        # we can not remove and re-insert, but only duplicate `Decidim::CurrentOrganization`.
-        # app.config.middleware.delete Decidim::CurrentOrganization
-        app.config.middleware.insert_before Warden::Manager, Decidim::CurrentOrganization
-      end
+      # #
+      # # Force `Decidim::CurrentOrganization` to be executed before `Warden::Manager` to avoid path generation problems.
+      # # NOTE: Remove this initializer when in Decidim 0.16.0 where it has been fixed.
+      # #
+      # initializer "decidim.middleware" do |app|
+      #   # as `app.config.middleware` is just a proxy made available for configuration purposes
+      #   # and acts as a command recorder that executes deletes always at the end
+      #   # we can not remove and re-insert, but only duplicate `Decidim::CurrentOrganization`.
+      #   # app.config.middleware.delete Decidim::CurrentOrganization
+      #   app.config.middleware.insert_before Warden::Manager, Decidim::CurrentOrganization
+      # end
 
       # initializer "decidim_idcat_mobil.assets" do |app|
       #   app.config.assets.precompile += %w[decidim_idcat_mobil_manifest.js decidim_idcat_mobil_manifest.css]

data/lib/decidim/idcat_mobil/version.rb

@@ -4,7 +4,11 @@ module Decidim
   module IdcatMobil
     def self.version
       # See CHANGELOG.md to see what changed
-      "0.0.4"
+      "0.1.0"
+    end
+
+    def self.decidim_version
+      "0.24.0"
     end
   end
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: decidim-idcat_mobil
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Oliver Valls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-29 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: omniauth-idcat_mobil
+  name: decidim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
-  name: decidim
+  name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
-  name: decidim-core
+  name: omniauth-idcat_mobil
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.24.0
 description: User registration, login and verification though VÀLid's IdCat mòbil..
 email:
 - oliver.vh@coditramuntana.com
@@ -113,15 +113,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.1
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A decidim idcat_mobil module