From 46ae0106526111ba392dc8a1cae5612a2c1f279c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Mon, 24 Oct 2022 16:14:33 +0200
Subject: [PATCH] two factor authentication
---
Gemfile.lock | 14 +++++++-------
app/models/user/with_authentication.rb | 8 ++++++++
app/services/sendinblue/sms_service.rb | 2 +-
.../mailer/two_factor_authentication_code.html.erb | 2 +-
config/locales/en.yml | 4 ++--
config/locales/fr.yml | 4 ++--
6 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index cacb477a9..c439c7918 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,9 +9,9 @@ GIT
GIT
remote: https://github.com/noesya/two_factor_authentication.git
- revision: 55807c784803abb1f93000adab3e3b3f518b508b
+ revision: ab9734c72d389aefe8ff566d41a0c35bfe5ec989
specs:
- two_factor_authentication (3.0.2)
+ two_factor_authentication (4.0.0)
devise
encryptor
rails (>= 3.1.1)
@@ -90,8 +90,8 @@ GEM
autoprefixer-rails (10.4.7.0)
execjs (~> 2)
aws-eventstream (1.2.0)
- aws-partitions (1.648.0)
- aws-sdk-core (3.162.0)
+ aws-partitions (1.649.0)
+ aws-sdk-core (3.164.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
@@ -99,7 +99,7 @@ GEM
aws-sdk-kms (1.58.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.115.0)
+ aws-sdk-s3 (1.116.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
@@ -173,7 +173,7 @@ GEM
ethon (0.15.0)
ffi (>= 1.15.0)
execjs (2.8.1)
- faceted_search (3.5.15)
+ faceted_search (3.5.16)
font-awesome-sass
rails (>= 5.2.0)
faraday (2.6.0)
@@ -311,7 +311,7 @@ GEM
rack (>= 1.2, < 4)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
- octokit (5.6.1)
+ octokit (6.0.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
omniauth (2.1.0)
diff --git a/app/models/user/with_authentication.rb b/app/models/user/with_authentication.rb
index 27d1d9b2b..86a880834 100644
--- a/app/models/user/with_authentication.rb
+++ b/app/models/user/with_authentication.rb
@@ -55,6 +55,14 @@ module User::WithAuthentication
true
end
+ def send_new_otp(request, options = {})
+ current_extranet = Communication::Extranet.with_host(request.host)
+ current_university = University.with_host(request.host)
+ current_university ||= university
+ self.registration_context = current_extranet || current_university
+ super
+ end
+
def direct_otp_default_delivery_method
mobile_phone.present? ? :mobile_phone : :email
end
diff --git a/app/services/sendinblue/sms_service.rb b/app/services/sendinblue/sms_service.rb
index 123329dd8..41b11efe9 100644
--- a/app/services/sendinblue/sms_service.rb
+++ b/app/services/sendinblue/sms_service.rb
@@ -4,7 +4,7 @@ module Sendinblue
def self.send_mfa_code(user, code)
duration = ActiveSupport::Duration.build(Rails.application.config.devise.direct_otp_valid_for).inspect
- message = I18n.t('sms_code', code: code, university: user.university, duration: duration)
+ message = I18n.t('sms_code', code: code, context: user.registration_context, duration: duration)
self.send_message(user, message)
end
diff --git a/app/views/devise/mailer/two_factor_authentication_code.html.erb b/app/views/devise/mailer/two_factor_authentication_code.html.erb
index 2f9f3a3a9..599b0cc4a 100644
--- a/app/views/devise/mailer/two_factor_authentication_code.html.erb
+++ b/app/views/devise/mailer/two_factor_authentication_code.html.erb
@@ -1 +1 @@
-<p><%= t('devise.mailer.two_factor_authentication_code.text_html', university: @university, code: @code, duration: @duration) %></p>
+<p><%= t('devise.mailer.two_factor_authentication_code.text_html', context: @resource.registration_context, code: @code, duration: @duration) %></p>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1045278c1..48d8ed57d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -130,7 +130,7 @@ en:
mailer:
two_factor_authentication_code:
subject: "Two-factor authentication code"
- text_html: "Your two-factor authentication code for %{university} is: <br><br><b>%{code}</b><br><br>It will expire in %{duration}."
+ text_html: "Your two-factor authentication code for %{context} is: <br><br><b>%{code}</b><br><br>It will expire in %{duration}."
omniauth_callbacks:
failure: "Failed to sign in."
passwords:
@@ -268,7 +268,7 @@ en:
test_chars: "%{min_length} characters min."
show: Show
slug_error: can only contain downcase letters, numbers, and dashes.
- sms_code: "%{code} is your authentication code on %{university} (valid %{duration})"
+ sms_code: "%{code} is your authentication code on %{context} (valid %{duration})"
static: Static file
terms_of_service: Terms of service
terms_of_service_url: https://osuny.org/conditions-d-utilisation
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 9343c22f7..eef4b496b 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -130,7 +130,7 @@ fr:
mailer:
two_factor_authentication_code:
subject: "Code d'authentification à deux facteurs"
- text_html: "Votre code d'authentification pour %{university} est :<br><br><b>%{code}</b><br><br>Il expirera dans %{duration}."
+ text_html: "Votre code d'authentification pour %{context} est :<br><br><b>%{code}</b><br><br>Il expirera dans %{duration}."
omniauth_callbacks:
failure: "Échec de l'authentification."
passwords:
@@ -268,7 +268,7 @@ fr:
test_chars: "%{min_length} caractères min."
show: Voir
slug_error: ne peut contenir que des lettres minuscules, des chiffres et des traits d'union.
- sms_code: "%{code} est votre code d'authentification sur %{university} (valide %{duration})"
+ sms_code: "%{code} est votre code d'authentification sur %{context} (valide %{duration})"
static: Fichier statique
terms_of_service: Conditions d'utilisation
terms_of_service_url: https://osuny.org/conditions-d-utilisation
--
GitLab