diff --git a/app/controllers/users/activate_controller.rb b/app/controllers/users/activate_controller.rb index c83cb026a..c8553c3a4 100644 --- a/app/controllers/users/activate_controller.rb +++ b/app/controllers/users/activate_controller.rb @@ -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 diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index dbce76e0d..8aad112cb 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -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 diff --git a/app/models/administrateur.rb b/app/models/administrateur.rb index 399190165..c1c1ffcd2 100644 --- a/app/models/administrateur.rb +++ b/app/models/administrateur.rb @@ -3,9 +3,6 @@ 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 diff --git a/config/routes.rb b/config/routes.rb index 678746d53..01301c3fb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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',