Merge pull request #4202 from betagouv/remove_administrateur_devise_account
Remove administrateur devise account
This commit is contained in:
commit
2d9569d30d
46 changed files with 258 additions and 244 deletions
|
@ -3,7 +3,9 @@ class Administrateurs::ActivateController < ApplicationController
|
|||
|
||||
def new
|
||||
@token = params[:token]
|
||||
@administrateur = Administrateur.find_inactive_by_token(@token)
|
||||
|
||||
user = User.with_reset_password_token(@token)
|
||||
@administrateur = user&.administrateur
|
||||
|
||||
if @administrateur
|
||||
# the administrateur activates its account from an email
|
||||
|
@ -16,14 +18,16 @@ class Administrateurs::ActivateController < ApplicationController
|
|||
|
||||
def create
|
||||
password = update_administrateur_params[:password]
|
||||
administrateur = Administrateur.reset_password(
|
||||
update_administrateur_params[:reset_password_token],
|
||||
password
|
||||
)
|
||||
|
||||
if administrateur && administrateur.errors.empty?
|
||||
sign_in(administrateur, scope: :administrateur)
|
||||
try_to_authenticate(User, administrateur.email, password)
|
||||
user = User.reset_password_by_token({
|
||||
password: password,
|
||||
password_confirmation: password,
|
||||
reset_password_token: update_administrateur_params[:reset_password_token]
|
||||
})
|
||||
|
||||
if user&.administrateur&.errors&.empty?
|
||||
sign_in(user, scope: :user)
|
||||
|
||||
flash.notice = "Mot de passe enregistré"
|
||||
redirect_to admin_procedures_path
|
||||
else
|
||||
|
|
|
@ -18,7 +18,8 @@ class ApplicationController < ActionController::Base
|
|||
before_action :set_active_storage_host
|
||||
before_action :setup_tracking
|
||||
|
||||
helper_method :logged_in?, :multiple_devise_profile_connect?, :instructeur_signed_in?, :current_instructeur
|
||||
helper_method :logged_in?, :multiple_devise_profile_connect?, :instructeur_signed_in?, :current_instructeur,
|
||||
:administrateur_signed_in?, :current_administrateur
|
||||
|
||||
def staging_authenticate
|
||||
if StagingAuthService.enabled? && !authenticate_with_http_basic { |username, password| StagingAuthService.authenticate(username, password) }
|
||||
|
@ -66,6 +67,14 @@ class ApplicationController < ActionController::Base
|
|||
user_signed_in? && current_user&.instructeur.present?
|
||||
end
|
||||
|
||||
def current_administrateur
|
||||
current_user&.administrateur
|
||||
end
|
||||
|
||||
def administrateur_signed_in?
|
||||
current_administrateur.present?
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def authenticate_logged_user!
|
||||
|
@ -85,9 +94,7 @@ class ApplicationController < ActionController::Base
|
|||
end
|
||||
|
||||
def authenticate_administrateur!
|
||||
if administrateur_signed_in?
|
||||
super
|
||||
else
|
||||
if !administrateur_signed_in?
|
||||
redirect_to new_user_session_path
|
||||
end
|
||||
end
|
||||
|
|
|
@ -23,7 +23,7 @@ class Users::ActivateController < ApplicationController
|
|||
|
||||
if user && user.errors.empty?
|
||||
sign_in(user, scope: :user)
|
||||
try_to_authenticate(Administrateur, user.email, password)
|
||||
|
||||
flash.notice = "Mot de passe enregistré"
|
||||
redirect_to instructeur_procedures_path
|
||||
else
|
||||
|
|
|
@ -59,7 +59,7 @@ class Users::PasswordsController < Devise::PasswordsController
|
|||
administrateur = Administrateur.find_by(email: current_user.email)
|
||||
|
||||
if administrateur
|
||||
sign_in administrateur
|
||||
sign_in(administrateur.user)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -16,8 +16,7 @@ class Users::SessionsController < Sessions::SessionsController
|
|||
def create
|
||||
remember_me = params[:user][:remember_me] == '1'
|
||||
|
||||
if resource_locked?(try_to_authenticate(User, remember_me)) ||
|
||||
resource_locked?(try_to_authenticate(Administrateur, remember_me))
|
||||
if resource_locked?(try_to_authenticate(User, remember_me))
|
||||
flash.alert = 'Votre compte est verrouillé.'
|
||||
new
|
||||
return render :new, status: 401
|
||||
|
@ -43,14 +42,6 @@ class Users::SessionsController < Sessions::SessionsController
|
|||
|
||||
# DELETE /resource/sign_out
|
||||
def destroy
|
||||
if instructeur_signed_in?
|
||||
sign_out :instructeur
|
||||
end
|
||||
|
||||
if administrateur_signed_in?
|
||||
sign_out :administrateur
|
||||
end
|
||||
|
||||
if user_signed_in?
|
||||
connected_with_france_connect = current_user.loged_in_with_france_connect
|
||||
current_user.update(loged_in_with_france_connect: '')
|
||||
|
|
|
@ -2,6 +2,10 @@ class Administrateurs::ActivateBeforeExpirationJob < ApplicationJob
|
|||
queue_as :cron
|
||||
|
||||
def perform(*args)
|
||||
Administrateur.inactive.where(created_at: 3.days.ago.all_day).each(&:remind_invitation!)
|
||||
Administrateur
|
||||
.includes(:user)
|
||||
.inactive
|
||||
.where(created_at: 3.days.ago.all_day)
|
||||
.each { |a| a.user.remind_invitation! }
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
class AdministrateurMailer < ApplicationMailer
|
||||
layout 'mailers/layout'
|
||||
|
||||
def activate_before_expiration(administrateur, reset_password_token)
|
||||
@administrateur = administrateur
|
||||
def activate_before_expiration(user, reset_password_token)
|
||||
@user = user
|
||||
@reset_password_token = reset_password_token
|
||||
@expiration_date = @administrateur.reset_password_sent_at + Devise.reset_password_within
|
||||
@expiration_date = @user.reset_password_sent_at + Devise.reset_password_within
|
||||
@subject = "N'oubliez pas d'activer votre compte administrateur"
|
||||
|
||||
mail(to: administrateur.email,
|
||||
mail(to: user.email,
|
||||
subject: @subject,
|
||||
reply_to: CONTACT_EMAIL)
|
||||
end
|
||||
|
|
|
@ -3,21 +3,20 @@ class Administrateur < ApplicationRecord
|
|||
include EmailSanitizableConcern
|
||||
include ActiveRecord::SecureToken
|
||||
|
||||
devise :database_authenticatable, :registerable, :async,
|
||||
:recoverable, :rememberable, :trackable, :validatable, :lockable
|
||||
|
||||
has_and_belongs_to_many :instructeurs
|
||||
has_many :administrateurs_procedures
|
||||
has_many :procedures, through: :administrateurs_procedures
|
||||
has_many :services
|
||||
has_many :dossiers, -> { state_not_brouillon }, through: :procedures
|
||||
|
||||
has_one :user
|
||||
|
||||
before_validation -> { sanitize_email(:email) }
|
||||
|
||||
scope :inactive, -> { where(active: false) }
|
||||
scope :with_publiees_ou_archivees, -> { joins(:procedures).where(procedures: { aasm_state: [:publiee, :archivee] }) }
|
||||
|
||||
validate :password_complexity, if: Proc.new { |a| Devise.password_length.include?(a.password.try(:size)) }
|
||||
# validate :password_complexity, if: Proc.new { |a| Devise.password_length.include?(a.password.try(:size)) }
|
||||
|
||||
def password_complexity
|
||||
if password.present? && ZxcvbnService.new(password).score < PASSWORD_COMPLEXITY_FOR_ADMIN
|
||||
|
@ -56,28 +55,6 @@ class Administrateur < ApplicationRecord
|
|||
end
|
||||
end
|
||||
|
||||
def invite!(administration_id)
|
||||
if active?
|
||||
raise "Impossible d'inviter un utilisateur déjà actif !"
|
||||
end
|
||||
|
||||
reset_password_token = set_reset_password_token
|
||||
|
||||
AdministrationMailer.invite_admin(self, reset_password_token, administration_id).deliver_later
|
||||
|
||||
reset_password_token
|
||||
end
|
||||
|
||||
def remind_invitation!
|
||||
if active?
|
||||
raise "Impossible d'envoyer un rappel d'invitation à un utilisateur déjà actif !"
|
||||
end
|
||||
|
||||
reset_password_token = set_reset_password_token
|
||||
|
||||
AdministrateurMailer.activate_before_expiration(self, reset_password_token).deliver_later
|
||||
end
|
||||
|
||||
def invitation_expired?
|
||||
!active && !reset_password_period_valid?
|
||||
end
|
||||
|
|
|
@ -9,29 +9,33 @@ class Administration < ApplicationRecord
|
|||
|
||||
def invite_admin(email)
|
||||
password = SecureRandom.hex
|
||||
administrateur = Administrateur.new({
|
||||
email: email,
|
||||
active: false,
|
||||
password: password,
|
||||
password_confirmation: password
|
||||
})
|
||||
|
||||
if administrateur.save
|
||||
AdministrationMailer.new_admin_email(administrateur, self).deliver_later
|
||||
administrateur.invite!(id)
|
||||
user = User.find_by(email: email)
|
||||
|
||||
user = User.create({
|
||||
if user.nil?
|
||||
# set confirmed_at otherwise admin confirmation doesnt work
|
||||
# we somehow mess up using reset_password logic instead of
|
||||
# confirmation_logic
|
||||
# FIXME
|
||||
user = User.create(
|
||||
email: email,
|
||||
password: password,
|
||||
confirmed_at: Time.zone.now
|
||||
})
|
||||
|
||||
Instructeur.create({
|
||||
email: email,
|
||||
user: user
|
||||
})
|
||||
)
|
||||
end
|
||||
|
||||
administrateur
|
||||
if user.errors.empty?
|
||||
if user.instructeur.nil?
|
||||
Instructeur.create!(email: email, user: user)
|
||||
end
|
||||
|
||||
if user.administrateur.nil?
|
||||
administrateur = Administrateur.create!(email: email, active: false, user: user)
|
||||
AdministrationMailer.new_admin_email(administrateur, self).deliver_later
|
||||
user.invite_administrateur!(id)
|
||||
end
|
||||
end
|
||||
|
||||
user
|
||||
end
|
||||
end
|
||||
|
|
|
@ -18,6 +18,7 @@ class User < ApplicationRecord
|
|||
has_many :feedbacks, dependent: :destroy
|
||||
has_one :france_connect_information, dependent: :destroy
|
||||
belongs_to :instructeur
|
||||
belongs_to :administrateur
|
||||
|
||||
accepts_nested_attributes_for :france_connect_information
|
||||
|
||||
|
@ -44,6 +45,23 @@ class User < ApplicationRecord
|
|||
UserMailer.invite_instructeur(self, set_reset_password_token).deliver_later
|
||||
end
|
||||
|
||||
def invite_administrateur!(administration_id)
|
||||
if administrateur.active?
|
||||
raise "Impossible d'inviter un utilisateur déjà actif !"
|
||||
end
|
||||
|
||||
reset_password_token = set_reset_password_token
|
||||
AdministrationMailer.invite_admin(self, reset_password_token, administration_id).deliver_later
|
||||
|
||||
reset_password_token
|
||||
end
|
||||
|
||||
def remind_invitation!
|
||||
reset_password_token = set_reset_password_token
|
||||
|
||||
AdministrateurMailer.activate_before_expiration(self, reset_password_token).deliver_later
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def link_invites!
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
%p
|
||||
Afin d’activer votre compte, veuillez cliquer sur le lien ci-dessous :
|
||||
= link_to(admin_activate_url(token: @reset_password_token), admin_activate_url(token: @reset_password_token))
|
||||
= link_to(users_activate_url(token: @reset_password_token), users_activate_url(token: @reset_password_token))
|
||||
|
||||
%p
|
||||
Nous restons à votre disposition si vous avez besoin d’accompagnement.
|
||||
|
|
|
@ -77,8 +77,6 @@ Rails.application.routes.draw do
|
|||
omniauth_callbacks: 'administrations/omniauth_callbacks'
|
||||
}
|
||||
|
||||
devise_for :administrateurs, skip: :all
|
||||
|
||||
devise_for :users, controllers: {
|
||||
sessions: 'users/sessions',
|
||||
registrations: 'users/registrations',
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
class LinkUserAndAdministrateur < ActiveRecord::Migration[5.2]
|
||||
def change
|
||||
add_reference :users, :administrateur, index: true
|
||||
add_foreign_key :users, :administrateurs
|
||||
end
|
||||
end
|
|
@ -10,7 +10,7 @@
|
|||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 2019_08_08_144607) do
|
||||
ActiveRecord::Schema.define(version: 2019_08_09_073736) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
|
@ -597,6 +597,8 @@ ActiveRecord::Schema.define(version: 2019_08_08_144607) do
|
|||
t.datetime "locked_at"
|
||||
t.text "unconfirmed_email"
|
||||
t.bigint "instructeur_id"
|
||||
t.bigint "administrateur_id"
|
||||
t.index ["administrateur_id"], name: "index_users_on_administrateur_id"
|
||||
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
|
||||
t.index ["email"], name: "index_users_on_email", unique: true
|
||||
t.index ["instructeur_id"], name: "index_users_on_instructeur_id"
|
||||
|
@ -644,6 +646,7 @@ ActiveRecord::Schema.define(version: 2019_08_08_144607) do
|
|||
add_foreign_key "services", "administrateurs"
|
||||
add_foreign_key "trusted_device_tokens", "instructeurs"
|
||||
add_foreign_key "types_de_champ", "types_de_champ", column: "parent_id"
|
||||
add_foreign_key "users", "administrateurs"
|
||||
add_foreign_key "users", "instructeurs"
|
||||
add_foreign_key "without_continuation_mails", "procedures"
|
||||
end
|
||||
|
|
12
db/seeds.rb
12
db/seeds.rb
|
@ -10,6 +10,12 @@ default_password = "this is a very complicated password !"
|
|||
|
||||
puts "Create test user '#{default_user}'"
|
||||
Administration.create!(email: default_user, password: default_password)
|
||||
Administrateur.create!(email: default_user, password: default_password)
|
||||
Instructeur.create!(email: default_user, password: default_password)
|
||||
User.create!(email: default_user, password: default_password, confirmed_at: Time.zone.now)
|
||||
administrateur = Administrateur.create!(email: default_user)
|
||||
instructeur = Instructeur.create!(email: default_user)
|
||||
User.create!(
|
||||
email: default_user,
|
||||
password: default_password,
|
||||
confirmed_at: Time.zone.now,
|
||||
administrateur: administrateur,
|
||||
instructeur: instructeur
|
||||
)
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
namespace :after_party do
|
||||
desc 'Deployment task: populate_user_administrateur_ids'
|
||||
task populate_user_administrateur_ids: :environment do
|
||||
Administrateur.find_each do |administrateur|
|
||||
User.where(email: administrateur.email).update(administrateur_id: administrateur.id)
|
||||
end
|
||||
|
||||
AfterParty::TaskRecord.create version: '20190809074534'
|
||||
end
|
||||
end
|
|
@ -6,7 +6,7 @@ describe Admin::AssignsController, type: :controller do
|
|||
let(:instructeur) { create :instructeur, administrateurs: [admin] }
|
||||
|
||||
before do
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
end
|
||||
|
||||
describe 'GET #show' do
|
||||
|
|
|
@ -11,7 +11,7 @@ describe Admin::AttestationTemplatesController, type: :controller do
|
|||
let(:uninterlaced_logo) { fixture_file_upload('spec/fixtures/files/uninterlaced-black.png', 'image/png') }
|
||||
|
||||
before do
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
Timecop.freeze(Time.zone.now)
|
||||
end
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ describe Admin::InstructeursController, type: :controller do
|
|||
let(:admin_2) { create :administrateur, email: email_2 }
|
||||
|
||||
before do
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
end
|
||||
|
||||
describe 'GET #index' do
|
||||
|
@ -117,8 +117,8 @@ describe Admin::InstructeursController, type: :controller do
|
|||
before do
|
||||
create :instructeur, email: email, administrateurs: [admin]
|
||||
|
||||
sign_out admin
|
||||
sign_in admin_2
|
||||
sign_out(admin.user)
|
||||
sign_in(admin_2.user)
|
||||
|
||||
subject
|
||||
end
|
||||
|
@ -138,8 +138,8 @@ describe Admin::InstructeursController, type: :controller do
|
|||
before do
|
||||
create :instructeur, email: email, administrateurs: [admin]
|
||||
|
||||
sign_out admin
|
||||
sign_in admin_2
|
||||
sign_out(admin.user)
|
||||
sign_in(admin_2.user)
|
||||
|
||||
subject
|
||||
end
|
||||
|
|
|
@ -5,7 +5,7 @@ describe Admin::MailTemplatesController, type: :controller do
|
|||
let(:initiated_mail) { Mails::InitiatedMail.default_for_procedure(procedure) }
|
||||
|
||||
before do
|
||||
sign_in procedure.administrateurs.first
|
||||
sign_in(procedure.administrateurs.first.user)
|
||||
end
|
||||
|
||||
describe 'GET index' do
|
||||
|
|
|
@ -33,7 +33,7 @@ describe Admin::ProceduresController, type: :controller do
|
|||
}
|
||||
|
||||
before do
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
end
|
||||
|
||||
describe 'GET #index' do
|
||||
|
@ -155,7 +155,7 @@ describe Admin::ProceduresController, type: :controller do
|
|||
|
||||
context 'when user is not connected' do
|
||||
before do
|
||||
sign_out admin
|
||||
sign_out(admin.user)
|
||||
end
|
||||
|
||||
it { is_expected.to redirect_to new_user_session_path }
|
||||
|
@ -252,7 +252,7 @@ describe Admin::ProceduresController, type: :controller do
|
|||
|
||||
context 'when administrateur is not connected' do
|
||||
before do
|
||||
sign_out admin
|
||||
sign_out(admin.user)
|
||||
end
|
||||
|
||||
subject { put :update, params: { id: procedure.id } }
|
||||
|
@ -411,8 +411,8 @@ describe Admin::ProceduresController, type: :controller do
|
|||
let(:admin_2) { create(:administrateur) }
|
||||
|
||||
before do
|
||||
sign_out admin
|
||||
sign_in admin_2
|
||||
sign_out(admin.user)
|
||||
sign_in(admin_2.user)
|
||||
|
||||
put :publish, params: { procedure_id: procedure.id, path: 'fake_path' }
|
||||
procedure.reload
|
||||
|
@ -471,8 +471,8 @@ describe Admin::ProceduresController, type: :controller do
|
|||
let(:admin_2) { create(:administrateur) }
|
||||
|
||||
before do
|
||||
sign_out admin
|
||||
sign_in admin_2
|
||||
sign_out(admin.user)
|
||||
sign_in(admin_2.user)
|
||||
|
||||
put :archive, params: { procedure_id: procedure.id }
|
||||
procedure.reload
|
||||
|
@ -517,8 +517,8 @@ describe Admin::ProceduresController, type: :controller do
|
|||
let(:admin_2) { create(:administrateur) }
|
||||
|
||||
before do
|
||||
sign_out admin
|
||||
sign_in admin_2
|
||||
sign_out(admin.user)
|
||||
sign_in(admin_2.user)
|
||||
subject
|
||||
end
|
||||
|
||||
|
@ -783,7 +783,7 @@ describe Admin::ProceduresController, type: :controller do
|
|||
|
||||
context 'when administrateur is not connected' do
|
||||
before do
|
||||
sign_out admin
|
||||
sign_out(admin.user)
|
||||
end
|
||||
|
||||
subject { patch :update_monavis, params: { procedure_id: procedure.id } }
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
describe Administrateurs::ActivateController, type: :controller do
|
||||
describe '#new' do
|
||||
let(:admin) { create(:administrateur) }
|
||||
let(:token) { admin.send(:set_reset_password_token) }
|
||||
let(:token) { admin.user.send(:set_reset_password_token) }
|
||||
|
||||
before { allow(controller).to receive(:trust_device) }
|
||||
|
||||
|
|
|
@ -184,13 +184,7 @@ describe Instructeurs::DossiersController, type: :controller do
|
|||
expect(dossier.reload.state).to eq(Dossier.states.fetch(:accepte))
|
||||
expect(response).to have_http_status(:ok)
|
||||
end
|
||||
context 'as administrateur' do
|
||||
let (:current_user) { administrateur }
|
||||
it 'it is not possible to go back to en_instruction' do
|
||||
expect(dossier.reload.state).to eq(Dossier.states.fetch(:accepte))
|
||||
expect(response).to have_http_status(:ok)
|
||||
end
|
||||
end
|
||||
|
||||
context 'as superadmin' do
|
||||
let (:current_user) { administration }
|
||||
it 'it is not possible to go back to en_instruction' do
|
||||
|
|
|
@ -7,7 +7,7 @@ describe NewAdministrateur::MailTemplatesController, type: :controller do
|
|||
let(:procedure) { create(:procedure, :with_logo, :with_service, administrateur: admin) }
|
||||
|
||||
before do
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
get :preview, params: { id: "initiated_mail", procedure_id: procedure.id }
|
||||
end
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ describe NewAdministrateur::ProceduresController, type: :controller do
|
|||
let(:procedure) { create(:procedure) }
|
||||
|
||||
before do
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
get :apercu, params: { id: procedure.id }
|
||||
end
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ describe NewAdministrateur::ServicesController, type: :controller do
|
|||
|
||||
describe '#create' do
|
||||
before do
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
post :create, params: params
|
||||
end
|
||||
|
||||
|
@ -52,7 +52,7 @@ describe NewAdministrateur::ServicesController, type: :controller do
|
|||
let(:service_params) { { nom: 'nom', type_organisme: Service.type_organismes.fetch(:association) } }
|
||||
|
||||
before do
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
params = {
|
||||
id: service.id,
|
||||
service: service_params,
|
||||
|
@ -82,7 +82,7 @@ describe NewAdministrateur::ServicesController, type: :controller do
|
|||
let!(:service) { create(:service, administrateur: admin) }
|
||||
|
||||
def post_add_to_procedure
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
params = {
|
||||
procedure: {
|
||||
id: procedure.id,
|
||||
|
@ -114,7 +114,7 @@ describe NewAdministrateur::ServicesController, type: :controller do
|
|||
|
||||
context 'when a service has no related procedure' do
|
||||
before do
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
delete :destroy, params: { id: service.id, procedure_id: 12 }
|
||||
end
|
||||
|
||||
|
@ -128,7 +128,7 @@ describe NewAdministrateur::ServicesController, type: :controller do
|
|||
let!(:procedure) { create(:procedure, service: service) }
|
||||
|
||||
before do
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
delete :destroy, params: { id: service.id, procedure_id: 12 }
|
||||
end
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ describe NewAdministrateur::TypesDeChampController, type: :controller do
|
|||
|
||||
before do
|
||||
admin.procedures << procedure
|
||||
sign_in admin
|
||||
sign_in(admin.user)
|
||||
end
|
||||
|
||||
let(:type_champ) { TypeDeChamp.type_champs.fetch(:text) }
|
||||
|
|
|
@ -26,7 +26,7 @@ describe RootController, type: :controller do
|
|||
|
||||
context 'when Administrateur is connected' do
|
||||
before do
|
||||
sign_in create(:administrateur)
|
||||
sign_in(create(:administrateur).user)
|
||||
end
|
||||
|
||||
it { expect(subject).to redirect_to(admin_procedures_path) }
|
||||
|
|
|
@ -8,8 +8,6 @@ describe Sessions::SessionsController, type: :controller do
|
|||
end
|
||||
|
||||
let(:user) { create(:user) }
|
||||
let(:instructeur) { create(:instructeur) }
|
||||
let(:administrateur) { create(:administrateur) }
|
||||
|
||||
describe '#create' do
|
||||
before do
|
||||
|
@ -34,17 +32,4 @@ describe Sessions::SessionsController, type: :controller do
|
|||
post :create
|
||||
end
|
||||
end
|
||||
|
||||
describe '#create with administrateur connected' do
|
||||
before do
|
||||
@request.env["devise.mapping"] = Devise.mappings[:administrateur]
|
||||
|
||||
allow_any_instance_of(described_class).to receive(:administrateur_signed_in?).and_return(true)
|
||||
end
|
||||
|
||||
it 'calls sign out for administrateur' do
|
||||
expect_any_instance_of(described_class).to receive(:sign_out).with(:administrateur)
|
||||
post :create
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -10,7 +10,7 @@ describe Users::ProfilController, type: :controller do
|
|||
describe 'POST #renew_api_token' do
|
||||
let(:administrateur) { create(:administrateur) }
|
||||
|
||||
before { sign_in(administrateur) }
|
||||
before { sign_in(administrateur.user) }
|
||||
|
||||
before do
|
||||
allow(administrateur).to receive(:renew_api_token)
|
||||
|
|
|
@ -108,20 +108,6 @@ describe Users::SessionsController, type: :controller do
|
|||
expect(response).to redirect_to(root_path)
|
||||
end
|
||||
end
|
||||
|
||||
context "when associated administrateur" do
|
||||
let(:administrateur) { create(:administrateur, user: user) }
|
||||
|
||||
it 'signs user + instructeur + administrateur out' do
|
||||
sign_in user
|
||||
sign_in administrateur
|
||||
delete :destroy
|
||||
expect(@response.redirect?).to be(true)
|
||||
expect(subject.current_user).to be(nil)
|
||||
expect(subject.current_instructeur).to be(nil)
|
||||
expect(subject.current_administrateur).to be(nil)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#new' do
|
||||
|
|
|
@ -2,18 +2,20 @@ FactoryBot.define do
|
|||
sequence(:administrateur_email) { |n| "admin#{n}@admin.com" }
|
||||
factory :administrateur do
|
||||
email { generate(:administrateur_email) }
|
||||
password { 'mon chien aime les bananes' }
|
||||
|
||||
transient do
|
||||
user { nil }
|
||||
password { 'mon chien aime les bananes' }
|
||||
end
|
||||
|
||||
after(:create) do |admin, evaluator|
|
||||
after(:create) do |administrateur, evaluator|
|
||||
if evaluator.user.present?
|
||||
create(:instructeur, email: admin.email, password: admin.password, user: evaluator.user)
|
||||
user = evaluator.user
|
||||
else
|
||||
create(:instructeur, email: admin.email, password: admin.password)
|
||||
user = create(:user, email: administrateur.email, password: evaluator.password, administrateur: administrateur)
|
||||
end
|
||||
|
||||
create(:instructeur, email: administrateur.email, user: user)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ feature 'As an administrateur I wanna clone a procedure', js: true do
|
|||
let(:administrateur) { create(:administrateur) }
|
||||
|
||||
before do
|
||||
login_as administrateur, scope: :administrateur
|
||||
login_as administrateur.user, scope: :user
|
||||
visit new_from_existing_admin_procedures_path
|
||||
end
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
|
|||
let(:administrateur) { create(:administrateur, :with_procedure) }
|
||||
|
||||
before do
|
||||
login_as administrateur, scope: :administrateur
|
||||
login_as administrateur.user, scope: :user
|
||||
visit root_path
|
||||
end
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ feature 'Administrateurs can edit procedures', js: true do
|
|||
end
|
||||
|
||||
before do
|
||||
login_as administrateur, scope: :administrateur
|
||||
login_as administrateur.user, scope: :user
|
||||
end
|
||||
|
||||
context 'when the procedure is in draft' do
|
||||
|
|
|
@ -6,7 +6,7 @@ feature 'As an instructeur', js: true do
|
|||
let(:instructeur_email) { 'new_instructeur@gouv.fr' }
|
||||
|
||||
before do
|
||||
login_as administrateur, scope: :administrateur
|
||||
login_as administrateur.user, scope: :user
|
||||
visit admin_procedure_assigns_path(procedure)
|
||||
|
||||
fill_in :instructeur_email, with: instructeur_email
|
||||
|
|
|
@ -5,7 +5,7 @@ feature 'As an administrateur I can edit types de champ', js: true do
|
|||
let(:procedure) { create(:procedure) }
|
||||
|
||||
before do
|
||||
login_as administrateur, scope: :administrateur
|
||||
login_as administrateur.user, scope: :user
|
||||
visit champs_procedure_path(procedure)
|
||||
end
|
||||
|
||||
|
|
57
spec/features/users/managing_password_spec.rb
Normal file
57
spec/features/users/managing_password_spec.rb
Normal file
|
@ -0,0 +1,57 @@
|
|||
require 'spec_helper'
|
||||
|
||||
feature 'Managing password:' do
|
||||
context 'for simple users' do
|
||||
let(:user) { create(:user) }
|
||||
let(:new_password) { 'a simple password' }
|
||||
|
||||
scenario 'a simple user can reset their password' do
|
||||
visit root_path
|
||||
click_on 'Connexion'
|
||||
click_on 'Mot de passe oublié ?'
|
||||
expect(page).to have_current_path(new_user_password_path)
|
||||
|
||||
fill_in 'Email', with: user.email
|
||||
perform_enqueued_jobs do
|
||||
click_on 'Réinitialiser'
|
||||
end
|
||||
expect(page).to have_content 'vous allez recevoir un lien de réinitialisation par email'
|
||||
|
||||
click_reset_password_link_for user.email
|
||||
expect(page).to have_content 'Changement de mot de passe'
|
||||
|
||||
fill_in 'user_password', with: new_password
|
||||
fill_in 'user_password_confirmation', with: new_password
|
||||
click_on 'Changer le mot de passe'
|
||||
expect(page).to have_content('Votre mot de passe a été changé avec succès')
|
||||
end
|
||||
end
|
||||
|
||||
context 'for admins' do
|
||||
let(:user) { create(:user) }
|
||||
let(:administrateur) { create(:administrateur, user: user) }
|
||||
let(:new_password) { 'a new, long, and complicated password!' }
|
||||
|
||||
scenario 'an admin can reset their password' do
|
||||
visit root_path
|
||||
click_on 'Connexion'
|
||||
click_on 'Mot de passe oublié ?'
|
||||
expect(page).to have_current_path(new_user_password_path)
|
||||
|
||||
fill_in 'Email', with: user.email
|
||||
perform_enqueued_jobs do
|
||||
click_on 'Réinitialiser'
|
||||
end
|
||||
expect(page).to have_content 'vous allez recevoir un lien de réinitialisation par email'
|
||||
|
||||
click_reset_password_link_for user.email
|
||||
|
||||
expect(page).to have_content 'Changement de mot de passe'
|
||||
|
||||
fill_in 'user_password', with: new_password
|
||||
fill_in 'user_password_confirmation', with: new_password
|
||||
click_on 'Changer le mot de passe'
|
||||
expect(page).to have_content('Votre mot de passe a été changé avec succès')
|
||||
end
|
||||
end
|
||||
end
|
17
spec/features/users/sign_out_spec.rb
Normal file
17
spec/features/users/sign_out_spec.rb
Normal file
|
@ -0,0 +1,17 @@
|
|||
require 'spec_helper'
|
||||
|
||||
feature 'Sign out' do
|
||||
context 'when a user is logged in' do
|
||||
let(:user) { create(:administrateur).user }
|
||||
|
||||
before { login_as user, scope: :user }
|
||||
|
||||
scenario 'he can sign out' do
|
||||
visit dossiers_path
|
||||
|
||||
click_on 'Se déconnecter'
|
||||
|
||||
expect(page).to have_current_path(root_path)
|
||||
end
|
||||
end
|
||||
end
|
|
@ -38,7 +38,7 @@ RSpec.describe Administrateurs::ActivateBeforeExpirationJob, type: :job do
|
|||
subject
|
||||
end
|
||||
|
||||
it { expect(AdministrateurMailer).to have_received(:activate_before_expiration).with(administrateur, kind_of(String)) }
|
||||
it { expect(AdministrateurMailer).to have_received(:activate_before_expiration).with(administrateur.user, kind_of(String)) }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -8,29 +8,6 @@ describe Administrateur, type: :model do
|
|||
it { is_expected.to have_many(:procedures) }
|
||||
end
|
||||
|
||||
context 'unified login' do
|
||||
it 'syncs credentials to associated user' do
|
||||
administrateur = create(:administrateur)
|
||||
user = administrateur.instructeur.user
|
||||
|
||||
administrateur.update(email: 'whoami@plop.com', password: 'voilà un super mdp')
|
||||
|
||||
user.reload
|
||||
expect(user.email).to eq('whoami@plop.com')
|
||||
expect(user.valid_password?('voilà un super mdp')).to be(true)
|
||||
end
|
||||
|
||||
it 'syncs credentials to associated administrateur' do
|
||||
administrateur = create(:administrateur)
|
||||
instructeur = administrateur.instructeur
|
||||
|
||||
administrateur.update(email: 'whoami@plop.com', password: 'et encore un autre mdp')
|
||||
|
||||
instructeur.reload
|
||||
expect(instructeur.email).to eq('whoami@plop.com')
|
||||
end
|
||||
end
|
||||
|
||||
describe "#renew_api_token" do
|
||||
let!(:administrateur) { create(:administrateur) }
|
||||
let!(:token) { administrateur.renew_api_token }
|
||||
|
@ -44,22 +21,6 @@ describe Administrateur, type: :model do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#find_inactive_by_token' do
|
||||
let(:administrateur) { create(:administration).invite_admin('paul@tps.fr') }
|
||||
let(:reset_password_token) { administrateur.invite!(administration.id) }
|
||||
|
||||
it { expect(Administrateur.find_inactive_by_token(reset_password_token)).not_to be_nil }
|
||||
end
|
||||
|
||||
describe '#reset_password' do
|
||||
let(:administrateur) { create(:administration).invite_admin('paul@tps.fr') }
|
||||
let(:reset_password_token) { administrateur.invite!(administration.id) }
|
||||
|
||||
it { expect(Administrateur.reset_password(reset_password_token, "j'aime manger des radis").errors).to be_empty }
|
||||
it { expect(Administrateur.reset_password('123', "j'aime manger des radis").errors).not_to be_empty }
|
||||
it { expect(Administrateur.reset_password(reset_password_token, '').errors).not_to be_empty }
|
||||
end
|
||||
|
||||
describe '#feature_enabled?' do
|
||||
let(:administrateur) { create(:administrateur) }
|
||||
|
||||
|
@ -71,33 +32,33 @@ describe Administrateur, type: :model do
|
|||
it { expect(administrateur.feature_enabled?(:test_a)).to be_truthy }
|
||||
end
|
||||
|
||||
describe '#password_complexity' do
|
||||
let(:email) { 'mail@beta.gouv.fr' }
|
||||
let(:passwords) { ['pass', '12pass23', 'démarches ', 'démarches-simple', 'démarches-simplifiées-pwd'] }
|
||||
let(:administrateur) { build(:administrateur, email: email, password: password) }
|
||||
let(:min_complexity) { PASSWORD_COMPLEXITY_FOR_ADMIN }
|
||||
# describe '#password_complexity' do
|
||||
# let(:email) { 'mail@beta.gouv.fr' }
|
||||
# let(:passwords) { ['pass', '12pass23', 'démarches ', 'démarches-simple', 'démarches-simplifiées-pwd'] }
|
||||
# let(:administrateur) { build(:administrateur, email: email, password: password) }
|
||||
# let(:min_complexity) { PASSWORD_COMPLEXITY_FOR_ADMIN }
|
||||
|
||||
subject do
|
||||
administrateur.save
|
||||
administrateur.errors.full_messages
|
||||
end
|
||||
# subject do
|
||||
# administrateur.save
|
||||
# administrateur.errors.full_messages
|
||||
# end
|
||||
|
||||
context 'when password is too short' do
|
||||
let(:password) { 's' * (PASSWORD_MIN_LENGTH - 1) }
|
||||
# context 'when password is too short' do
|
||||
# let(:password) { 's' * (PASSWORD_MIN_LENGTH - 1) }
|
||||
|
||||
it { expect(subject).to eq(["Le mot de passe est trop court"]) }
|
||||
end
|
||||
# it { expect(subject).to eq(["Le mot de passe est trop court"]) }
|
||||
# end
|
||||
|
||||
context 'when password is too simple' do
|
||||
let(:password) { passwords[min_complexity - 1] }
|
||||
# context 'when password is too simple' do
|
||||
# let(:password) { passwords[min_complexity - 1] }
|
||||
|
||||
it { expect(subject).to eq(["Le mot de passe n'est pas assez complexe"]) }
|
||||
end
|
||||
# it { expect(subject).to eq(["Le mot de passe n'est pas assez complexe"]) }
|
||||
# end
|
||||
|
||||
context 'when password is acceptable' do
|
||||
let(:password) { passwords[min_complexity] }
|
||||
# context 'when password is acceptable' do
|
||||
# let(:password) { passwords[min_complexity] }
|
||||
|
||||
it { expect(subject).to eq([]) }
|
||||
end
|
||||
end
|
||||
# it { expect(subject).to eq([]) }
|
||||
# end
|
||||
# end
|
||||
end
|
||||
|
|
|
@ -4,13 +4,15 @@ describe Administration, type: :model do
|
|||
describe '#invite_admin' do
|
||||
let(:administration) { create :administration }
|
||||
let(:valid_email) { 'paul@tps.fr' }
|
||||
|
||||
subject { administration.invite_admin(valid_email) }
|
||||
|
||||
it {
|
||||
expect(subject.errors).to be_empty
|
||||
expect(subject).to be_persisted
|
||||
expect(administration.invite_admin(valid_email).errors).not_to be_empty
|
||||
user = subject
|
||||
expect(user.errors).to be_empty
|
||||
expect(user).to be_persisted
|
||||
}
|
||||
|
||||
it { expect(administration.invite_admin(nil).errors).not_to be_empty }
|
||||
it { expect(administration.invite_admin('toto').errors).not_to be_empty }
|
||||
|
||||
|
|
|
@ -137,18 +137,6 @@ describe Instructeur, type: :model do
|
|||
end
|
||||
end
|
||||
|
||||
context 'unified login' do
|
||||
it 'syncs credentials to associated administrateur' do
|
||||
admin = create(:administrateur)
|
||||
user = admin.instructeur.user
|
||||
|
||||
user.update(password: 'démarches-simplifiées-pwd')
|
||||
|
||||
admin.reload
|
||||
expect(admin.valid_password?('démarches-simplifiées-pwd')).to be(true)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'last_week_overview' do
|
||||
let!(:instructeur2) { create(:instructeur) }
|
||||
subject { instructeur2.last_week_overview }
|
||||
|
|
|
@ -100,18 +100,4 @@ describe User, type: :model do
|
|||
it { is_expected.to be_falsey }
|
||||
end
|
||||
end
|
||||
|
||||
context 'unified login' do
|
||||
it 'syncs credentials to associated administrateur' do
|
||||
admin = create(:administrateur)
|
||||
user = admin.instructeur.user
|
||||
|
||||
user.update(email: 'whoami@plop.com', password: 'démarches-simplifiées2')
|
||||
user.confirm
|
||||
|
||||
admin.reload
|
||||
expect(admin.email).to eq('whoami@plop.com')
|
||||
expect(admin.valid_password?('démarches-simplifiées2')).to be(true)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -78,6 +78,13 @@ module FeatureHelpers
|
|||
value
|
||||
end
|
||||
end
|
||||
|
||||
def click_reset_password_link_for(email)
|
||||
reset_password_email = open_email(email)
|
||||
token_params = reset_password_email.body.match(/reset_password_token=[^"]+/)
|
||||
|
||||
visit "/users/password/edit?#{token_params}"
|
||||
end
|
||||
end
|
||||
|
||||
RSpec.configure do |config|
|
||||
|
|
|
@ -6,6 +6,7 @@ describe 'layouts/procedure_context.html.haml', type: :view do
|
|||
|
||||
before do
|
||||
allow(view).to receive(:instructeur_signed_in?).and_return(false)
|
||||
allow(view).to receive(:administrateur_signed_in?).and_return(false)
|
||||
end
|
||||
|
||||
subject do
|
||||
|
|
Loading…
Reference in a new issue