From bf02581d7b6d1fc9de30aef1b15d431d42fe200f Mon Sep 17 00:00:00 2001 From: Ali Hadi Mazeh Date: Thu, 14 Nov 2024 16:18:14 -0500 Subject: [PATCH] admins can change external users's names --- app/controllers/api/v1/users_controller.rb | 4 +++- db/schema.rb | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index 6661d71a91..7073380dad 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -169,7 +169,9 @@ def create_user_params end def update_user_params - @update_user_params ||= if external_auth? + @update_user_params ||= if external_auth? && current_user.role.name.eql?('Administrator') + params.require(:user).permit(:name) + elsif external_auth? params.require(:user).permit(:password, :avatar, :language, :role_id, :invite_token) else params.require(:user).permit(:name, :password, :avatar, :language, :role_id, :invite_token) diff --git a/db/schema.rb b/db/schema.rb index dd09a891c4..4f439f27d1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2023_12_18_154727) do +ActiveRecord::Schema[7.1].define(version: 2023_07_05_183747) do # These are extensions that must be enabled in order to support this database enable_extension "pgcrypto" enable_extension "plpgsql" @@ -193,12 +193,12 @@ t.uuid "role_id" t.string "language", null: false t.string "reset_digest" - t.datetime "reset_sent_at", precision: nil + t.datetime "reset_sent_at" t.boolean "verified", default: false t.string "verification_digest" - t.datetime "verification_sent_at", precision: nil + t.datetime "verification_sent_at" t.string "session_token" - t.datetime "session_expiry", precision: nil + t.datetime "session_expiry" t.integer "status", default: 0 t.index ["email", "provider"], name: "index_users_on_email_and_provider", unique: true t.index ["reset_digest"], name: "index_users_on_reset_digest", unique: true