From 96d3ffd1395989119eeb4d46c448511ae4c5424b Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Wed, 22 May 2024 15:46:35 +0200
Subject: [PATCH] Remove unused authentication option

---
 .../auth/omniauth_callbacks_controller.rb          | 14 ++++----------
 app/models/event.rb                                |  2 +-
 config/locales/devise.en.yml                       |  1 +
 config/locales/devise.nl.yml                       |  1 +
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/controllers/auth/omniauth_callbacks_controller.rb b/app/controllers/auth/omniauth_callbacks_controller.rb
index f5ff5486f0..d0112254e2 100644
--- a/app/controllers/auth/omniauth_callbacks_controller.rb
+++ b/app/controllers/auth/omniauth_callbacks_controller.rb
@@ -113,17 +113,11 @@ def try_login!
     # Ensure that an appropriate provider is used.
     return redirect_to_preferred_provider! if provider.redirect?
 
-    identity = nil
+    # ensure that an auth uid is present
+    return redirect_with_flash!(I18n.t('devise.failure.no_auth_id')) if auth_uid.blank?
+
     # First try to find an existing identity
-    if auth_uid.present?
-      # Basic case
-      identity = find_identity_by_uid
-    else
-      # For providers without auth uid
-      user = find_user_in_institution
-      identity = find_identity_by_user(user) if user.present?
-      Event.create(event_type: :no_auth_id_sign_in, user: user, message: "User #{user.id} logged in without auth_id using identity #{identity.id}") if identity.present? && user.present?
-    end
+    identity = find_identity_by_uid
     # At this point identity should have a value if it exists in our database
 
     if identity.blank?
diff --git a/app/models/event.rb b/app/models/event.rb
index 417e01d8b3..4d0480ad0f 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -11,7 +11,7 @@
 #
 
 class Event < ApplicationRecord
-  enum event_type: { rejudge: 0, permission_change: 1, exercise_repository: 2, error: 3, no_auth_id_sign_in: 4 }
+  enum event_type: { rejudge: 0, permission_change: 1, exercise_repository: 2, error: 3 }
   belongs_to :user, optional: true
 
   validates :event_type, presence: true
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 3a686f54ee..b4b0485b4c 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -17,6 +17,7 @@ en:
       unauthenticated: "You need to sign in or sign up before continuing."
       unconfirmed: "You have to confirm your email address before continuing."
       smartschool_co_account: "Smartschool co-accounts are not supported by Dodona. Use a student's Smartschool account to sign in."
+      no_auth_id: "No authentication ID found."
     mailer:
       confirmation_instructions:
         subject: "Confirmation instructions"
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index 9640b1b359..78625f0890 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -17,6 +17,7 @@ nl:
       unauthenticated: "Je moet eerst inloggen of aanmelden, voordat je verder kunt gaan."
       unconfirmed: "Je moet eerst je account bevestigen, voordat je verder kunt gaan"
       smartschool_co_account: "Smartschool co-accounts worden niet ondersteund door Dodona. Gebruik een leerlingaccount om aan te melden."
+      no_auth_id: "Geen authenticatie ID gevonden."
     mailer:
       confirmation_instructions:
         subject: "Bevestigingsinstructies"