Merge pull request #4452 from betagouv/dev

2019-10-29-01

Author: LeSim

Gemfile

@@ -4,7 +4,7 @@ gem 'aasm'
 gem 'actiontext', git: 'https://github.com/kobaltz/actiontext.git', branch: 'archive', require: 'action_text' # Port of ActionText to Rails 5
 gem 'active_link_to' # Automatically set a class on active links
 gem 'active_model_serializers'
-gem 'activestorage-openstack'
+gem 'activestorage-openstack', git: 'https://github.com/fredZen/activestorage-openstack.git', branch: 'frederic/fix_upload_signature'
 gem 'administrate'
 gem 'after_party'
 gem 'anchored'

Gemfile.lock

@@ -1,3 +1,14 @@
+GIT
+  remote: https://github.com/fredZen/activestorage-openstack.git
+  revision: c71d5107a51701eab9d9267dd0000e6c1cf3e39a
+  branch: frederic/fix_upload_signature
+  specs:
+    activestorage-openstack (0.5.0)
+      fog-openstack (~> 1.0)
+      marcel
+      mime-types
+      rails (~> 5.2.0)
+
 GIT
   remote: https://github.com/kobaltz/actiontext.git
   revision: ef59c4ba99d1b7614dd47f5a294eef553224db88
@@ -64,11 +75,6 @@ GEM
       actionpack (= 5.2.2.1)
       activerecord (= 5.2.2.1)
       marcel (~> 0.3.1)
-    activestorage-openstack (1.0.0)
-      fog-openstack (~> 1.0)
-      marcel
-      mime-types
-      rails (<= 6)
     activesupport (5.2.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
@@ -711,7 +717,7 @@ DEPENDENCIES
   actiontext!
   active_link_to
   active_model_serializers
-  activestorage-openstack
+  activestorage-openstack!
   administrate
   after_party
   anchored

app/assets/images/icons/add.svg

@@ -79,11 +79,16 @@
     background-image: image-url("icons/lock.svg");
   }
 
+  &.add {
+    background-image: image-url("icons/add.svg");
+    margin-left: -5px;
+    margin-right: 0px;
+  }
+
   &.justificatif {
     background-image: image-url("icons/justificatif.svg");
   }
 
-
   &.printer {
     background-image: image-url("icons/printer.svg");
   }

app/assets/stylesheets/new_design/icons.scss

@@ -250,7 +250,7 @@ def sendinblue_config
         payload: {
           DS_SIGN_IN_COUNT: current_user&.sign_in_count,
           DS_CREATED_AT: current_administrateur&.created_at,
-          DS_ACTIVE: current_administrateur&.active,
+          DS_ACTIVE: current_administrateur&.active?,
           DS_ID: current_administrateur&.id,
           DS_GESTIONNAIRE_ID: current_instructeur&.id,
           DS_ROLES: current_user_roles

app/controllers/application_controller.rb

@@ -49,7 +49,7 @@ def personnes_impliquees
       @previous_following_instructeurs_emails = previous_followers.pluck(:email)
       @avis_emails = dossier.avis.includes(:instructeur).map(&:email_to_display)
       @invites_emails = dossier.invites.map(&:email)
-      @potential_recipients = procedure.defaut_groupe_instructeur.instructeurs.reject { |g| g == current_instructeur }
+      @potential_recipients = dossier.groupe_instructeur.instructeurs.reject { |g| g == current_instructeur }
     end
 
     def send_to_instructeurs

app/controllers/instructeurs/dossiers_controller.rb

@@ -17,15 +17,15 @@ def administration
   end
 
   def patron
-    description = 'aller voir le super site : https://demarches-simplifiees.fr'
+    description = 'Aller voir le super site : https://demarches-simplifiees.fr'
 
     all_champs = TypeDeChamp.type_champs
-      .map { |name, _| TypeDeChamp.new(type_champ: name, private: false, libelle: name, description: description, mandatory: true) }
+      .map { |name, _| TypeDeChamp.new(type_champ: name, private: false, libelle: name.humanize, description: description, mandatory: true) }
       .map.with_index { |type_de_champ, i| type_de_champ.champ.build(id: i) }
 
     all_champs
       .filter { |champ| champ.type_champ == TypeDeChamp.type_champs.fetch(:header_section) }
-      .each { |champ| champ.type_de_champ.libelle = 'un super titre de section' }
+      .each { |champ| champ.type_de_champ.libelle = 'Un super titre de section' }
 
     all_champs
       .filter { |champ| [TypeDeChamp.type_champs.fetch(:drop_down_list), TypeDeChamp.type_champs.fetch(:multiple_drop_down_list)].include?(champ.type_champ) }
@@ -39,6 +39,16 @@ def patron
         champ.value = '["option B", "option C"]'
       end
 
+    all_champs
+      .filter { |champ| champ.type_champ == TypeDeChamp.type_champs.fetch(:repetition) }
+      .each do |champ_repetition|
+        libelles = ['Prénom', 'Nom'];
+        champ_repetition.champs << libelles.map.with_index do |libelle, i|
+          text_tdc = TypeDeChamp.new(type_champ: :text, private: false, libelle: libelle, description: description, mandatory: true)
+          text_tdc.champ.build(id: all_champs.length + i)
+        end
+      end
+
     type_champ_values = {
       TypeDeChamp.type_champs.fetch(:date)      => '2016-07-26',
       TypeDeChamp.type_champs.fetch(:datetime)  => '26/07/2016 07:35',

app/controllers/root_controller.rb

@@ -0,0 +1,57 @@
+module ActiveStorage
+  # Wraps an ActiveStorage::Service to route direct upload and direct download URLs through our proxy,
+  # thus avoiding exposing the storage provider’s URL to our end-users.
+  class Service::DsProxyService < SimpleDelegator
+    attr_reader :wrapped
+
+    def self.build(wrapped:, configurator:, **options)
+      new(wrapped: configurator.build(wrapped))
+    end
+
+    def initialize(wrapped:)
+      @wrapped = wrapped
+      super(wrapped)
+    end
+
+    def url(*args)
+      url = wrapped.url(*args)
+      publicize(url)
+    end
+
+    def url_for_direct_upload(*args)
+      url = wrapped.url_for_direct_upload(*args)
+      publicize(url)
+    end
+
+    private
+
+    def object_for(key, &block)
+      blob_url = url(key)
+      if block_given?
+        request = Typhoeus::Request.new(blob_url)
+        request.on_headers do |response|
+          if response.code != 200
+            raise Fog::OpenStack::Storage::NotFound.new
+          end
+        end
+        request.on_body do |chunk|
+          yield chunk
+        end
+        request.run
+      else
+        response = Typhoeus.get(blob_url)
+        if response.success?
+          response
+        else
+          raise Fog::OpenStack::Storage::NotFound.new
+        end
+      end
+    end
+
+    def publicize(url)
+      search = %r{^https://[^/]+/v1/AUTH_[a-f0-9]{32}}
+      replace = 'https://static.demarches-simplifiees.fr'
+      url.gsub(search, replace)
+    end
+  end
+end

app/lib/active_storage/service/ds_proxy_service.rb

@@ -56,7 +56,7 @@ def registration_state
   end
 
   def invitation_expired?
-    !active && !user.reset_password_period_valid?
+    !active? && !user.reset_password_period_valid?
   end
 
   def self.reset_password(reset_password_token, password)
@@ -66,10 +66,6 @@ def self.reset_password(reset_password_token, password)
       reset_password_token: reset_password_token
     })
 
-    if administrateur && administrateur.errors.empty?
-      administrateur.update_column(:active, true)
-    end
-
     administrateur
   end
 
@@ -84,4 +80,8 @@ def instructeur
   def can_be_deleted?
     dossiers.state_instruction_commencee.none? && procedures.none?
   end
+
+  def active?
+    user.last_sign_in_at.present?
+  end
 end

app/models/administrateur.rb

@@ -110,8 +110,10 @@ def notifications_for_dossier(dossier)
   end
 
   def notifications_for_procedure(procedure, scope)
-    procedure
-      .defaut_groupe_instructeur.dossiers
+    target_groupes = groupe_instructeurs.where(procedure: procedure)
+
+    Dossier
+      .where(groupe_instructeur: target_groupes)
       .send(scope) # :en_cours or :termine or :not_archived (or any other Dossier scope)
       .merge(followed_dossiers)
       .with_notifications