decidim-system 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43595bcde22bdafbc1e64f92b684a6bc5777a3c90e2fa9d868a89ea743dc2e51
-  data.tar.gz: 8a33f34a2f9efb23e450398ce7a049e8ae355a0c4f1930995f60497318450ee4
+  metadata.gz: bf25dd773b68f62cd0175c53fb1c004c5ec3fbd991eb55c9e227f6f997902419
+  data.tar.gz: 45146c8202f6ad837dbd17f5f35395906c85f183f9cf60fe1ee3729e2d178e75
 SHA512:
-  metadata.gz: '0945d6d7726cf53b465eef86b0fbcb2a239f3b5e250b4cfd06eea277d6253264358fcb1c06a44c820361e6e5cd78b382a786d01edda38136fe088057d64258c1'
-  data.tar.gz: f725833825144944890fd763f8d245ada747bba55702486826f7335086fafce950d9a7444c880500c620d4a49b84daa047bd2aa0b43d5ab800887b4c41404853
+  metadata.gz: 97ddf945ef6ee13bf1ba43f4d479497b5d6afa1449fffe0a14af8d463ad80a34db216165586ae5b52a0367256e42932e4128611d8416dab9316c429307b5adaa
+  data.tar.gz: f1f395bbe90f6a687477ccc90ed6edb9a12bc3d2c62f0520066d177c32929cfaf8d02543e8201f43c0e3a4134009b30bdf9998ed055e63c24f0dae97acb32d48

data/app/commands/decidim/system/register_organization.rb

@@ -57,6 +57,7 @@ module Decidim
           badges_enabled: true,
           user_groups_enabled: true,
           default_locale: form.default_locale,
+          omniauth_settings: form.encrypted_omniauth_settings,
           smtp_settings: form.encrypted_smtp_settings,
           send_welcome_notification: true
         )

data/app/commands/decidim/system/update_organization.rb

@@ -47,6 +47,7 @@ module Decidim
         organization.force_users_to_authenticate_before_access_organization = form.force_users_to_authenticate_before_access_organization
         organization.available_authorizations = form.clean_available_authorizations
         organization.users_registration_mode = form.users_registration_mode
+        organization.omniauth_settings = form.encrypted_omniauth_settings
         organization.smtp_settings = form.encrypted_smtp_settings
 
         organization.save!

data/app/controllers/decidim/system/organizations_controller.rb

@@ -6,6 +6,7 @@ module Decidim
     #
     class OrganizationsController < Decidim::System::ApplicationController
       helper_method :current_organization
+      helper Decidim::OmniauthHelper
 
       def new
         @form = form(RegisterOrganizationForm).instance

data/app/forms/decidim/system/update_organization_form.rb

@@ -28,6 +28,18 @@ module Decidim
         [:enable_starttls_auto, Boolean]
       ]
 
+      OMNIATH_PROVIDERS_ATTRIBUTES = Decidim::User.omniauth_providers.map do |provider|
+        Rails.application.secrets.dig(:omniauth, provider).keys.map do |setting|
+          if setting == :enabled
+            ["omniauth_settings_#{provider}_enabled".to_sym, Boolean]
+          else
+            ["omniauth_settings_#{provider}_#{setting}".to_sym, String]
+          end
+        end
+      end.flatten(1)
+
+      jsonb_attribute :omniauth_settings, OMNIATH_PROVIDERS_ATTRIBUTES
+
       attr_writer :password
 
       validates :name, :host, :users_registration_mode, presence: true
@@ -36,6 +48,9 @@ module Decidim
 
       def map_model(model)
         self.secondary_hosts = model.secondary_hosts.join("\n")
+        self.omniauth_settings = Hash[(model.omniauth_settings || []).map do |k, v|
+          [k, Decidim::OmniauthProvider.value_defined?(v) ? Decidim::AttributeEncryptor.decrypt(v) : v]
+        end]
       end
 
       def clean_secondary_hosts
@@ -58,6 +73,12 @@ module Decidim
         smtp_settings.merge(encrypted_password: Decidim::AttributeEncryptor.encrypt(@password))
       end
 
+      def encrypted_omniauth_settings
+        Hash[omniauth_settings.map do |k, v|
+          [k, Decidim::OmniauthProvider.value_defined?(v) ? Decidim::AttributeEncryptor.encrypt(v) : v]
+        end]
+      end
+
       private
 
       def validate_organization_uniqueness

data/app/views/decidim/system/devise/shared/_links.html.erb

@@ -19,7 +19,7 @@
 <% end -%>
 
 <%- if devise_mapping.omniauthable? %>
-  <%- resource_class.omniauth_providers.each do |provider| %>
+  <%- current_organization.enabled_omniauth_providers.keys.each do |provider| %>
     <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br>
   <% end -%>
 <% end -%>

data/app/views/decidim/system/organizations/_omniauth_provider.html.erb

@@ -0,0 +1,19 @@
+<% i18n_scope = "decidim.system.organizations.omniauth_settings" %>
+
+<div class="card">
+  <h5><%= provider_name(provider) %></h5>
+
+  <div class="card-section">
+    <%= f.check_box(
+          "omniauth_settings_#{provider}_enabled",
+          label: t("enabled", scope: i18n_scope)
+        ) %>
+
+    <% Rails.application.secrets.dig(:omniauth, provider.to_sym).keys.select { |k| k != :enabled }.each do |setting| %>
+        <%= f.text_field("omniauth_settings_#{provider}_#{setting}", label: I18n.t(
+              ".#{setting}",
+              scope: [:icon, :icon_path].include?(setting) ? i18n_scope : "#{i18n_scope}.#{provider}"
+            )) %>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/system/organizations/_omniauth_settings.html.erb

@@ -0,0 +1,11 @@
+<div class="fieldset">
+  <h4><%= t("decidim.system.models.organization.fields.omniauth_settings") %></h4>
+
+  <%= f.fields_for :omniauth_settings do %>
+    <% providers = Decidim::OmniauthProvider.available.keys %>
+
+    <% providers.each do |provider| %>
+      <%= render partial: "omniauth_provider", locals: { f: f, provider: provider } %>
+    <% end %>
+  <% end %>
+</div>

data/app/views/decidim/system/organizations/edit.html.erb

@@ -31,6 +31,7 @@
   </div>
 
   <%= render partial: "smtp_settings", locals: { f: f } %>
+  <%= render partial: "omniauth_settings", locals: { f: f } %>
 
   <div class="actions">
     <%= f.submit t("decidim.system.actions.save") %>

data/app/views/decidim/system/organizations/new.html.erb

@@ -72,6 +72,7 @@
   </div>
 
   <%= render partial: "smtp_settings", locals: { f: f } %>
+  <%= render partial: "omniauth_settings", locals: { f: f } %>
 
   <div class="actions">
     <%= f.submit t("decidim.system.models.organization.actions.save_and_invite") %>

data/config/locales/ar.yml

@@ -61,6 +61,17 @@ ar:
           reference_prefix_hint: يتم استخدام بادئة المرجع لتعريف الموارد بشكل فريد في كل المؤسسة
           secondary_hosts_hint: أدخل كل واحد منهم في سطر جديد
           title: منظمة جديدة
+        omniauth_settings:
+          facebook:
+            app_secret: سر التطبيق
+          google_oauth2:
+            client_id: معرف العميل ID
+            client_secret: الرمز السري للعميل
+          icon: الأيقونة
+          icon_path: مسار الأيقونة
+          twitter:
+            api_key: مفتاح API
+            api_secret: سر API
         update:
           error: حدثت مشكلة أثناء تحديث هذه المؤسسة.
           success: تم تحديث المنظمة بنجاح.

data/config/locales/ca.yml

@@ -47,6 +47,7 @@ ca:
           fields:
             created_at: Data de creació
             name: Nom
+            omniauth_settings: Configuració de l'Omniauth
             smtp_settings: Configuració d'SMTP
           name: Organització
       organizations:
@@ -61,6 +62,19 @@ ca:
           reference_prefix_hint: El prefix de la referència s'utilitza per identificar de forma única els recursos de tota la organització
           secondary_hosts_hint: Introdueix cada un d'ells en una nova línia
           title: Nova organització
+        omniauth_settings:
+          enabled: Habilitat
+          facebook:
+            app_id: App ID
+            app_secret: App secret
+          google_oauth2:
+            client_id: ID del Client
+            client_secret: Client secret
+          icon: Icona
+          icon_path: Ruta de la icona
+          twitter:
+            api_key: Clau de l'API
+            api_secret: Clau secreta de l'API
         update:
           error: S'ha produït un error en actualitzar aquesta organització.
           success: L'organització s'ha actualitzat correctament.

data/config/locales/cs.yml

@@ -47,6 +47,7 @@ cs:
           fields:
             created_at: Vytvořeno u
             name: název
+            omniauth_settings: Nastavení Omniauth
             smtp_settings: SMTP nastavení
           name: Organizace
       organizations:
@@ -61,6 +62,19 @@ cs:
           reference_prefix_hint: Předpona reference se používá k jednoznačné identifikaci zdrojů ve všech organizacích
           secondary_hosts_hint: Zadejte každý z nich do nového řádku
           title: Nová organizace
+        omniauth_settings:
+          enabled: Povoleno
+          facebook:
+            app_id: ID aplikace
+            app_secret: Tajný klíč aplikace
+          google_oauth2:
+            client_id: Client ID
+            client_secret: Tajný klíč klienta
+          icon: Ikona
+          icon_path: Cesta k ikonám
+          twitter:
+            api_key: Klíč API
+            api_secret: API heslo
         update:
           error: Při aktualizaci této organizace došlo k chybě.
           success: Organizace byla úspěšně aktualizována.

data/config/locales/el.yml

@@ -0,0 +1 @@
+el:

data/config/locales/en.yml

@@ -48,6 +48,7 @@ en:
           fields:
             created_at: Created at
             name: Name
+            omniauth_settings: Omniauth settings
             smtp_settings: SMTP settings
           name: Organization
       organizations:
@@ -62,6 +63,19 @@ en:
           reference_prefix_hint: The reference prefix is used to uniquely identify resources across all organization
           secondary_hosts_hint: Enter each one of them in a new line
           title: New organization
+        omniauth_settings:
+          enabled: Enabled
+          facebook:
+            app_id: App ID
+            app_secret: App secret
+          google_oauth2:
+            client_id: Client ID
+            client_secret: Client secret
+          icon: Icon
+          icon_path: Icon path
+          twitter:
+            api_key: API key
+            api_secret: API secret
         update:
           error: There was a problem updating this organization.
           success: Organization successfully updated.

data/config/locales/es-MX.yml

@@ -47,6 +47,7 @@ es-MX:
           fields:
             created_at: Fecha de creación
             name: Nombre
+            omniauth_settings: Ajustes de Omniauth
             smtp_settings: Configuración de SMTP
           name: Organización
       organizations:
@@ -61,6 +62,19 @@ es-MX:
           reference_prefix_hint: El prefijo de referencia se utiliza para identificar de forma única los recursos de todas las organizaciones
           secondary_hosts_hint: Introduce cada uno de ellos en una nueva línea
           title: Nueva organización
+        omniauth_settings:
+          enabled: Habilitado
+          facebook:
+            app_id: ID de la App
+            app_secret: Secreto de aplicación
+          google_oauth2:
+            client_id: ID de cliente
+            client_secret: Secreto del cliente
+          icon: Icono
+          icon_path: Ruta del icono
+          twitter:
+            api_key: Clave API
+            api_secret: Secreto API
         update:
           error: Se ha producido un error al actualizar esta organización.
           success: Organización actualizada correctamente.

data/config/locales/es-PY.yml

@@ -47,6 +47,7 @@ es-PY:
           fields:
             created_at: Fecha de creación
             name: Nombre
+            omniauth_settings: Ajustes de Omniauth
             smtp_settings: Configuración de SMTP
           name: Organización
       organizations:
@@ -61,6 +62,19 @@ es-PY:
           reference_prefix_hint: El prefijo de referencia se utiliza para identificar de forma única los recursos de todas las organizaciones
           secondary_hosts_hint: Introduce cada uno de ellos en una nueva línea
           title: Nueva organización
+        omniauth_settings:
+          enabled: Habilitado
+          facebook:
+            app_id: ID de la App
+            app_secret: Secreto de aplicación
+          google_oauth2:
+            client_id: ID de cliente
+            client_secret: Secreto del cliente
+          icon: Icono
+          icon_path: Ruta del icono
+          twitter:
+            api_key: Clave API
+            api_secret: Secreto API
         update:
           error: Se ha producido un error al actualizar esta organización.
           success: Organización actualizada correctamente.

data/config/locales/es.yml

@@ -47,6 +47,7 @@ es:
           fields:
             created_at: Fecha de creación
             name: Nombre
+            omniauth_settings: Ajustes de Omniauth
             smtp_settings: Configuración de SMTP
           name: Organización
       organizations:
@@ -61,6 +62,19 @@ es:
           reference_prefix_hint: El prefijo de referencia se utiliza para identificar de forma única los recursos de toda la organización
           secondary_hosts_hint: Introduce cada uno de ellos en una nueva línea
           title: Nueva organización
+        omniauth_settings:
+          enabled: Habilitado
+          facebook:
+            app_id: ID de la App
+            app_secret: Secreto de aplicación
+          google_oauth2:
+            client_id: ID de cliente
+            client_secret: Secreto del cliente
+          icon: Icono
+          icon_path: Ruta del icono
+          twitter:
+            api_key: Clave API
+            api_secret: Secreto API
         update:
           error: Se ha producido un error al actualizar esta organización.
           success: Organización actualizada correctamente.

data/config/locales/fi-plain.yml

@@ -47,6 +47,7 @@ fi-pl:
           fields:
             created_at: Luotu
             name: Nimi
+            omniauth_settings: Omniauth-asetukset
             smtp_settings: SMTP-asetukset
           name: Organisaatio
       organizations:
@@ -61,6 +62,19 @@ fi-pl:
           reference_prefix_hint: Viitekoodin avulla tunnistetaan yksilöllisesti resursseja kaikissa organisaatioissa
           secondary_hosts_hint: Syötä jokainen niistä omalle rivilleen
           title: Uusi organisaatio
+        omniauth_settings:
+          enabled: Käytössä
+          facebook:
+            app_id: Sovelluksen ID (App ID)
+            app_secret: Sovelluksen salausavain (App secret)
+          google_oauth2:
+            client_id: Asiakkaan tunniste (Client ID)
+            client_secret: Asiakkaan salausavain (Client secret)
+          icon: Ikoni
+          icon_path: Ikonin polku
+          twitter:
+            api_key: API-avain
+            api_secret: API-salausavain
         update:
           error: Organisaation päivityksessä tapahtui virhe.
           success: Organisaatio päivitetty onnistuneesti.

data/config/locales/fi.yml

@@ -47,6 +47,7 @@ fi:
           fields:
             created_at: Luotu
             name: Nimi
+            omniauth_settings: Omniauth-asetukset
             smtp_settings: SMTP-asetukset
           name: Organisaatio
       organizations:
@@ -61,6 +62,19 @@ fi:
           reference_prefix_hint: Viitetunnisteen avulla tunnistetaan yksilöllisesti resursseja eri organisaatioiden välillä
           secondary_hosts_hint: Syötä jokainen niistä omalle rivilleen
           title: Uusi organisaatio
+        omniauth_settings:
+          enabled: Käytössä
+          facebook:
+            app_id: Sovelluksen ID (App ID)
+            app_secret: Sovelluksen salausavain (App secret)
+          google_oauth2:
+            client_id: Asiakkaan tunniste (Client ID)
+            client_secret: Asiakkaan salausavain (Client secret)
+          icon: Ikoni
+          icon_path: Ikonin polku
+          twitter:
+            api_key: API-avain
+            api_secret: API-salausavain
         update:
           error: Organisaation päivitys epäonnistui.
           success: Organisaation päivitys onnistui.

data/config/locales/hu.yml

@@ -47,6 +47,7 @@ hu:
           fields:
             created_at: 'Létrehozva:'
             name: Név
+            omniauth_settings: Omniauth beállítások
             smtp_settings: SMTP beállítások
           name: Szervezet
       organizations:
@@ -61,6 +62,19 @@ hu:
           reference_prefix_hint: A hivatkozási előtag az erőforrások azonosítására szolgál a szervezetek esetében
           secondary_hosts_hint: Mindegyiket új sorba írd be
           title: Új szervezet
+        omniauth_settings:
+          enabled: Engedélyezve
+          facebook:
+            app_id: Alkalmazás ID
+            app_secret: Alkalmazás titkos kulcs
+          google_oauth2:
+            client_id: Ügyfél ID
+            client_secret: Client Secret
+          icon: Ikon
+          icon_path: Ikon elérési útja
+          twitter:
+            api_key: API-kulcs
+            api_secret: API Titkos
         update:
           error: Hiba történt a szervezet frissítése során.
           success: Szervezet sikeresen frissítve.

data/config/locales/it.yml

@@ -47,6 +47,7 @@ it:
           fields:
             created_at: Data/ora di creazione
             name: Nome
+            omniauth_settings: Impostazioni Omniauth
             smtp_settings: Impostazioni SMTP
           name: Organizzazione
       organizations:
@@ -61,6 +62,19 @@ it:
           reference_prefix_hint: Il prefisso di riferimento è utilizzato solamente per identificare le risorse in tutte le organizzazioni
           secondary_hosts_hint: Inserisci ciascun elemento in una nuova linea
           title: Nuova Organizzazione
+        omniauth_settings:
+          enabled: Abilitato
+          facebook:
+            app_id: ID App
+            app_secret: App secret
+          google_oauth2:
+            client_id: ID Cliente
+            client_secret: Client secret
+          icon: Icona
+          icon_path: Percorso icona
+          twitter:
+            api_key: API Key
+            api_secret: API secret
         update:
           error: C'è stato un errore durante l'aggiornamento di questa organizzazione.
           success: OK, l'Organizzazione è stata aggiornata.

data/config/locales/nl.yml

@@ -61,6 +61,16 @@ nl:
           reference_prefix_hint: Het referentie-voorvoegsel wordt gebruikt ter identificatie van unieke middelen over alle organisaties
           secondary_hosts_hint: Voer elk van hen op een nieuwe regel in
           title: Nieuwe organisatie
+        omniauth_settings:
+          facebook:
+            app_id: App-ID
+            app_secret: App secret
+          google_oauth2:
+            client_id: Client-ID
+            client_secret: Client secret
+          twitter:
+            api_key: API key
+            api_secret: API secret
         update:
           error: Er is een fout opgetreden bij het bijwerken van deze organisatie.
           success: Organisatie is succesvol bijgewerkt.

data/config/locales/no.yml

@@ -47,6 +47,7 @@
           fields:
             created_at: Opprettet på
             name: Navn
+            omniauth_settings: Omniauth innstillinger
             smtp_settings: SMTP innstillinger
           name: Organisasjon
       organizations:
@@ -61,6 +62,19 @@
           reference_prefix_hint: Referanse prefikset brukes til å identifisere ressurser på tvers av alle organisasjoner
           secondary_hosts_hint: Skriv inn hver enkelt av dem på en ny linje
           title: Ny organisasjon
+        omniauth_settings:
+          enabled: Aktivert
+          facebook:
+            app_id: App ID
+            app_secret: App hemmelighet
+          google_oauth2:
+            client_id: Klient ID
+            client_secret: Klient hemmlighet
+          icon: Ikon
+          icon_path: Ikon sti
+          twitter:
+            api_key: API-nøkkel
+            api_secret: API secret
         update:
           error: Det oppstod et problem med å oppdatere denne organisasjon.
           success: Organisasjonen ble oppdatert.

data/lib/decidim/system/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-system version.
   module System
     def self.version
-      "0.20.1"
+      "0.21.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-system
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -136,14 +136,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 description: System administration to create new organization in an installation.
 email:
 - josepjaume@gmail.com
@@ -199,6 +199,8 @@ files:
 - app/views/decidim/system/devise/passwords/new.html.erb
 - app/views/decidim/system/devise/sessions/new.html.erb
 - app/views/decidim/system/devise/shared/_links.html.erb
+- app/views/decidim/system/organizations/_omniauth_provider.html.erb
+- app/views/decidim/system/organizations/_omniauth_settings.html.erb
 - app/views/decidim/system/organizations/_smtp_settings.html.erb
 - app/views/decidim/system/organizations/edit.html.erb
 - app/views/decidim/system/organizations/index.html.erb
@@ -217,6 +219,7 @@ files:
 - config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
 - config/locales/es-MX.yml