Skip to content

A platform for community discussion. Free, open, simple.

FEATURE: Allow admins to edit pre-registered MCP clients (#44196)

Natalie Tayc8e4d29e75d6
diff --git a/app/controllers/admin/mcp_clients_controller.rb b/app/controllers/admin/mcp_clients_controller.rb
index df261bb6ca5..6d9e2f5ef89 100644
--- a/app/controllers/admin/mcp_clients_controller.rb
+++ b/app/controllers/admin/mcp_clients_controller.rb
@@ -23,7 +23,11 @@ class Admin::McpClientsController < Admin::AdminController
def create
client =
McpOauthClient.create!(
- client_params.merge(registration_type: "pre_registered", trust_state: "approved"),
+ client_params.merge(
+ registration_type: "pre_registered",
+ trust_state: "approved",
+ admin_managed: true,
+ ),
)
StaffActionLogger.new(current_user).log_custom("mcp_client_created", client_id: client.id)
render json: { client: serialize(client) }, status: :created
@@ -45,6 +49,18 @@ class Admin::McpClientsController < Admin::AdminController
render json: { client: serialize(client) }
end
+ def update
+ McpOauthClient.transaction do
+ client.update_registration!(params.require(:client).permit(:name, redirect_uris: []))
+ StaffActionLogger.new(current_user).log_custom(
+ "mcp_client_updated",
+ client_id: client.id,
+ changes: client.saved_changes.except("updated_at"),
+ )
+ end
+ render json: { client: serialize(client) }
+ end
+
def refresh
raise Discourse::InvalidParameters if client.registration_type != "cimd"
refreshed =
@@ -76,6 +92,7 @@ class Admin::McpClientsController < Admin::AdminController
trust_state: value.trust_state,
blocked: value.blocked?,
redirect_uris: value.redirect_uris,
+ admin_managed: value.admin_managed,
redirect_hosts: value.redirect_uris.filter_map { |uri| uri_host(uri) }.uniq,
metadata_uri: value.metadata_uri,
first_seen_at: value.created_at,
diff --git a/app/models/mcp_oauth_client.rb b/app/models/mcp_oauth_client.rb
index 5f9e49488a1..c15edf747b1 100644
--- a/app/models/mcp_oauth_client.rb
+++ b/app/models/mcp_oauth_client.rb
@@ -23,6 +23,14 @@ class McpOauthClient < ActiveRecord::Base
trust_state == "blocked"
end
+ def update_registration!(attributes)
+ with_lock do
+ assign_attributes(attributes)
+ self.admin_managed = true if name_changed? || redirect_uris_changed?
+ save!
+ end
+ end
+
def allows_redirect_uri?(value)
return true if redirect_uris.include?(value)
@@ -76,6 +84,7 @@ end
# Table name: mcp_oauth_clients
#
# id :bigint not null, primary key
+# admin_managed :boolean default(FALSE), not null
# last_seen_at :datetime
# metadata :jsonb not null
# metadata_expires_at :datetime
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b41a5cf565c..4586c15bcc1 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -7126,8 +7126,15 @@ en:
client_id_description: "An identifier for this application. Enter the same value when configuring the client."
redirect_uris: "Redirect URIs"
redirect_uris_description: "Where the browser returns after a user approves access. Enter one exact URI per line."
+ management: "Registration updates"
+ manual: "Managed by admins"
+ automatic: "Automatic"
+ manual_description: "Admins manage this client's name and redirect URIs. Metadata refreshes will not change them, so keep them up to date."
+ automatic_description: "The name and redirect URIs update from published client metadata. Changing either switches both to admin management."
create: "Add client"
created: "OAuth client added."
+ edit: "Edit OAuth client"
+ updated: "OAuth client updated."
empty: "No OAuth clients are registered."
no_results: "No OAuth clients match this search."
detail_title: "Client details"
@@ -9592,6 +9599,7 @@ en:
filter_date_time: "Filter date and time"
actions:
permanently_delete_post_revisions: "permanently delete post revisions"
+ mcp_client_updated: "update MCP OAuth client"
delete_user: "delete user"
change_trust_level: "change trust level"
change_username: "change username"
diff --git a/config/routes.rb b/config/routes.rb
index 6bb0cd90e8d..f721548e3ca 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1997,6 +1997,7 @@ Discourse::Application.routes.draw do
get "/clients" => "admin/mcp_clients#index"
post "/clients" => "admin/mcp_clients#create"
get "/clients/:id" => "admin/mcp_clients#show"
+ put "/clients/:id" => "admin/mcp_clients#update"
put "/clients/:id/block" => "admin/mcp_clients#block"
post "/clients/:id/refresh" => "admin/mcp_clients#refresh"
get "/authorizations" => "admin/mcp_authorizations#index"
diff --git a/db/migrate/20260930114733_add_admin_managed_to_mcp_oauth_clients.rb b/db/migrate/20260930114733_add_admin_managed_to_mcp_oauth_clients.rb
new file mode 100644
index 00000000000..e986fb8e0e1
--- /dev/null
+++ b/db/migrate/20260930114733_add_admin_managed_to_mcp_oauth_clients.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+class AddAdminManagedToMcpOauthClients < ActiveRecord::Migration[8.1]
+ def change
+ add_column :mcp_oauth_clients, :admin_managed, :boolean, default: false, null: false
+
+ up_only { execute <<~SQL }
+ UPDATE mcp_oauth_clients
+ SET admin_managed = TRUE
+ WHERE registration_type = 'pre_registered'
+ SQL
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 2ecbe59b8a1..f377367db97 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -7778,7 +7778,8 @@ CREATE TABLE public.mcp_oauth_clients (
redirect_uris character varying[] DEFAULT '{}'::character varying[] NOT NULL,
last_seen_at timestamp(6) without time zone,
created_at timestamp(6) without time zone NOT NULL,
- updated_at timestamp(6) without time zone NOT NULL
+ updated_at timestamp(6) without time zone NOT NULL,
+ admin_managed boolean DEFAULT false NOT NULL
);
@@ -25543,6 +25544,7 @@ ALTER TABLE ONLY public.ad_plugin_house_ads_groups
SET search_path TO "$user", public;
INSERT INTO "schema_migrations" (version) VALUES
+('20260930114733'),
('20260928103925'),
('20260925054715'),
('20260923141924'),
diff --git a/frontend/discourse/admin/components/admin-mcp.gjs b/frontend/discourse/admin/components/admin-mcp.gjs
index b1e364a5712..2e21827d2eb 100644
--- a/frontend/discourse/admin/components/admin-mcp.gjs
+++ b/frontend/discourse/admin/components/admin-mcp.gjs
@@ -76,7 +76,7 @@ function normalizeList(value) {
}
return (value || "")
- .split(/[\n,]/)
+ .split("\n")
.map((item) => item.trim())
.filter(Boolean);
}
@@ -109,6 +109,7 @@ export default class AdminMcp extends Component {
@tracked saving = false;
@tracked clients;
@tracked clientRecord;
+ @tracked clientEditData;
@tracked clientNextCursor;
@tracked clientLoading = false;
@tracked selectedClientPresetId;
@@ -142,12 +143,20 @@ export default class AdminMcp extends Component {
authorizationRequestId = 0;
activityRequestId = 0;
+ #clientFormApi;
+
constructor() {
super(...arguments);
const model = this.args.model || {};
this.clients = model.clients || model.oauth_clients;
this.clientNextCursor = model.meta?.next_cursor;
this.clientRecord = model.client;
+ if (this.args.section === "client-edit") {
+ this.clientEditData = {
+ name: model.client.name,
+ redirect_uris: model.client.redirect_uris.join("\n"),
+ };
+ }
this.primitiveRecords = model.primitives;
this.primitiveEnabledStates = new Map(
(model.primitives || []).map((primitive) => [
@@ -717,6 +726,50 @@ export default class AdminMcp extends Component {
}
}
+ @action
+ cancelClientEdit() {
+ this.router.transitionTo("adminConfig.mcp.clients.show", this.client.id);
+ }
+
+ @action
+ registerClientForm(api) {
+ this.#clientFormApi = api;
+ }
+
+ @action
+ async updateClient(data) {
+ this.saving = true;
+ try {
+ const client = {};
+ if (data.name !== this.clientEditData.name) {
+ client.name = data.name;
+ }
+ const redirectUris = normalizeList(data.redirect_uris);
+ if (
+ redirectUris.join("\n") !==
+ normalizeList(this.clientEditData.redirect_uris).join("\n")
+ ) {
+ client.redirect_uris = redirectUris;
+ }
+ if (Object.keys(client).length) {
+ await ajax(`/admin/mcp/clients/${this.client.id}.json`, {
+ type: "PUT",
+ data: { client },
+ });
+ }
+ this.#clientFormApi.commit();
+ this.router.transitionTo("adminConfig.mcp.clients.show", this.client.id);
+ this.toasts.success({
+ duration: "short",
+ data: { message: i18n("admin.config.mcp.clients.updated") },
+ });
+ } catch (error) {
+ popupAjaxError(error);
+ } finally {
+ this.saving = false;
+ }
+ }
+
@action
resetClientPreset() {
this.selectedClientPresetId = null;
@@ -1707,7 +1760,7 @@ export default class AdminMcp extends Component {
@description={{i18n
"admin.config.mcp.clients.redirect_uris_description"
}}
- @format="large"
+ @format="full"
@name="redirect_uris"
@title={{i18n "admin.config.mcp.clients.redirect_uris"}}
@type="textarea"
@@ -1751,6 +1804,59 @@ export default class AdminMcp extends Component {
</AdminSectionLandingWrapper>
</section>
{{/if}}
+ {{else if (eq @section "client-edit")}}
+ <BackButton
+ @model={{this.client.id}}
+ @route="adminConfig.mcp.clients.show"
+ />
+ <AdminConfigAreaCard @heading="admin.config.mcp.clients.edit">
+ <:content>
+ <p>{{i18n
+ (if
+ this.client.admin_managed
+ "admin.config.mcp.clients.manual_description"
+ "admin.config.mcp.clients.automatic_description"
+ )
+ }}</p>
+ <Form
+ class="admin-mcp__edit-client-form"
+ @commitOnSubmit={{false}}
+ @data={{this.clientEditData}}
+ @isLoading={{this.saving}}
+ @onRegisterApi={{this.registerClientForm}}
+ @onSubmit={{this.updateClient}}
+ as |form|
+ >
+ <form.Field
+ @description={{i18n "admin.config.mcp.clients.name_description"}}
+ @format="large"
+ @name="name"
+ @title={{i18n "admin.config.mcp.clients.name"}}
+ @type="input"
+ @validation="required"
+ as |field|
+ ><field.Control /></form.Field>
+ <form.Field
+ @description={{i18n
+ "admin.config.mcp.clients.redirect_uris_description"
+ }}
+ @format="full"
+ @name="redirect_uris"
+ @title={{i18n "admin.config.mcp.clients.redirect_uris"}}
+ @type="textarea"
+ @validation="required"
+ as |field|
+ ><field.Control @height={{100}} /></form.Field>
+ <form.Submit @label="save" />
+ <DButton
+ class="btn-default admin-mcp__cancel-client-edit"
+ @action={{this.cancelClientEdit}}
+ @disabled={{this.saving}}
+ @label="cancel"
+ />
+ </Form>
+ </:content>
+ </AdminConfigAreaCard>
{{else if (eq @section "client-detail")}}
<BackButton
@label="admin.config.mcp.clients.back"
@@ -1761,6 +1867,12 @@ export default class AdminMcp extends Component {
@titleLabel={{this.client.name}}
>
<:actions as |actions|>
+ <actions.Default
+ class="admin-mcp__edit-client"
+ @label="admin.config.mcp.clients.edit"
+ @route="adminConfig.mcp.clients.edit"
+ @routeModels={{array this.client.id}}
+ />
<actions.Default
@action={{fn this.toggleClientBlock this.client}}
@label={{if
@@ -1806,6 +1918,14 @@ export default class AdminMcp extends Component {
{{/each}}
</ul>
</dd></div>
+ <div><dt>{{i18n "admin.config.mcp.clients.management"}}</dt><dd
+ >{{i18n
+ (if
+ this.client.admin_managed
+ "admin.config.mcp.clients.manual"
+ "admin.config.mcp.clients.automatic"
+ )
+ }}</dd></div>
<div><dt>{{i18n "admin.config.mcp.clients.first_seen"}}</dt><dd
>{{dFormatDate this.client.first_seen_at}}</dd></div>
<div><dt>{{i18n "admin.config.mcp.clients.last_seen"}}</dt><dd>{{#if
diff --git a/frontend/discourse/admin/routes/admin-config/mcp/clients/edit.js b/frontend/discourse/admin/routes/admin-config/mcp/clients/edit.js
new file mode 100644
index 00000000000..9e049c72fb3
--- /dev/null
+++ b/frontend/discourse/admin/routes/admin-config/mcp/clients/edit.js
@@ -0,0 +1,13 @@
+import { ajax } from "discourse/lib/ajax";
+import DiscourseRoute from "discourse/routes/discourse";
+import { i18n } from "discourse-i18n";
+
+export default class AdminConfigMcpClientEditRoute extends DiscourseRoute {
+ model({ id }) {
+ return ajax(`/admin/mcp/clients/${id}.json`);
+ }
+
+ titleToken() {
+ return i18n("admin.config.mcp.clients.edit");
+ }
+}
diff --git a/frontend/discourse/admin/routes/admin-route-map.js b/frontend/discourse/admin/routes/admin-route-map.js
index 49aa85af025..a9bf8495d3c 100644
--- a/frontend/discourse/admin/routes/admin-route-map.js
+++ b/frontend/discourse/admin/routes/admin-route-map.js
@@ -406,6 +406,7 @@ export default function () {
this.route("clients", function () {
this.route("index", { path: "/" });
this.route("new");
+ this.route("edit", { path: "/:id/edit" });
this.route("show", { path: "/:id" });
});
this.route("authorizations");
diff --git a/frontend/discourse/admin/templates/admin-config/mcp/clients/edit.gjs b/frontend/discourse/admin/templates/admin-config/mcp/clients/edit.gjs
new file mode 100644
index 00000000000..c5985547a6e
--- /dev/null
+++ b/frontend/discourse/admin/templates/admin-config/mcp/clients/edit.gjs
@@ -0,0 +1,5 @@
+import AdminMcp from "discourse/admin/components/admin-mcp";
+
+export default <template>
+ <AdminMcp @model={{@model}} @section="client-edit" />
+</template>
diff --git a/frontend/discourse/tests/acceptance/admin-mcp-test.js b/frontend/discourse/tests/acceptance/admin-mcp-test.js
index 70860fc9ac9..be038819edb 100644
--- a/frontend/discourse/tests/acceptance/admin-mcp-test.js
+++ b/frontend/discourse/tests/acceptance/admin-mcp-test.js
@@ -8,6 +8,7 @@ import {
waitUntil,
} from "@ember/test-helpers";
import { test } from "qunit";
+import form from "discourse/tests/helpers/form-kit-helper";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
import stubIntersectionObserver from "discourse/tests/helpers/stub-intersection-observer";
import {
@@ -17,6 +18,7 @@ import {
import { i18n } from "discourse-i18n";
const refreshedClientName = "Updated client";
+const invalidRedirectUri = "https://";
acceptance("Admin - MCP", function (needs) {
let savedAccessRule;
@@ -29,6 +31,7 @@ acceptance("Admin - MCP", function (needs) {
let authorizationRequests;
let clientRequests;
let savedPrimitiveIds;
+ let editableClient;
needs.user({ admin: true });
needs.hooks.beforeEach(() => {
@@ -58,9 +61,46 @@ acceptance("Admin - MCP", function (needs) {
authorizationRequests = [];
clientRequests = [];
savedPrimitiveIds = null;
+ editableClient = {
+ id: 8,
+ name: "Registered client",
+ client_id: "registered-client",
+ registration_type: "pre_registered",
+ trust_state: "approved",
+ admin_managed: true,
+ redirect_uris: ["https://client.example.com/callback?audience=one,two"],
+ };
});
needs.pretender((server, helper) => {
+ server.post("/admin/mcp/clients.json", (request) => {
+ const data = new URLSearchParams(request.requestBody);
+ editableClient = {
+ ...editableClient,
+ name: data.get("client[name]"),
+ client_id: data.get("client[client_id]"),
+ redirect_uris: data.getAll("client[redirect_uris][]"),
+ };
+ return helper.response({ client: editableClient });
+ });
+ server.get("/admin/mcp/clients/8.json", () =>
+ helper.response({ client: editableClient })
+ );
+ server.put("/admin/mcp/clients/8.json", (request) => {
+ const data = new URLSearchParams(request.requestBody);
+ if (data.getAll("client[redirect_uris][]").includes(invalidRedirectUri)) {
+ return helper.response(422, { errors: ["Redirect URIs is invalid"] });
+ }
+ editableClient = {
+ ...editableClient,
+ admin_managed: true,
+ ...(data.has("client[name]") && { name: data.get("client[name]") }),
+ ...(data.has("client[redirect_uris][]") && {
+ redirect_uris: data.getAll("client[redirect_uris][]"),
+ }),
+ };
+ return helper.response({ client: editableClient });
+ });
server.get("/admin/config/site_settings.json", () =>
helper.response({ site_settings: [] })
);
@@ -439,6 +479,183 @@ acceptance("Admin - MCP", function (needs) {
.exists("the incomplete setup checklist is visible");
});
+ test("corrects a registered OAuth client", async function (assert) {
+ const redirectUris = [
+ ...editableClient.redirect_uris,
+ "https://client.example.com/callback/one,two",
+ ];
+ await visit("/admin/config/mcp/clients/8");
+ await click(".admin-mcp__edit-client");
+ assert.strictEqual(
+ currentURL(),
+ "/admin/config/mcp/clients/8/edit",
+ "editing has its own URL"
+ );
+ assert
+ .dom('[name="redirect_uris"]')
+ .hasValue(
+ editableClient.redirect_uris[0],
+ "the current redirect is editable"
+ );
+ assert
+ .dom('[name="client_id"]')
+ .doesNotExist("the client identity is fixed");
+
+ await form(".admin-mcp__edit-client-form")
+ .field("name")
+ .fillIn("Corrected client");
+ await form(".admin-mcp__edit-client-form")
+ .field("redirect_uris")
+ .fillIn(redirectUris.join("\n"));
+ await form(".admin-mcp__edit-client-form").submit();
+ assert.strictEqual(
+ currentURL(),
+ "/admin/config/mcp/clients/8",
+ "saving returns to client details"
+ );
+
+ assert
+ .dom(".admin-mcp__edit-client-form")
+ .doesNotExist("saving returns to the details");
+ assert
+ .dom(".admin-mcp__uri-list")
+ .includesText(redirectUris[1], "the saved redirects are displayed");
+ assert.strictEqual(
+ editableClient.name,
+ "Corrected client",
+ "the name is saved"
+ );
+ assert.deepEqual(
+ editableClient.redirect_uris,
+ redirectUris,
+ "both redirects are saved"
+ );
+ await click(".admin-mcp__edit-client");
+ await form(".admin-mcp__edit-client-form")
+ .field("name")
+ .fillIn("Discard me");
+ await click(".admin-mcp__cancel-client-edit");
+ assert.dom(".dialog-body").exists("unsaved changes require confirmation");
+ await click(".dialog-footer .btn-primary");
+ assert.strictEqual(
+ currentURL(),
+ "/admin/config/mcp/clients/8",
+ "cancel returns to client details"
+ );
+ assert.strictEqual(
+ editableClient.name,
+ "Corrected client",
+ "cancel discards changes"
+ );
+ });
+
+ test("a name-only edit preserves redirects refreshed while the editor is open", async function (assert) {
+ editableClient.registration_type = "cimd";
+ editableClient.admin_managed = false;
+ await visit("/admin/config/mcp/clients/8/edit");
+ editableClient.redirect_uris = ["https://client.example.com/refreshed"];
+
+ const clientForm = form(".admin-mcp__edit-client-form");
+ await clientForm.field("name").fillIn("Renamed client");
+ await clientForm.submit();
+
+ assert
+ .dom(".admin-mcp__uri-list")
+ .includesText(
+ "https://client.example.com/refreshed",
+ "the refreshed redirects are retained"
+ );
+ assert.strictEqual(
+ editableClient.name,
+ "Renamed client",
+ "the name is saved"
+ );
+ assert
+ .dom(".admin-mcp__detail-list")
+ .includesText(
+ i18n("admin.config.mcp.clients.manual"),
+ "the registration is now admin-managed"
+ );
+ });
+
+ test("a rejected client edit still warns before discarding changes", async function (assert) {
+ await visit("/admin/config/mcp/clients/8/edit");
+ const clientForm = form(".admin-mcp__edit-client-form");
+ await clientForm.field("name").fillIn("Unsaved name");
+ await clientForm.field("redirect_uris").fillIn(invalidRedirectUri);
+ await clientForm.submit();
+ assert
+ .dom(".dialog-body")
+ .includesText("Redirect URIs is invalid", "the error is shown");
+ await click(".dialog-footer .btn-primary");
+ await click(".admin-mcp__cancel-client-edit");
+ assert
+ .dom(".dialog-body")
+ .exists("discarding the rejected changes requires confirmation");
+ assert.strictEqual(
+ currentURL(),
+ "/admin/config/mcp/clients/8/edit",
+ "the editor stays open"
+ );
+ });
+
+ test("loads the OAuth client editor directly", async function (assert) {
+ await visit("/admin/config/mcp/clients/8/edit");
+ assert
+ .dom(".admin-mcp__edit-client-form")
+ .exists("the edit form loads directly");
+ assert
+ .dom(".d-page-header")
+ .doesNotExist("the normal page header is hidden");
+ assert
+ .dom(".d-page-subheader")
+ .doesNotExist("the details subheader is hidden");
+ assert
+ .dom('[name="name"]')
+ .hasValue(editableClient.name, "the current name is loaded");
+ });
+
+ test("creates an OAuth client with commas in redirect URIs", async function (assert) {
+ const redirectUris = [
+ "https://client.example.com/callback/one,two",
+ "https://client.example.com/callback?audience=one,two",
+ ];
+ await visit("/admin/config/mcp/clients/new");
+ await click('[data-client-preset-id="custom"] button');
+ const clientForm = form(".admin-mcp__client-form form");
+ await clientForm.field("name").fillIn("Comma client");
+ await clientForm.field("client_id").fillIn("comma-client");
+ await clientForm
+ .field("redirect_uris")
+ .fillIn(` ${redirectUris[0]} \n\n${redirectUris[1]}\n`);
+ await clientForm.submit();
+
+ assert.deepEqual(
+ editableClient.redirect_uris,
+ redirectUris,
+ "commas are preserved and blank lines are ignored"
+ );
+ assert
+ .dom(".admin-mcp__uri-list li")
+ .exists({ count: 2 }, "both redirects are displayed");
+ });
+
+ test("metadata clients can open the editor and save redirect URIs", async function (assert) {
+ const redirectUri = "https://client.example.com/new";
+ editableClient.registration_type = "cimd";
+ editableClient.admin_managed = false;
+ await visit("/admin/config/mcp/clients/8");
+ await click(".admin-mcp__edit-client");
+ assert.dom(".admin-mcp__edit-client-form").exists();
+ const clientForm = form(".admin-mcp__edit-client-form");
+ await clientForm.field("redirect_uris").fillIn(redirectUri);
+ await clientForm.submit();
+ assert.strictEqual(currentURL(), "/admin/config/mcp/clients/8");
+ assert
+ .dom(".admin-mcp__uri-list")
+ .includesText("https://client.example.com/new");
+ });
+
test("prefills known OAuth client applications", async function (assert) {
await visit("/admin/config/mcp/clients/new");
diff --git a/lib/discourse_mcp/oauth.rb b/lib/discourse_mcp/oauth.rb
index 72a8eb14b18..d3b21e85b90 100644
--- a/lib/discourse_mcp/oauth.rb
+++ b/lib/discourse_mcp/oauth.rb
@@ -27,22 +27,27 @@ module DiscourseMcp
enforce_rate_limits!(user, uri.host)
metadata = fetch_metadata(uri)
validate_metadata!(metadata, client_id)
- redirect_uris = metadata["redirect_uris"]
metadata_hash = Digest::SHA256.hexdigest(JSON.generate(canonicalize(metadata)))
trust_state = trust_state_for(uri.host)
client = existing || McpOauthClient.new(client_id: client_id)
- previous_hash = client.metadata_hash
McpOauthClient.transaction do
+ client.lock! if client.persisted?
+ raise Discourse::InvalidAccess if client.blocked?
+ previous_hash = client.metadata_hash
+ unless client.admin_managed?
+ client.assign_attributes(
+ name: metadata["client_name"].presence || uri.host,
+ redirect_uris: metadata["redirect_uris"],
+ )
+ end
client.assign_attributes(
- name: metadata["client_name"].presence || uri.host,
registration_type: "cimd",
trust_state: trust_state,
metadata_uri: client_id,
metadata_hash: metadata_hash,
metadata_expires_at: METADATA_CACHE_TTL.from_now,
metadata: metadata,
- redirect_uris: redirect_uris,
last_seen_at: Time.zone.now,
)
client.save!
diff --git a/spec/lib/discourse_mcp/oauth_spec.rb b/spec/lib/discourse_mcp/oauth_spec.rb
index 024d56c0f63..ae8e461371f 100644
--- a/spec/lib/discourse_mcp/oauth_spec.rb
+++ b/spec/lib/discourse_mcp/oauth_spec.rb
@@ -35,6 +35,74 @@ describe DiscourseMcp::OAuth do
McpGroupScope.create!(group: other_group, scope: "mcp:content:read")
end
+ describe "registration management" do
+ let(:client_id) { "https://client.example.com/oauth/client.json" }
+ let!(:metadata_client) do
+ McpOauthClient.create!(
+ client_id: client_id,
+ name: "Original name",
+ registration_type: "cimd",
+ trust_state: "approved",
+ redirect_uris: ["https://client.example.com/manual"],
+ )
+ end
+ let(:published_uris) { ["https://client.example.com/published"] }
+
+ before do
+ SiteSetting.mcp_oauth_client_id_metadata_policy = "any_domain"
+ response = instance_double(Net::HTTPOK, code: "200")
+ allow(response).to receive(:[]).with("Content-Type").and_return("application/json")
+ destination = instance_double(FinalDestination)
+ allow(FinalDestination).to receive(:new).and_return(destination)
+ allow(destination).to receive(:get).and_yield(
+ response,
+ {
+ client_id: client_id,
+ client_name: "Published name",
+ redirect_uris: published_uris,
+ }.to_json,
+ URI(client_id),
+ )
+ end
+
+ it "keeps updating published registration details after an unchanged save" do
+ metadata_client.update_registration!(
+ name: metadata_client.name,
+ redirect_uris: metadata_client.redirect_uris,
+ )
+ described_class::ClientResolver.resolve!(client_id, force: true, user: user)
+ expect(metadata_client.reload).to have_attributes(
+ name: "Published name",
+ redirect_uris: published_uris,
+ )
+ end
+
+ it "preserves both registration details after an admin edits the name" do
+ metadata_client.update_registration!(name: "Admin chosen name")
+
+ described_class::ClientResolver.resolve!(client_id, force: true, user: user)
+
+ expect(metadata_client.reload).to have_attributes(
+ name: "Admin chosen name",
+ redirect_uris: ["https://client.example.com/manual"],
+ )
+ end
+
+ it "preserves both registration details after an admin edits the redirects" do
+ metadata_client.update_registration!(
+ name: metadata_client.name,
+ redirect_uris: ["https://client.example.com/admin"],
+ )
+
+ described_class::ClientResolver.resolve!(client_id, force: true, user: user)
+
+ expect(metadata_client.reload).to have_attributes(
+ name: "Original name",
+ redirect_uris: ["https://client.example.com/admin"],
+ )
+ end
+ end
+
it "rejects an unapproved metadata domain before registering the client" do
client_id = "https://unapproved.example.com/oauth/client.json"
SiteSetting.mcp_oauth_client_id_metadata_policy = "approved_domains"
diff --git a/spec/requests/admin/mcp_clients_controller_spec.rb b/spec/requests/admin/mcp_clients_controller_spec.rb
index 9fff3c3ec23..104dba0fdc0 100644
--- a/spec/requests/admin/mcp_clients_controller_spec.rb
+++ b/spec/requests/admin/mcp_clients_controller_spec.rb
@@ -56,6 +56,116 @@ describe Admin::McpClientsController do
end
end
+ describe "#update" do
+ let!(:client) { create_client(client_id: "example-client", name: "Example client") }
+ let(:redirect_uri) { "https://client.example.com/corrected-callback" }
+
+ it "corrects a registration without changing its identity or trust" do
+ client.update!(trust_state: "blocked")
+
+ put "/admin/mcp/clients/#{client.id}.json",
+ params: {
+ client: {
+ name: "Updated client",
+ redirect_uris: [redirect_uri],
+ client_id: "replacement",
+ trust_state: "approved",
+ registration_type: "cimd",
+ },
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body.dig("client", "redirect_uris")).to eq([redirect_uri])
+ expect(client.reload).to have_attributes(
+ name: "Updated client",
+ redirect_uris: [redirect_uri],
+ client_id: "example-client",
+ trust_state: "blocked",
+ registration_type: "pre_registered",
+ )
+ expect(UserHistory.last).to have_attributes(
+ acting_user_id: admin.id,
+ custom_type: "mcp_client_updated",
+ )
+ end
+
+ it "rejects invalid redirect URIs without saving other changes" do
+ put "/admin/mcp/clients/#{client.id}.json",
+ params: {
+ client: {
+ name: "Updated client",
+ redirect_uris: ["https://"],
+ },
+ }
+
+ expect(response.status).to eq(422)
+ expect(client.reload.name).to eq("Example client")
+ end
+
+ it "saves both callbacks when adding a redirect URI" do
+ redirect_uris = client.redirect_uris + [redirect_uri]
+
+ put "/admin/mcp/clients/#{client.id}.json",
+ params: {
+ client: {
+ redirect_uris: redirect_uris,
+ },
+ }
+
+ expect(response.status).to eq(200)
+ expect(client.reload.redirect_uris).to eq(redirect_uris)
+ end
+
+ it "switches a metadata client to admin management when editing redirect URIs" do
+ client.update!(registration_type: "cimd")
+
+ put "/admin/mcp/clients/#{client.id}.json",
+ params: {
+ client: {
+ redirect_uris: [redirect_uri],
+ },
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body.dig("client", "admin_managed")).to eq(true)
+ expect(client.reload).to have_attributes(
+ redirect_uris: [redirect_uri],
+ registration_type: "cimd",
+ trust_state: "approved",
+ )
+ end
+
+ it "switches a metadata client to admin management when editing its name" do
+ client.update!(registration_type: "cimd")
+
+ put "/admin/mcp/clients/#{client.id}.json",
+ params: {
+ client: {
+ name: "Renamed client",
+ redirect_uris: client.redirect_uris,
+ },
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body.dig("client", "admin_managed")).to eq(true)
+ expect(client.reload.name).to eq("Renamed client")
+ end
+
+ it "rejects moderators" do
+ sign_in(Fabricate(:moderator))
+
+ put "/admin/mcp/clients/#{client.id}.json",
+ params: {
+ client: {
+ redirect_uris: [redirect_uri],
+ },
+ }
+
+ expect(response.status).to eq(404)
+ expect(client.reload.redirect_uris).to eq(["https://client.example.com/callback"])
+ end
+ end
+
describe "#refresh" do
it "refreshes client ID metadata for an approved domain" do
client_id = "https://client.example.com/oauth/client.json"