From b524485d9fa1bd3950a5eef16ca337c20280176c Mon Sep 17 00:00:00 2001
From: Anna Larch <anna@nextcloud.com>
Date: Thu, 21 Nov 2024 18:30:45 +0100
Subject: [PATCH] fixup! feat: add option to force passwords in public
 conversations

---
 lib/Controller/RoomController.php | 1 +
 openapi-full.json                 | 6 +++---
 openapi.json                      | 6 +++---
 src/types/openapi/openapi-full.ts | 6 +++---
 src/types/openapi/openapi.ts      | 6 +++---
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 2fba971ce58..a632b932f32 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -121,6 +121,7 @@ public function __construct(
 		protected Capabilities $capabilities,
 		protected FederationManager $federationManager,
 		protected BanService $banService,
+		protected IL10n $l10n,
 	) {
 		parent::__construct($appName, $request);
 	}
diff --git a/openapi-full.json b/openapi-full.json
index 52db234c3ff..e48fea7992f 100644
--- a/openapi-full.json
+++ b/openapi-full.json
@@ -11231,7 +11231,7 @@
                                     "password": {
                                         "type": "string",
                                         "default": "",
-                                        "description": "The room password"
+                                        "description": "The room password (only available with `conversation-creation-password` capability)"
                                     }
                                 }
                             }
@@ -11865,7 +11865,7 @@
             "post": {
                 "operationId": "room-make-public",
                 "summary": "Allowed guests to join conversation",
-                "description": "Required capability: `conversation-creation-password`",
+                "description": "Required capability: `conversation-creation-password` for `string $password` parameter",
                 "tags": [
                     "room"
                 ],
@@ -11887,7 +11887,7 @@
                                     "password": {
                                         "type": "string",
                                         "default": "",
-                                        "description": "New password"
+                                        "description": "New password (only available with `conversation-creation-password` capability)"
                                     }
                                 }
                             }
diff --git a/openapi.json b/openapi.json
index 655bd9d6181..f1d98cb98f4 100644
--- a/openapi.json
+++ b/openapi.json
@@ -11118,7 +11118,7 @@
                                     "password": {
                                         "type": "string",
                                         "default": "",
-                                        "description": "The room password"
+                                        "description": "The room password (only available with `conversation-creation-password` capability)"
                                     }
                                 }
                             }
@@ -11999,7 +11999,7 @@
             "post": {
                 "operationId": "room-make-public",
                 "summary": "Allowed guests to join conversation",
-                "description": "Required capability: `conversation-creation-password`",
+                "description": "Required capability: `conversation-creation-password` for `string $password` parameter",
                 "tags": [
                     "room"
                 ],
@@ -12021,7 +12021,7 @@
                                     "password": {
                                         "type": "string",
                                         "default": "",
-                                        "description": "New password"
+                                        "description": "New password (only available with `conversation-creation-password` capability)"
                                     }
                                 }
                             }
diff --git a/src/types/openapi/openapi-full.ts b/src/types/openapi/openapi-full.ts
index 69e45bbb72a..a181969a11b 100644
--- a/src/types/openapi/openapi-full.ts
+++ b/src/types/openapi/openapi-full.ts
@@ -857,7 +857,7 @@ export type paths = {
         put?: never;
         /**
          * Allowed guests to join conversation
-         * @description Required capability: `conversation-creation-password`
+         * @description Required capability: `conversation-creation-password` for `string $password` parameter
          */
         post: operations["room-make-public"];
         /** Disallowed guests to join conversation */
@@ -6201,7 +6201,7 @@ export interface operations {
                      */
                     objectId?: string;
                     /**
-                     * @description The room password
+                     * @description The room password (only available with `conversation-creation-password` capability)
                      * @default
                      */
                     password?: string;
@@ -6473,7 +6473,7 @@ export interface operations {
             content: {
                 "application/json": {
                     /**
-                     * @description New password
+                     * @description New password (only available with `conversation-creation-password` capability)
                      * @default
                      */
                     password?: string;
diff --git a/src/types/openapi/openapi.ts b/src/types/openapi/openapi.ts
index f7d62166f82..20555f0a74b 100644
--- a/src/types/openapi/openapi.ts
+++ b/src/types/openapi/openapi.ts
@@ -859,7 +859,7 @@ export type paths = {
         put?: never;
         /**
          * Allowed guests to join conversation
-         * @description Required capability: `conversation-creation-password`
+         * @description Required capability: `conversation-creation-password` for `string $password` parameter
          */
         post: operations["room-make-public"];
         /** Disallowed guests to join conversation */
@@ -5682,7 +5682,7 @@ export interface operations {
                      */
                     objectId?: string;
                     /**
-                     * @description The room password
+                     * @description The room password (only available with `conversation-creation-password` capability)
                      * @default
                      */
                     password?: string;
@@ -6054,7 +6054,7 @@ export interface operations {
             content: {
                 "application/json": {
                     /**
-                     * @description New password
+                     * @description New password (only available with `conversation-creation-password` capability)
                      * @default
                      */
                     password?: string;