User courses.mooc.fi user id instead of email

Redande · Redande · commit cc333a4b4773 · 2025-07-23T15:39:39.000+03:00
diff --git a/app/controllers/api/v8/users_controller.rb b/app/controllers/api/v8/users_controller.rb
@@ -230,8 +230,8 @@ def set_password
         end
 
         def maybe_update_password
-          if @user.password_managed_by_courses_mooc_fi
-            return @user.update_password_via_courses_mooc_fi(@user.email, user_params[:old_password], user_params[:password])
+          if @user.password_managed_by_courses_mooc_fi && @user.courses_mooc_fi_user_id.present?
+            return @user.update_password_via_courses_mooc_fi(@user.courses_mooc_fi_user_id, user_params[:old_password], user_params[:password])
           end
 
           if params[:old_password].present? && params[:password].present?
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
@@ -86,8 +86,8 @@ def set_email
     end
 
     def maybe_update_password(user, user_params)
-      if user.password_managed_by_courses_mooc_fi
-        return user.update_password_via_courses_mooc_fi(user.email, user_params[:old_password], user_params[:password])
+      if user.password_managed_by_courses_mooc_fi && user.courses_mooc_fi_user_id.present?
+        return user.update_password_via_courses_mooc_fi(user.courses_mooc_fi_user_id, user_params[:old_password], user_params[:password])
       end
 
       if user_params[:old_password].present? || user_params[:password].present?
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -179,8 +179,8 @@ def set_password
     end
 
     def maybe_update_password(user, user_params)
-      if user.password_managed_by_courses_mooc_fi
-        return user.update_password_via_courses_mooc_fi(user.email, user_params[:old_password], user_params[:password])
+      if user.password_managed_by_courses_mooc_fi && user.courses_mooc_fi_user_id.present?
+        return user.update_password_via_courses_mooc_fi(user.courses_mooc_fi_user_id, user_params[:old_password], user_params[:password])
       end
 
       if user_params[:old_password].present? || user_params[:password].present?
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -148,15 +148,15 @@ def self.authenticate(login, submitted_password)
     user = find_by(login: login)
     user ||= find_by('lower(email) = ?', login.downcase)
     return nil if user.nil?
-    user if user.password_managed_by_courses_mooc_fi && authenticate_via_courses_mooc_fi(user.email, submitted_password)
+    user if user.password_managed_by_courses_mooc_fi && user.courses_mooc_fi_user_id.present? && authenticate_via_courses_mooc_fi(user.courses_mooc_fi_user_id, submitted_password)
     user if user.has_password?(submitted_password)
   end
 
-  def authenticate_via_courses_mooc_fi(email, submitted_password)
+  def authenticate_via_courses_mooc_fi(courses_mooc_fi_user_id, submitted_password)
     auth_url = SiteSetting.value('courses_mooc_fi_auth_url')
     response = RestClient.post(
       auth_url,
-      { email: email, password: submitted_password }.to_json,
+      { user_id: courses_mooc_fi_user_id, password: submitted_password }.to_json,
       { content_type: :json, accept: :json }
     )
 
@@ -176,13 +176,13 @@ def authenticate_via_courses_mooc_fi(email, submitted_password)
     raise "Unexpected error while authenticating via courses.mooc.fi: #{e.message}"
   end
 
-  def update_password_via_courses_mooc_fi(email, old_password, new_password)
+  def update_password_via_courses_mooc_fi(courses_mooc_fi_user_id, old_password, new_password)
     update_url = SiteSetting.value('courses_mooc_fi_update_password_url')
 
     response = RestClient.put(
       update_url,
       {
-        email: email,
+        user_id: courses_mooc_fi_user_id,
         old_password: old_password,
         new_password: new_password
       }.to_json,
@@ -192,15 +192,15 @@ def update_password_via_courses_mooc_fi(email, old_password, new_password)
     data = JSON.parse(response.body)
 
     unless data['updated'] == true
-      raise "Updating password via courses.mooc.fi failed for #{email}"
+      raise "Updating password via courses.mooc.fi failed for user with courses.mooc.fi-user-id #{courses_mooc_fi_user_id}"
     end
 
     true
   rescue RestClient::ExceptionWithResponse => e
-    Rails.logger.error("Updating password via courses.mooc.fi failed for #{email}: #{e.response}")
+    Rails.logger.error("Updating password via courses.mooc.fi failed for user with courses.mooc.fi-user-id #{courses_mooc_fi_user_id}: #{e.response}")
     false
   rescue => e
-    Rails.logger.error("Unexpected error updating password via courses.mooc.fi for #{email}: #{e.message}")
+    Rails.logger.error("Unexpected error updating password via courses.mooc.fi for user with courses.mooc.fi-user-id #{courses_mooc_fi_user_id}: #{e.message}")
     false
   end
 
