Merge branch 'develop' of github.com:sgmap/tps into develop

app/controllers/admin/pieces_justificatives_controller.rb

@@ -23,11 +23,4 @@ class Admin::PiecesJustificativesController < AdminController
       .require(:procedure)
       .permit(types_de_piece_justificative_attributes: [:libelle, :description, :id])
   end
-
-
-  def retrieve_procedure
-    @procedure = current_administrateur.procedures.find(params[:procedure_id])
-  rescue ActiveRecord::RecordNotFound
-    render json: { message: 'Procedure not found' }, status: 404
-  end
 end

app/controllers/admin/procedures_controller.rb

@@ -1,5 +1,7 @@
 class Admin::ProceduresController < AdminController
 
+  before_action :retrieve_procedure, only: :edit
+
   def index
     @procedures = current_administrateur.procedures.where(archived: false)
                       .paginate(:page => params[:page]).decorate

app/controllers/admin/types_de_champ_controller.rb

@@ -1,5 +1,4 @@
 class Admin::TypesDeChampController < AdminController
-
   before_action :retrieve_procedure
 
   def destroy
@@ -38,12 +37,4 @@ class Admin::TypesDeChampController < AdminController
       render json: {}, status: 400
     end
   end
-
-  private
-
-  def retrieve_procedure
-    @procedure = Procedure.find(params[:procedure_id])
-  rescue ActiveRecord::RecordNotFound
-    render json: { message: 'Procedure not found' }, status: 404
-  end
 end

app/controllers/admin_controller.rb

@@ -4,4 +4,17 @@ class AdminController < ApplicationController
   def index
     redirect_to (admin_procedures_path)
   end
+
+  def retrieve_procedure
+    id = params[:procedure_id] || params[:id ]
+
+    @procedure = current_administrateur.procedures.find(id)
+
+    if @procedure.locked?
+      render json: {message: 'Procedure locked'}, status: 403
+    end
+
+  rescue ActiveRecord::RecordNotFound
+    render json: {message: 'Procedure not found'}, status: 404
+  end
 end

app/controllers/france_connect/entreprise_controller.rb

@@ -1,6 +1,6 @@
-class FranceConnectController < ApplicationController
+class FranceConnect::EntrepriseController < ApplicationController
   def login
-    client = FranceConnectClient.new
+    client = FranceConnectEntrepriseClient.new
 
     session[:state] = SecureRandom.hex(16)
     session[:nonce] = SecureRandom.hex(16)
@@ -16,7 +16,7 @@ class FranceConnectController < ApplicationController
   def callback
     return redirect_to new_user_session_path unless params.has_key?(:code)
 
-    user_infos = FranceConnectService.retrieve_user_informations(params[:code])
+    user_infos = FranceConnectService.retrieve_user_informations_entreprise(params[:code])
 
     unless user_infos.nil?
       @user = User.find_for_france_connect(user_infos.email, user_infos.siret)

app/controllers/users/recapitulatif_controller.rb

@@ -29,6 +29,8 @@ class Users::RecapitulatifController < UsersController
     @dossier.next_step! 'user', 'submit'
     flash.notice = 'Dossier déposé avec succès.'
 
+    NotificationMailer.dossier_submitted(@dossier).deliver_now!
+
     render 'show'
   end
 end

app/controllers/users/sessions_controller.rb

@@ -18,14 +18,12 @@ class Users::SessionsController < Sessions::SessionsController
     connected_with_france_connect = current_user.loged_in_with_france_connect
     current_user.update_attributes(loged_in_with_france_connect: false)
 
-
     signed_out = (Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name))
     set_flash_message :notice, :signed_out if signed_out && is_flashing_format?
     yield if block_given?
 
-
     if connected_with_france_connect
-      redirect_to FRANCE_CONNECT.logout_endpoint
+      redirect_to FRANCE_CONNECT.entreprise_logout_endpoint
     else
       respond_to_on_destroy
     end