From 6438168fb95cf91c88f9f001ab36456dfc16243b Mon Sep 17 00:00:00 2001 From: Henrik Nygren Date: Mon, 16 Nov 2026 13:27:56 +0200 Subject: [PATCH 1/7] Send managed accounts to courses.mooc.fi for email and password --- app/controllers/settings_controller.rb | 11 +++----- app/controllers/users_controller.rb | 11 +++----- app/models/user.rb | 7 +++++ app/views/settings/_form.html.erb | 10 ++++--- app/views/users/_form.html.erb | 10 ++++--- .../_managed_credentials_notice.html.erb | 10 +++++++ spec/controllers/settings_controller_spec.rb | 27 +++++++++++++++++++ spec/controllers/users_controller_spec.rb | 8 +++--- 8 files changed, 71 insertions(+), 23 deletions(-) create mode 100644 app/views/users/_managed_credentials_notice.html.erb diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index c8fa5ac1c..b2618a754 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -89,6 +89,7 @@ def set_email user = T.must(@user) user_params = params[:user] + return if user.managed_externally? return if !user.new_record? && user_params[:email_repeat].blank? if user_params[:email].blank? @@ -102,14 +103,10 @@ def set_email sig { params(user: User, user_params: T.untyped).returns(T::Boolean) } def maybe_update_password(user, user_params) + return false if user.managed_externally? + if user_params[:old_password].present? || user_params[:password].present? - if user.managed_externally? - unless user.update_password_via_courses_mooc_fi(user_params[:old_password], user_params[:password]) - user.errors.add(:password, 'could not be changed. Please check your current password and try again.') - return false - end - return true - elsif user.externally_managed_without_target? + if user.externally_managed_without_target? user.errors.add(:base, 'This account is being migrated; password changes are temporarily unavailable.') return false end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9f6da3a90..bf1f1a64d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -145,6 +145,7 @@ def set_email user = T.must(@user) user_params = params[:user] + return if user.managed_externally? return if !user.new_record? && user_params[:email_repeat].blank? if user_params[:email].blank? @@ -173,14 +174,10 @@ def set_password sig { params(user: User, user_params: T.untyped).returns(T::Boolean) } def maybe_update_password(user, user_params) + return false if user.managed_externally? + if user_params[:old_password].present? || user_params[:password].present? - if user.managed_externally? - unless user.update_password_via_courses_mooc_fi(user_params[:old_password], user_params[:password]) - user.errors.add(:password, 'could not be changed. Please check your current password and try again.') - return false - end - return true - elsif user.externally_managed_without_target? + if user.externally_managed_without_target? user.errors.add(:base, 'This account is being migrated; password changes are temporarily unavailable.') return false end diff --git a/app/models/user.rb b/app/models/user.rb index 1c0ce0ca6..4a230f1b0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -507,6 +507,13 @@ def self.courses_mooc_fi_base_url SiteSetting.value('courses_mooc_fi_base_url').to_s.chomp('/').presence end + # Where users of a managed account change its email and password. Nil when courses.mooc.fi isn't configured. + sig { returns(T.nilable(String)) } + def self.courses_mooc_fi_account_settings_url + base_url = courses_mooc_fi_base_url + "#{base_url}/user-settings/account" if base_url + end + # Where users delete their account, which also deletes it here. Nil when courses.mooc.fi isn't configured. sig { returns(T.nilable(String)) } def self.courses_mooc_fi_account_deletion_url diff --git a/app/views/settings/_form.html.erb b/app/views/settings/_form.html.erb index 6f2dfb14a..c072ba634 100644 --- a/app/views/settings/_form.html.erb +++ b/app/views/settings/_form.html.erb @@ -11,8 +11,12 @@ <%= bs_labeled_field('Username', f.text_field(:login, :disabled => !@user.new_record?, class: 'form-control')) %> <% end%> - <%= bs_labeled_field('E-mail:', f.text_field(:email, class: 'form-control')) %> - <%= bs_labeled_field('Confirm e-mail:', f.text_field(:email_repeat, :value => '', class: 'form-control stop-autofilling', autocomplete: 'off', type: 'email')) %> + <% if @user.managed_externally? %> + <%= render 'users/managed_credentials_notice', user: @user %> + <% else %> + <%= bs_labeled_field('E-mail:', f.text_field(:email, class: 'form-control')) %> + <%= bs_labeled_field('Confirm e-mail:', f.text_field(:email_repeat, :value => '', class: 'form-control stop-autofilling', autocomplete: 'off', type: 'email')) %> + <% end %> <% if @user.new_record? %> @@ -21,7 +25,7 @@ <%= bs_labeled_field('Password:', f.password_field(:password, :value => '', :autocomplete => 'off', class: 'form-control')) %> <%= bs_labeled_field('Confirm password:', f.password_field(:password_repeat, :value => '', :autocomplete => 'off', class: 'form-control')) %> - <% else %> + <% elsif !@user.managed_externally? %>

Change password

<%= bs_labeled_field('Old password:', f.password_field(:old_password, :value => '', class: 'form-control stop-autofilling', autocomplete: 'off')) %> diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index 6f2dfb14a..c072ba634 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -11,8 +11,12 @@ <%= bs_labeled_field('Username', f.text_field(:login, :disabled => !@user.new_record?, class: 'form-control')) %> <% end%> - <%= bs_labeled_field('E-mail:', f.text_field(:email, class: 'form-control')) %> - <%= bs_labeled_field('Confirm e-mail:', f.text_field(:email_repeat, :value => '', class: 'form-control stop-autofilling', autocomplete: 'off', type: 'email')) %> + <% if @user.managed_externally? %> + <%= render 'users/managed_credentials_notice', user: @user %> + <% else %> + <%= bs_labeled_field('E-mail:', f.text_field(:email, class: 'form-control')) %> + <%= bs_labeled_field('Confirm e-mail:', f.text_field(:email_repeat, :value => '', class: 'form-control stop-autofilling', autocomplete: 'off', type: 'email')) %> + <% end %>
<% if @user.new_record? %> @@ -21,7 +25,7 @@ <%= bs_labeled_field('Password:', f.password_field(:password, :value => '', :autocomplete => 'off', class: 'form-control')) %> <%= bs_labeled_field('Confirm password:', f.password_field(:password_repeat, :value => '', :autocomplete => 'off', class: 'form-control')) %> - <% else %> + <% elsif !@user.managed_externally? %>

Change password

<%= bs_labeled_field('Old password:', f.password_field(:old_password, :value => '', class: 'form-control stop-autofilling', autocomplete: 'off')) %> diff --git a/app/views/users/_managed_credentials_notice.html.erb b/app/views/users/_managed_credentials_notice.html.erb new file mode 100644 index 000000000..f5ce867b3 --- /dev/null +++ b/app/views/users/_managed_credentials_notice.html.erb @@ -0,0 +1,10 @@ +<% if user == current_user %> + +<% else %> +

This user changes their email address and password on courses.mooc.fi.

+<% end %> diff --git a/spec/controllers/settings_controller_spec.rb b/spec/controllers/settings_controller_spec.rb index 624c76730..84cfdf470 100644 --- a/spec/controllers/settings_controller_spec.rb +++ b/spec/controllers/settings_controller_spec.rb @@ -29,4 +29,31 @@ expect(response.body).not_to include(deletion_url) expect(response.body).to include('Dangerously destroy account') end + + describe 'for an account managed by courses.mooc.fi' do + before :each do + user.update!(password_managed_by_courses_mooc_fi: true, courses_mooc_fi_user_id: SecureRandom.uuid) + controller.current_user = user + end + + it 'links to courses.mooc.fi instead of offering the email and password fields' do + get :show, params: { participant_id: user.id } + + expect(response.body).to include(%(href="https://courses.mooc.fi/user-settings/account")) + expect(response.body).not_to include('user[email_repeat]') + expect(response.body).not_to include('user[old_password]') + end + + it 'ignores submitted email and password changes' do + expect_any_instance_of(User).not_to receive(:update_password_via_courses_mooc_fi) + + put :update, params: { + participant_id: user.id, + user: { email: 'changed@example.com', email_repeat: 'changed@example.com', old_password: 'xooxer', password: 'newpassword', password_repeat: 'newpassword' } + } + + expect(user.reload.email).not_to eq('changed@example.com') + expect(response).to redirect_to(participant_settings_path(user)) + end + end end diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 15aba1b75..e5f1bb376 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -208,14 +208,16 @@ expect(response.status).to eq(403) end - it 'should delegate to courses.mooc.fi without migrating for an already managed user' do + it 'should ignore email and password changes for a user managed by courses.mooc.fi' do @user.update!(password_managed_by_courses_mooc_fi: true, courses_mooc_fi_user_id: SecureRandom.uuid) - expect_any_instance_of(User).to receive(:update_password_via_courses_mooc_fi).with('oldpassword', 'newpassword').and_return(true) + expect_any_instance_of(User).not_to receive(:update_password_via_courses_mooc_fi) expect_any_instance_of(User).not_to receive(:post_new_user_to_courses_mooc_fi) - put :update, params: { user: params.merge(old_password: 'oldpassword', + put :update, params: { user: params.merge(email_repeat: 'newemail@valid.com', + old_password: 'oldpassword', password: 'newpassword', password_repeat: 'newpassword') } expect(response).to redirect_to(user_path) + expect(@user.reload.email).not_to eq('newemail@valid.com') end it 'should not change the password if the old password was wrong' do From 6927b3a956f37abcde79545bd6d4f8ce595ecdfe Mon Sep 17 00:00:00 2001 From: Henrik Nygren Date: Mon, 16 Nov 2026 13:27:56 +0200 Subject: [PATCH 2/7] Link participant pages to the mooc.fi admin tools --- app/models/user.rb | 6 ++++++ app/views/participants/show.html.erb | 3 +++ 2 files changed, 9 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 4a230f1b0..555a0d6f3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -501,6 +501,12 @@ def courses_mooc_fi_profile_url courses_mooc_fi_url("/manage/users/#{courses_mooc_fi_user_id}") end + # The mooc.fi admin tools identify users by their tmc-server id. + sig { returns(String) } + def moocfi_admin_url + "https://www.mooc.fi/admin/users/#{id}/summary" + end + # courses.mooc.fi's root URL without a trailing slash. Nil when it isn't configured. sig { returns(T.nilable(String)) } def self.courses_mooc_fi_base_url diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index f88e9938a..5b238b17f 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -48,6 +48,9 @@ <% if current_user.administrator? && @user.courses_mooc_fi_profile_url %>
  • <%= link_to 'View on courses.mooc.fi', @user.courses_mooc_fi_profile_url, target: '_blank', rel: 'noopener', class: 'btn btn-primary' %> (shown to you because you're an admin)
  • <% end %> + <% if current_user.administrator? %> +
  • <%= link_to 'View on mooc.fi', @user.moocfi_admin_url, target: '_blank', rel: 'noopener', class: 'btn btn-primary' %> (shown to you because you're an admin)
  • + <% end %>
    From 1e6d233136f7b5deb300945a130d6918b9520733 Mon Sep 17 00:00:00 2001 From: Henrik Nygren Date: Mon, 16 Nov 2026 15:43:54 +0200 Subject: [PATCH 3/7] Refuse credential edits on managed accounts everywhere --- app/controllers/api/v8/users_controller.rb | 19 ++++- .../concerns/account_credentials_form.rb | 63 +++++++++++++++++ app/controllers/settings_controller.rb | 49 ++----------- app/controllers/users_controller.rb | 51 ++------------ app/models/user.rb | 9 ++- app/views/participants/show.html.erb | 2 +- app/views/settings/_form.html.erb | 69 ------------------- app/views/settings/show.html.erb | 2 +- app/views/users/_form.html.erb | 12 ++-- .../_managed_credentials_notice.html.erb | 7 +- config/site.defaults.yml | 3 + .../api/v8/users_controller_spec.rb | 54 +++++++++++++-- spec/controllers/settings_controller_spec.rb | 24 ++++++- spec/controllers/users_controller_spec.rb | 5 +- spec/models/user_spec.rb | 14 ++++ 15 files changed, 201 insertions(+), 182 deletions(-) create mode 100644 app/controllers/concerns/account_credentials_form.rb delete mode 100644 app/views/settings/_form.html.erb diff --git a/app/controllers/api/v8/users_controller.rb b/app/controllers/api/v8/users_controller.rb index a0d4c3074..6fb6e705e 100644 --- a/app/controllers/api/v8/users_controller.rb +++ b/app/controllers/api/v8/users_controller.rb @@ -230,8 +230,12 @@ def update authorize! :update, user set_user_fields(user) set_extra_data(user, true) - update_email(user) - maybe_update_password(user) + if changes_own_managed_credentials?(user) + user.errors.add(:base, User::MANAGED_CREDENTIALS_MESSAGE) + else + update_email(user) + maybe_update_password(user) + end raise ActiveRecord::Rollback if !user.errors.empty? || !user.save # Password changed locally: migrate the user to courses.mooc.fi if params[:old_password].present? && params[:password].present? && !user.managed_externally? @@ -369,6 +373,17 @@ def set_email(user) end end + # Admins, courses.mooc.fi's admin token among them, still write a managed account's + # credentials here; its owner changes them on courses.mooc.fi. + sig { params(user: User).returns(T::Boolean) } + def changes_own_managed_credentials?(user) + return false if !user.managed_externally? || current_user.administrator? + + new_email = params.dig(:user, :email)&.strip + email_changes = new_email.present? && user.email.casecmp(new_email) != 0 + email_changes || params[:old_password].present? || params[:password].present? + end + sig { params(user: User).void } def update_email(user) user_params = params[:user] diff --git a/app/controllers/concerns/account_credentials_form.rb b/app/controllers/concerns/account_credentials_form.rb new file mode 100644 index 000000000..b743ba44f --- /dev/null +++ b/app/controllers/concerns/account_credentials_form.rb @@ -0,0 +1,63 @@ +# typed: strict +# frozen_string_literal: true + +# The email and password fields of the account form, which both the user's own account page and +# the participant settings page submit. +module AccountCredentialsForm + extend T::Sig + extend ActiveSupport::Concern + extend T::Helpers + requires_ancestor { ApplicationController } + + CREDENTIAL_FIELDS = T.let(%w[email email_repeat old_password password password_repeat].freeze, T::Array[String]) + + private + sig { params(user: User, user_params: T.untyped).void } + def set_email(user, user_params) + return if user.managed_externally? + return if !user.new_record? && user_params[:email_repeat].blank? + + if user_params[:email].blank? + user.errors.add(:email, 'needed') + elsif user_params[:email] != user_params[:email_repeat] + user.errors.add(:email_repeat, 'did not match') + else + user.email = user_params[:email].strip + end + end + + # A managed account's form has no credential fields, so any submitted come from a stale page. + sig { params(user: User, user_params: T.untyped).void } + def refuse_managed_credential_changes(user, user_params) + return unless user.managed_externally? + return if CREDENTIAL_FIELDS.none? { |field| user_params[field].present? } + + user.errors.add(:base, User::MANAGED_CREDENTIALS_MESSAGE) + end + + sig { params(user: User, user_params: T.untyped).returns(T::Boolean) } + def maybe_update_password(user, user_params) + return false if user.managed_externally? + + if user_params[:old_password].present? || user_params[:password].present? + if user.externally_managed_without_target? + user.errors.add(:base, 'This account is being migrated; password changes are temporarily unavailable.') + return false + end + if !user.has_password?(user_params[:old_password]) + user.errors.add(:old_password, 'incorrect') + elsif user_params[:password] != user_params[:password_repeat] + user.errors.add(:password_repeat, 'did not match') + elsif user_params[:password].blank? + user.errors.add(:password, 'cannot be empty') + elsif user_params[:password].length > 1000 + user.errors.add(:password, 'cannot be over 1000 characters') + else + user.password = user_params[:password] + end + true + else + false + end + end +end diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index b2618a754..8bcff267f 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -3,6 +3,7 @@ class SettingsController < ApplicationController extend T::Sig + include AccountCredentialsForm skip_authorization_check before_action :set_user @@ -20,13 +21,14 @@ def update User.transaction do email_before = user.email @email_before = T.let(email_before, T.nilable(String)) - set_email + refuse_managed_credential_changes(user, params[:user]) + set_email(user, params[:user]) password_changed = maybe_update_password(user, params[:user]) set_user_fields if user.errors.empty? && user.save # Password changed locally: migrate the user to courses.mooc.fi - user.post_new_user_to_courses_mooc_fi(params[:user][:password]) if password_changed && !user.managed_externally? + user.post_new_user_to_courses_mooc_fi(params[:user][:password]) if password_changed RecentlyChangedUserDetail.email_changed.create!(old_value: email_before, new_value: user.email, username: user.login, user_id: user.id) unless T.must(email_before.casecmp(user.email)).zero? flash[:notice] = if password_changed 'Changes saved and password changed' @@ -84,49 +86,6 @@ def set_user @user = T.let(User.find(params[:participant_id]), T.nilable(User)) end - sig { void } - def set_email - user = T.must(@user) - user_params = params[:user] - - return if user.managed_externally? - return if !user.new_record? && user_params[:email_repeat].blank? - - if user_params[:email].blank? - user.errors.add(:email, 'needed') - elsif user_params[:email] != user_params[:email_repeat] - user.errors.add(:email_repeat, 'did not match') - else - user.email = user_params[:email].strip - end - end - - sig { params(user: User, user_params: T.untyped).returns(T::Boolean) } - def maybe_update_password(user, user_params) - return false if user.managed_externally? - - if user_params[:old_password].present? || user_params[:password].present? - if user.externally_managed_without_target? - user.errors.add(:base, 'This account is being migrated; password changes are temporarily unavailable.') - return false - end - if !user.has_password?(user_params[:old_password]) - user.errors.add(:old_password, 'incorrect') - elsif user_params[:password] != user_params[:password_repeat] - user.errors.add(:password_repeat, 'did not match') - elsif user_params[:password].blank? - user.errors.add(:password, 'cannot be empty') - elsif user_params[:password].length > 1000 - user.errors.add(:password, 'cannot be over 1000 characters') - else - user.password = user_params[:password] - end - true - else - false - end - end - sig { returns(T.nilable(T::Hash[T.untyped, T.untyped])) } def set_user_fields return if params[:user_field].nil? diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index bf1f1a64d..470eb6cdd 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4,6 +4,7 @@ # Presents the "register user" and "edit profile" views. class UsersController < ApplicationController extend T::Sig + include AccountCredentialsForm skip_authorization_check # Stale legacy deletion forms must still redirect, whatever the forgery protection strategy. skip_forgery_protection only: :redirect_to_account_deletion @@ -51,7 +52,7 @@ def create @user.login = SecureRandom.uuid - set_email + set_email(@user, params[:user]) set_password set_user_fields @@ -87,13 +88,14 @@ def update email_before = @user.email @email_before = T.let(email_before, T.nilable(String)) - set_email + refuse_managed_credential_changes(@user, params[:user]) + set_email(@user, params[:user]) password_changed = maybe_update_password(@user, params[:user]) set_user_fields if @user.errors.empty? && @user.save # Password changed locally: migrate the user to courses.mooc.fi - @user.post_new_user_to_courses_mooc_fi(params[:user][:password]) if password_changed && !@user.managed_externally? + @user.post_new_user_to_courses_mooc_fi(params[:user][:password]) if password_changed RecentlyChangedUserDetail.email_changed.create!(old_value: email_before, new_value: @user.email, username: @user.login, user_id: @user.id) unless T.must(email_before.casecmp(@user.email)).zero? flash[:notice] = if password_changed 'Changes saved and password changed' @@ -140,23 +142,6 @@ def redirect_to_account_deletion end private - sig { void } - def set_email - user = T.must(@user) - user_params = params[:user] - - return if user.managed_externally? - return if !user.new_record? && user_params[:email_repeat].blank? - - if user_params[:email].blank? - user.errors.add(:email, 'needed') - elsif user_params[:email] != user_params[:email_repeat] - user.errors.add(:email_repeat, 'did not match') - else - user.email = user_params[:email].strip - end - end - sig { void } def set_password user = T.must(@user) @@ -172,32 +157,6 @@ def set_password end end - sig { params(user: User, user_params: T.untyped).returns(T::Boolean) } - def maybe_update_password(user, user_params) - return false if user.managed_externally? - - if user_params[:old_password].present? || user_params[:password].present? - if user.externally_managed_without_target? - user.errors.add(:base, 'This account is being migrated; password changes are temporarily unavailable.') - return false - end - if !user.has_password?(user_params[:old_password]) - user.errors.add(:old_password, 'incorrect') - elsif user_params[:password] != user_params[:password_repeat] - user.errors.add(:password_repeat, 'did not match') - elsif user_params[:password].blank? - user.errors.add(:password, 'cannot be empty') - elsif user_params[:password].length > 1000 - user.errors.add(:password, 'cannot be over 1000 characters') - else - user.password = user_params[:password] - end - true - else - false - end - end - sig { returns(T.nilable(T::Hash[T.untyped, T.untyped])) } def set_user_fields return if params[:user_field].nil? diff --git a/app/models/user.rb b/app/models/user.rb index 555a0d6f3..9f2365a92 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -53,6 +53,8 @@ class User < ApplicationRecord COURSES_MOOC_FI_USER_ID_FORMAT = /\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/ + MANAGED_CREDENTIALS_MESSAGE = 'The email address and password of this account are changed on courses.mooc.fi.' + # Lookups by courses.mooc.fi id (token authentication) match exactly, so store the canonical form. normalizes :courses_mooc_fi_user_id, with: ->(id) { id.strip.downcase } @@ -501,10 +503,11 @@ def courses_mooc_fi_profile_url courses_mooc_fi_url("/manage/users/#{courses_mooc_fi_user_id}") end - # The mooc.fi admin tools identify users by their tmc-server id. - sig { returns(String) } + # This user's summary page in the mooc.fi admin tools. Nil when mooc.fi isn't configured. + sig { returns(T.nilable(String)) } def moocfi_admin_url - "https://www.mooc.fi/admin/users/#{id}/summary" + base_url = SiteSetting.value('moocfi_base_url').to_s.chomp('/').presence + "#{base_url}/admin/users/#{id}/summary" if base_url end # courses.mooc.fi's root URL without a trailing slash. Nil when it isn't configured. diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index 5b238b17f..2d76ff6b9 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -48,7 +48,7 @@ <% if current_user.administrator? && @user.courses_mooc_fi_profile_url %>
  • <%= link_to 'View on courses.mooc.fi', @user.courses_mooc_fi_profile_url, target: '_blank', rel: 'noopener', class: 'btn btn-primary' %> (shown to you because you're an admin)
  • <% end %> - <% if current_user.administrator? %> + <% if current_user.administrator? && @user.moocfi_admin_url %>
  • <%= link_to 'View on mooc.fi', @user.moocfi_admin_url, target: '_blank', rel: 'noopener', class: 'btn btn-primary' %> (shown to you because you're an admin)
  • <% end %> diff --git a/app/views/settings/_form.html.erb b/app/views/settings/_form.html.erb deleted file mode 100644 index c072ba634..000000000 --- a/app/views/settings/_form.html.erb +++ /dev/null @@ -1,69 +0,0 @@ -<%= form_for @user, url: { :action => :update, :class => "form-horizontal" }, autocomplete: "off" do |f| %> - <%= render 'shared/error_messages', :target => @user %> - -
    -

    User account

    - <% unless local_assigns[:hide_login] %> - - <%= bs_labeled_field('Username', f.text_field(:login, :disabled => !@user.new_record?, class: 'form-control')) %> - <% end%> - <% if @user.managed_externally? %> - <%= render 'users/managed_credentials_notice', user: @user %> - <% else %> - <%= bs_labeled_field('E-mail:', f.text_field(:email, class: 'form-control')) %> - <%= bs_labeled_field('Confirm e-mail:', f.text_field(:email_repeat, :value => '', class: 'form-control stop-autofilling', autocomplete: 'off', type: 'email')) %> - <% end %> -
    - - <% if @user.new_record? %> -
    -

    Password

    - <%= bs_labeled_field('Password:', f.password_field(:password, :value => '', :autocomplete => 'off', class: 'form-control')) %> - <%= bs_labeled_field('Confirm password:', f.password_field(:password_repeat, :value => '', :autocomplete => 'off', class: 'form-control')) %> -
    - <% elsif !@user.managed_externally? %> -
    -

    Change password

    - <%= bs_labeled_field('Old password:', f.password_field(:old_password, :value => '', class: 'form-control stop-autofilling', autocomplete: 'off')) %> - <%= bs_labeled_field('New password:', f.password_field(:password, :value => '', class: 'form-control'), autocomplete: 'off') %> - <%= bs_labeled_field('Confirm new password:', f.password_field(:password_repeat, :value => '', class: 'form-control', autocomplete: 'off')) %> -
    - <% end %> - - <% if !UserField.all.empty? %> -
    - <% for group in UserField.groups %> - <% if UserField.by_group(group).any? {|field| field.visible_to?(@user) } %> -

    <%= group %>

    - <% for field in UserField.by_group(group) %> - <% if field.visible_to?(@user) %> - <%= extra_field(@user.field_value_record(field), :form_scope => 'user_field') %> - <% end %> - <% end %> - <% end %> - <% end %> -
    - <% end %> - -
    - <% if @user.new_record? %> - <%= f.submit "Sign up", class: "btn btn-primary" %> - <% else %> - <%= f.submit "Save", class: "btn btn-primary" %> - <% end %> -
    -<% end %> -
    - - - diff --git a/app/views/settings/show.html.erb b/app/views/settings/show.html.erb index 2f84a4a2d..9d5e9f7bd 100644 --- a/app/views/settings/show.html.erb +++ b/app/views/settings/show.html.erb @@ -1,6 +1,6 @@ <%= render partial: 'participants/nav' %> -<%= render :partial => 'settings/form', :user => @user, locals: { hide_login: true } %> +<%= render :partial => 'users/form', :user => @user, locals: { hide_login: true } %> <%= render 'users/account_deletion', user: @user %> diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index c072ba634..d244d0a7e 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -49,13 +49,15 @@ <% end %> -
    - <% if @user.new_record? %> + <% if @user.new_record? %> +
    <%= f.submit "Sign up", class: "btn btn-primary" %> - <% else %> +
    + <% elsif !@user.managed_externally? || UserField.all.any? { |field| field.visible_to?(@user) } %> +
    <%= f.submit "Save", class: "btn btn-primary" %> - <% end %> -
    +
    + <% end %> <% end %>
    diff --git a/app/views/users/_managed_credentials_notice.html.erb b/app/views/users/_managed_credentials_notice.html.erb index f5ce867b3..25c5aa55b 100644 --- a/app/views/users/_managed_credentials_notice.html.erb +++ b/app/views/users/_managed_credentials_notice.html.erb @@ -6,5 +6,10 @@ <% end %> <% else %> -

    This user changes their email address and password on courses.mooc.fi.

    +

    + This user's email address and password are changed on courses.mooc.fi, where admins can also edit them. + <% if (profile_url = user.courses_mooc_fi_profile_url) %> + <%= link_to 'Open this user on courses.mooc.fi', profile_url, target: '_blank', rel: 'noopener' %>. + <% end %> +

    <% end %> diff --git a/config/site.defaults.yml b/config/site.defaults.yml index 69e50b6f4..3546a1e31 100644 --- a/config/site.defaults.yml +++ b/config/site.defaults.yml @@ -144,3 +144,6 @@ teacher_manual_url: http://testmycode.github.io/tmc-server/usermanual/ # Base URL for password management, admin lookups and access-token introspection via courses.mooc.fi, # e.g. https://courses.mooc.fi courses_mooc_fi_base_url: + +# Base URL for the mooc.fi admin tools linked from participant pages, e.g. https://www.mooc.fi +moocfi_base_url: diff --git a/spec/controllers/api/v8/users_controller_spec.rb b/spec/controllers/api/v8/users_controller_spec.rb index c4f7cd57e..9924c4e4b 100644 --- a/spec/controllers/api/v8/users_controller_spec.rb +++ b/spec/controllers/api/v8/users_controller_spec.rb @@ -167,15 +167,59 @@ def do_update(old_password) expect(response).to have_http_status(400) expect(user.reload).to have_password('oldpassword') end + end - it 'delegates to courses.mooc.fi without migrating for an already managed user' do + describe 'PUT update credentials of an account managed by courses.mooc.fi' do + before :each do user.update!(password_managed_by_courses_mooc_fi: true, courses_mooc_fi_user_id: SecureRandom.uuid) - expect_any_instance_of(User).to receive(:update_password_via_courses_mooc_fi).with('oldpassword', 'newpassword').and_return(true) - expect_any_instance_of(User).not_to receive(:post_new_user_to_courses_mooc_fi) + end - do_update('oldpassword') + context "with the user's own token" do + let!(:token) { Doorkeeper::AccessToken.create!(resource_owner_id: user.id, scopes: 'public') } - expect(response).to have_http_status(200) + it 'refuses an email change' do + put :update, params: { id: 'current', user: { email: 'changed@example.com' } } + + expect(response).to have_http_status(400) + expect(user.reload.email).not_to eq('changed@example.com') + end + + it 'refuses a password change' do + expect_any_instance_of(User).not_to receive(:update_password_via_courses_mooc_fi) + expect_any_instance_of(User).not_to receive(:post_new_user_to_courses_mooc_fi) + + put :update, params: { id: 'current', user: { email: user.email }, + old_password: 'oldpassword', password: 'newpassword', password_repeat: 'newpassword' } + + expect(response).to have_http_status(400) + end + + it 'still saves other details with the unchanged email' do + put :update, params: { id: 'current', user: { email: user.email } } + + expect(response).to have_http_status(200) + end + end + + context 'with an admin token, as courses.mooc.fi writes them' do + let!(:token) { Doorkeeper::AccessToken.create!(resource_owner_id: admin.id, scopes: 'public') } + + it 'changes the email' do + put :update, params: { id: user.id, user: { email: 'changed@example.com' } }, as: :json + + expect(response).to have_http_status(200) + expect(user.reload.email).to eq('changed@example.com') + end + + it 'changes the name' do + first_name = UserField.new(name: 'first_name', field_type: 'text') + allow(UserField).to receive_messages(all: [first_name]) + + put :update, params: { id: user.id, user_field: { 'first_name' => 'Changed' } }, as: :json + + expect(response).to have_http_status(200) + expect(user.field_value_record(first_name).value).to eq('Changed') + end end end diff --git a/spec/controllers/settings_controller_spec.rb b/spec/controllers/settings_controller_spec.rb index 84cfdf470..865fc7e72 100644 --- a/spec/controllers/settings_controller_spec.rb +++ b/spec/controllers/settings_controller_spec.rb @@ -44,7 +44,7 @@ expect(response.body).not_to include('user[old_password]') end - it 'ignores submitted email and password changes' do + it 'refuses submitted email and password changes' do expect_any_instance_of(User).not_to receive(:update_password_via_courses_mooc_fi) put :update, params: { @@ -53,7 +53,27 @@ } expect(user.reload.email).not_to eq('changed@example.com') - expect(response).to redirect_to(participant_settings_path(user)) + expect(response).to have_http_status(:forbidden) + expect(response.body).to include('changed on courses.mooc.fi') + expect(flash[:notice]).to be_nil + end + + it 'offers no Save button when there is nothing to edit' do + allow(UserField).to receive_messages(all: []) + + get :show, params: { participant_id: user.id } + + expect(response.body).not_to include('value="Save"') + end + + it "points an admin to the user's page on courses.mooc.fi" do + controller.current_user = FactoryBot.create(:admin) + + get :show, params: { participant_id: user.id } + + expect(response.body).to include(%(href="https://courses.mooc.fi/manage/users/#{user.courses_mooc_fi_user_id}")) + expect(response.body).not_to include('user[email_repeat]') + expect(response.body).not_to include('user[old_password]') end end end diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index e5f1bb376..fdca9e28a 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -208,7 +208,7 @@ expect(response.status).to eq(403) end - it 'should ignore email and password changes for a user managed by courses.mooc.fi' do + it 'should refuse email and password changes for a user managed by courses.mooc.fi' do @user.update!(password_managed_by_courses_mooc_fi: true, courses_mooc_fi_user_id: SecureRandom.uuid) expect_any_instance_of(User).not_to receive(:update_password_via_courses_mooc_fi) expect_any_instance_of(User).not_to receive(:post_new_user_to_courses_mooc_fi) @@ -216,7 +216,8 @@ old_password: 'oldpassword', password: 'newpassword', password_repeat: 'newpassword') } - expect(response).to redirect_to(user_path) + expect(response.status).to eq(403) + expect(flash[:notice]).to be_nil expect(@user.reload.email).not_to eq('newemail@valid.com') end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 3f4f70e9e..5b4024560 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -311,6 +311,20 @@ end end + describe 'moocfi_admin_url' do + it 'is nil when moocfi_base_url is not configured' do + user = User.create!(login: 'localuser', password: 'secret123', email: 'localuser@example.com') + SiteSetting.all_settings['moocfi_base_url'] = nil + expect(user.moocfi_admin_url).to be_nil + end + + it "builds the summary url from the configured base url and the user's id" do + user = User.create!(login: 'localuser', password: 'secret123', email: 'localuser@example.com') + SiteSetting.all_settings['moocfi_base_url'] = 'https://www.mooc.fi/' + expect(user.moocfi_admin_url).to eq("https://www.mooc.fi/admin/users/#{user.id}/summary") + end + end + describe 'migrating to courses.mooc.fi on login' do it 'posts a locally-managed user on successful authentication' do user = User.create!(login: 'localuser', password: 'secret123', email: 'localuser@example.com') From f72534bb18bbea6c9eb06eeb54f07b3eb0cd7a46 Mon Sep 17 00:00:00 2001 From: Henrik Nygren Date: Mon, 16 Nov 2026 15:48:35 +0200 Subject: [PATCH 4/7] Keep the managed-credentials rule in Ability --- app/controllers/api/v8/users_controller.rb | 19 ++------------- .../concerns/account_credentials_form.rb | 9 ++++++++ app/controllers/settings_controller.rb | 4 +--- app/controllers/users_controller.rb | 4 +--- app/models/ability.rb | 2 ++ app/models/user.rb | 16 +++++++++++-- app/views/participants/show.html.erb | 14 +++++++---- app/views/settings/show.html.erb | 2 +- app/views/users/_form.html.erb | 23 +++++++------------ .../_managed_credentials_notice.html.erb | 7 ++++-- .../api/v8/users_controller_spec.rb | 13 +++++++++-- 11 files changed, 63 insertions(+), 50 deletions(-) diff --git a/app/controllers/api/v8/users_controller.rb b/app/controllers/api/v8/users_controller.rb index 6fb6e705e..a0d4c3074 100644 --- a/app/controllers/api/v8/users_controller.rb +++ b/app/controllers/api/v8/users_controller.rb @@ -230,12 +230,8 @@ def update authorize! :update, user set_user_fields(user) set_extra_data(user, true) - if changes_own_managed_credentials?(user) - user.errors.add(:base, User::MANAGED_CREDENTIALS_MESSAGE) - else - update_email(user) - maybe_update_password(user) - end + update_email(user) + maybe_update_password(user) raise ActiveRecord::Rollback if !user.errors.empty? || !user.save # Password changed locally: migrate the user to courses.mooc.fi if params[:old_password].present? && params[:password].present? && !user.managed_externally? @@ -373,17 +369,6 @@ def set_email(user) end end - # Admins, courses.mooc.fi's admin token among them, still write a managed account's - # credentials here; its owner changes them on courses.mooc.fi. - sig { params(user: User).returns(T::Boolean) } - def changes_own_managed_credentials?(user) - return false if !user.managed_externally? || current_user.administrator? - - new_email = params.dig(:user, :email)&.strip - email_changes = new_email.present? && user.email.casecmp(new_email) != 0 - email_changes || params[:old_password].present? || params[:password].present? - end - sig { params(user: User).void } def update_email(user) user_params = params[:user] diff --git a/app/controllers/concerns/account_credentials_form.rb b/app/controllers/concerns/account_credentials_form.rb index b743ba44f..ada542be4 100644 --- a/app/controllers/concerns/account_credentials_form.rb +++ b/app/controllers/concerns/account_credentials_form.rb @@ -12,6 +12,15 @@ module AccountCredentialsForm CREDENTIAL_FIELDS = T.let(%w[email email_repeat old_password password password_repeat].freeze, T::Array[String]) private + # Applies the submitted email and password fields to an existing account and returns whether + # a password change was requested. + sig { params(user: User, user_params: T.untyped).returns(T::Boolean) } + def apply_credentials(user, user_params) + refuse_managed_credential_changes(user, user_params) + set_email(user, user_params) + maybe_update_password(user, user_params) + end + sig { params(user: User, user_params: T.untyped).void } def set_email(user, user_params) return if user.managed_externally? diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 8bcff267f..11249c70c 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -21,9 +21,7 @@ def update User.transaction do email_before = user.email @email_before = T.let(email_before, T.nilable(String)) - refuse_managed_credential_changes(user, params[:user]) - set_email(user, params[:user]) - password_changed = maybe_update_password(user, params[:user]) + password_changed = apply_credentials(user, params[:user]) set_user_fields if user.errors.empty? && user.save diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 470eb6cdd..418f780ee 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -88,9 +88,7 @@ def update email_before = @user.email @email_before = T.let(email_before, T.nilable(String)) - refuse_managed_credential_changes(@user, params[:user]) - set_email(@user, params[:user]) - password_changed = maybe_update_password(@user, params[:user]) + password_changed = apply_credentials(@user, params[:user]) set_user_fields if @user.errors.empty? && @user.save diff --git a/app/models/ability.rb b/app/models/ability.rb index 1c4729572..2c03806d3 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -53,6 +53,8 @@ def initialize(user, auth_source: nil) can :update, User do |u| u == user end + # Its owner changes a managed account's email and password on courses.mooc.fi. + cannot :update_credentials, User, &:managed_externally? cannot :read, Course can :read, Course do |c| diff --git a/app/models/user.rb b/app/models/user.rb index 9f2365a92..e2252aee5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -506,14 +506,26 @@ def courses_mooc_fi_profile_url # This user's summary page in the mooc.fi admin tools. Nil when mooc.fi isn't configured. sig { returns(T.nilable(String)) } def moocfi_admin_url - base_url = SiteSetting.value('moocfi_base_url').to_s.chomp('/').presence + base_url = User.moocfi_base_url "#{base_url}/admin/users/#{id}/summary" if base_url end # courses.mooc.fi's root URL without a trailing slash. Nil when it isn't configured. sig { returns(T.nilable(String)) } def self.courses_mooc_fi_base_url - SiteSetting.value('courses_mooc_fi_base_url').to_s.chomp('/').presence + site_base_url('courses_mooc_fi_base_url') + end + + # mooc.fi's root URL without a trailing slash. Nil when it isn't configured. + sig { returns(T.nilable(String)) } + def self.moocfi_base_url + site_base_url('moocfi_base_url') + end + + # The site setting `key` as a root URL without a trailing slash. Nil when it isn't configured. + sig { params(key: String).returns(T.nilable(String)) } + private_class_method def self.site_base_url(key) + SiteSetting.value(key).to_s.strip.chomp('/').presence end # Where users of a managed account change its email and password. Nil when courses.mooc.fi isn't configured. diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index 2d76ff6b9..d69c0cc17 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -45,11 +45,15 @@ end %>
  • <%= button_to 'Force migrate to courses.mooc.fi', force_migrate_to_courses_mooc_fi_participant_path, method: :post, class: 'btn btn-primary', data: { confirm: confirm_text } %> (shown to you because you're an admin)
  • <% end %> - <% if current_user.administrator? && @user.courses_mooc_fi_profile_url %> -
  • <%= link_to 'View on courses.mooc.fi', @user.courses_mooc_fi_profile_url, target: '_blank', rel: 'noopener', class: 'btn btn-primary' %> (shown to you because you're an admin)
  • - <% end %> - <% if current_user.administrator? && @user.moocfi_admin_url %> -
  • <%= link_to 'View on mooc.fi', @user.moocfi_admin_url, target: '_blank', rel: 'noopener', class: 'btn btn-primary' %> (shown to you because you're an admin)
  • + <% if current_user.administrator? %> + <% profile_url = @user.courses_mooc_fi_profile_url %> + <% moocfi_url = @user.moocfi_admin_url %> + <% if profile_url %> +
  • <%= link_to 'View on courses.mooc.fi', profile_url, target: '_blank', rel: 'noopener', class: 'btn btn-primary' %> (shown to you because you're an admin)
  • + <% end %> + <% if moocfi_url %> +
  • <%= link_to 'View on mooc.fi', moocfi_url, target: '_blank', rel: 'noopener', class: 'btn btn-primary' %> (shown to you because you're an admin)
  • + <% end %> <% end %> diff --git a/app/views/settings/show.html.erb b/app/views/settings/show.html.erb index 9d5e9f7bd..dce1c2e54 100644 --- a/app/views/settings/show.html.erb +++ b/app/views/settings/show.html.erb @@ -1,6 +1,6 @@ <%= render partial: 'participants/nav' %> -<%= render :partial => 'users/form', :user => @user, locals: { hide_login: true } %> +<%= render 'users/form', hide_login: true %> <%= render 'users/account_deletion', user: @user %> diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index d244d0a7e..52a8122c4 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -1,3 +1,4 @@ +<% visible_fields = UserField.all.select { |field| field.visible_to?(@user) } %> <%= form_for @user, url: { :action => :update, :class => "form-horizontal" }, autocomplete: "off" do |f| %> <%= render 'shared/error_messages', :target => @user %> @@ -34,28 +35,20 @@ <% end %> - <% if !UserField.all.empty? %> + <% if visible_fields.any? %>
    - <% for group in UserField.groups %> - <% if UserField.by_group(group).any? {|field| field.visible_to?(@user) } %> -

    <%= group %>

    - <% for field in UserField.by_group(group) %> - <% if field.visible_to?(@user) %> - <%= extra_field(@user.field_value_record(field), :form_scope => 'user_field') %> - <% end %> - <% end %> + <% visible_fields.group_by(&:group).each do |group, fields| %> +

    <%= group %>

    + <% fields.each do |field| %> + <%= extra_field(@user.field_value_record(field), :form_scope => 'user_field') %> <% end %> <% end %>
    <% end %> - <% if @user.new_record? %> -
    - <%= f.submit "Sign up", class: "btn btn-primary" %> -
    - <% elsif !@user.managed_externally? || UserField.all.any? { |field| field.visible_to?(@user) } %> + <% if @user.new_record? || !@user.managed_externally? || visible_fields.any? %>
    - <%= f.submit "Save", class: "btn btn-primary" %> + <%= f.submit(@user.new_record? ? "Sign up" : "Save", class: "btn btn-primary") %>
    <% end %> <% end %> diff --git a/app/views/users/_managed_credentials_notice.html.erb b/app/views/users/_managed_credentials_notice.html.erb index 25c5aa55b..9db1ab41a 100644 --- a/app/views/users/_managed_credentials_notice.html.erb +++ b/app/views/users/_managed_credentials_notice.html.erb @@ -1,14 +1,17 @@ <% if user == current_user %> + <% settings_url = User.courses_mooc_fi_account_settings_url %> <% else %> + <% profile_url = user.courses_mooc_fi_profile_url %>

    This user's email address and password are changed on courses.mooc.fi, where admins can also edit them. - <% if (profile_url = user.courses_mooc_fi_profile_url) %> + <% if profile_url %> <%= link_to 'Open this user on courses.mooc.fi', profile_url, target: '_blank', rel: 'noopener' %>. <% end %>

    diff --git a/spec/controllers/api/v8/users_controller_spec.rb b/spec/controllers/api/v8/users_controller_spec.rb index 9924c4e4b..70f99fe9f 100644 --- a/spec/controllers/api/v8/users_controller_spec.rb +++ b/spec/controllers/api/v8/users_controller_spec.rb @@ -180,7 +180,7 @@ def do_update(old_password) it 'refuses an email change' do put :update, params: { id: 'current', user: { email: 'changed@example.com' } } - expect(response).to have_http_status(400) + expect(response).to have_http_status(403) expect(user.reload.email).not_to eq('changed@example.com') end @@ -191,7 +191,7 @@ def do_update(old_password) put :update, params: { id: 'current', user: { email: user.email }, old_password: 'oldpassword', password: 'newpassword', password_repeat: 'newpassword' } - expect(response).to have_http_status(400) + expect(response).to have_http_status(403) end it 'still saves other details with the unchanged email' do @@ -211,6 +211,15 @@ def do_update(old_password) expect(user.reload.email).to eq('changed@example.com') end + it 'changes the password through courses.mooc.fi' do + expect_any_instance_of(User).to receive(:update_password_via_courses_mooc_fi).with('oldpassword', 'newpassword').and_return(true) + + put :update, params: { id: user.id, user: { email: user.email }, + old_password: 'oldpassword', password: 'newpassword', password_repeat: 'newpassword' }, as: :json + + expect(response).to have_http_status(200) + end + it 'changes the name' do first_name = UserField.new(name: 'first_name', field_type: 'text') allow(UserField).to receive_messages(all: [first_name]) From b04161648c63d27eca3d46768fd0494b016fae1d Mon Sep 17 00:00:00 2001 From: Henrik Nygren Date: Mon, 16 Nov 2026 16:11:16 +0200 Subject: [PATCH 5/7] Read the saved name from the database in the managed-account spec --- spec/controllers/api/v8/users_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/api/v8/users_controller_spec.rb b/spec/controllers/api/v8/users_controller_spec.rb index 70f99fe9f..b70206a71 100644 --- a/spec/controllers/api/v8/users_controller_spec.rb +++ b/spec/controllers/api/v8/users_controller_spec.rb @@ -227,7 +227,7 @@ def do_update(old_password) put :update, params: { id: user.id, user_field: { 'first_name' => 'Changed' } }, as: :json expect(response).to have_http_status(200) - expect(user.field_value_record(first_name).value).to eq('Changed') + expect(user.reload.field_value_record(first_name).value).to eq('Changed') end end end From 8e25c10ea411dab7ef52b4b63baaa8405d6b40be Mon Sep 17 00:00:00 2001 From: Henrik Nygren Date: Mon, 16 Nov 2026 16:24:56 +0200 Subject: [PATCH 6/7] Save managed accounts' field edits and show their admin link to admins --- app/controllers/settings_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/views/users/_managed_credentials_notice.html.erb | 2 +- spec/controllers/api/v8/users_controller_spec.rb | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 11249c70c..c564194d9 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -21,7 +21,7 @@ def update User.transaction do email_before = user.email @email_before = T.let(email_before, T.nilable(String)) - password_changed = apply_credentials(user, params[:user]) + password_changed = apply_credentials(user, params.fetch(:user, {})) set_user_fields if user.errors.empty? && user.save diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 418f780ee..5a2a2d202 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -88,7 +88,7 @@ def update email_before = @user.email @email_before = T.let(email_before, T.nilable(String)) - password_changed = apply_credentials(@user, params[:user]) + password_changed = apply_credentials(@user, params.fetch(:user, {})) set_user_fields if @user.errors.empty? && @user.save diff --git a/app/views/users/_managed_credentials_notice.html.erb b/app/views/users/_managed_credentials_notice.html.erb index 9db1ab41a..03b48248d 100644 --- a/app/views/users/_managed_credentials_notice.html.erb +++ b/app/views/users/_managed_credentials_notice.html.erb @@ -11,7 +11,7 @@ <% profile_url = user.courses_mooc_fi_profile_url %>

    This user's email address and password are changed on courses.mooc.fi, where admins can also edit them. - <% if profile_url %> + <% if profile_url && current_user.administrator? %> <%= link_to 'Open this user on courses.mooc.fi', profile_url, target: '_blank', rel: 'noopener' %>. <% end %>

    diff --git a/spec/controllers/api/v8/users_controller_spec.rb b/spec/controllers/api/v8/users_controller_spec.rb index b70206a71..7ee44eda7 100644 --- a/spec/controllers/api/v8/users_controller_spec.rb +++ b/spec/controllers/api/v8/users_controller_spec.rb @@ -223,6 +223,7 @@ def do_update(old_password) it 'changes the name' do first_name = UserField.new(name: 'first_name', field_type: 'text') allow(UserField).to receive_messages(all: [first_name]) + allow(ExtraField).to receive(:by_kind).with(:user).and_return([first_name]) put :update, params: { id: user.id, user_field: { 'first_name' => 'Changed' } }, as: :json From 86712503c4075837af70b42b007a456043d810a8 Mon Sep 17 00:00:00 2001 From: Henrik Nygren Date: Mon, 16 Nov 2026 16:25:27 +0200 Subject: [PATCH 7/7] Check for a managed account once in the credentials form --- app/controllers/concerns/account_credentials_form.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/concerns/account_credentials_form.rb b/app/controllers/concerns/account_credentials_form.rb index ada542be4..9adc43b18 100644 --- a/app/controllers/concerns/account_credentials_form.rb +++ b/app/controllers/concerns/account_credentials_form.rb @@ -16,14 +16,17 @@ module AccountCredentialsForm # a password change was requested. sig { params(user: User, user_params: T.untyped).returns(T::Boolean) } def apply_credentials(user, user_params) - refuse_managed_credential_changes(user, user_params) + if user.managed_externally? + refuse_managed_credential_changes(user, user_params) + return false + end + set_email(user, user_params) maybe_update_password(user, user_params) end sig { params(user: User, user_params: T.untyped).void } def set_email(user, user_params) - return if user.managed_externally? return if !user.new_record? && user_params[:email_repeat].blank? if user_params[:email].blank? @@ -38,7 +41,6 @@ def set_email(user, user_params) # A managed account's form has no credential fields, so any submitted come from a stale page. sig { params(user: User, user_params: T.untyped).void } def refuse_managed_credential_changes(user, user_params) - return unless user.managed_externally? return if CREDENTIAL_FIELDS.none? { |field| user_params[field].present? } user.errors.add(:base, User::MANAGED_CREDENTIALS_MESSAGE) @@ -46,8 +48,6 @@ def refuse_managed_credential_changes(user, user_params) sig { params(user: User, user_params: T.untyped).returns(T::Boolean) } def maybe_update_password(user, user_params) - return false if user.managed_externally? - if user_params[:old_password].present? || user_params[:password].present? if user.externally_managed_without_target? user.errors.add(:base, 'This account is being migrated; password changes are temporarily unavailable.')