Merge pull request #12028 from nextcloud/bugfix/noid/make-route-opera…

…tion-id-unique fix(openapi): Make the operation-id unique
nextcloud · Apr 9, 2024 · 949d1ca · 949d1ca
2 parents fd09f89 + 4d17200
commit 949d1ca
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 5 deletions.
diff --git a/appinfo/routes/routesRoomController.php b/appinfo/routes/routesRoomController.php
@@ -101,7 +101,7 @@
 		/** @see \OCA\Talk\Controller\RoomController::verifyDialInPin() */
 		['name' => 'Room#verifyDialInPin', 'url' => '/api/{apiVersion}/room/{token}/pin/{pin}', 'verb' => 'GET', 'requirements' => array_merge($requirementsWithToken, [
 			'pin' => '\d{7,32}',
-		])],
+		]), 'postfix' => 'deprecated'],
 		/** @see \OCA\Talk\Controller\RoomController::verifyDialInPin() */
 		['name' => 'Room#verifyDialInPin', 'url' => '/api/{apiVersion}/room/{token}/verify-dialin', 'verb' => 'POST', 'requirements' => $requirementsWithToken],
 		/** @see \OCA\Talk\Controller\RoomController::verifyDialOutNumber() */

diff --git a/openapi-backend-sipbridge.json b/openapi-backend-sipbridge.json
@@ -915,7 +915,7 @@
         },
         "/ocs/v2.php/apps/spreed/api/{apiVersion}/room/{token}/pin/{pin}": {
             "get": {
-                "operationId": "room-verify-dial-in-pin",
+                "operationId": "room-verify-dial-in-pin-deprecated",
                 "summary": "Verify a dial-in PIN (SIP bridge)",
                 "tags": [
                     "room"

diff --git a/openapi-full.json b/openapi-full.json
@@ -18314,7 +18314,7 @@
         },
         "/ocs/v2.php/apps/spreed/api/{apiVersion}/room/{token}/pin/{pin}": {
             "get": {
-                "operationId": "room-verify-dial-in-pin",
+                "operationId": "room-verify-dial-in-pin-deprecated",
                 "summary": "Verify a dial-in PIN (SIP bridge)",
                 "tags": [
                     "room"

diff --git a/src/types/openapi/openapi-backend-sipbridge.ts b/src/types/openapi/openapi-backend-sipbridge.ts
@@ -16,7 +16,7 @@ export type paths = {
   };
   "/ocs/v2.php/apps/spreed/api/{apiVersion}/room/{token}/pin/{pin}": {
     /** Verify a dial-in PIN (SIP bridge) */
-    get: operations["room-verify-dial-in-pin"];
+    get: operations["room-verify-dial-in-pin-deprecated"];
   };
   "/ocs/v2.php/apps/spreed/api/{apiVersion}/room/{token}/verify-dialin": {
     /** Verify a dial-in PIN (SIP bridge) */
@@ -327,6 +327,67 @@ export type operations = {
     };
   };
   /** Verify a dial-in PIN (SIP bridge) */
+  "room-verify-dial-in-pin-deprecated": {
+    parameters: {
+      header: {
+        /** @description Required to be true for the API request to pass */
+        "OCS-APIRequest": boolean;
+      };
+      path: {
+        apiVersion: "v4";
+        token: string;
+        /** @description PIN the participant used to dial-in */
+        pin: string;
+      };
+    };
+    responses: {
+      /** @description Participant returned */
+      200: {
+        content: {
+          "application/json": {
+            ocs: {
+              meta: components["schemas"]["OCSMeta"];
+              data: components["schemas"]["Room"];
+            };
+          };
+        };
+      };
+      /** @description SIP request invalid */
+      401: {
+        content: {
+          "application/json": {
+            ocs: {
+              meta: components["schemas"]["OCSMeta"];
+              data: unknown;
+            };
+          };
+        };
+      };
+      /** @description Participant not found */
+      404: {
+        content: {
+          "application/json": {
+            ocs: {
+              meta: components["schemas"]["OCSMeta"];
+              data: unknown;
+            };
+          };
+        };
+      };
+      /** @description SIP dial-in is not configured */
+      501: {
+        content: {
+          "application/json": {
+            ocs: {
+              meta: components["schemas"]["OCSMeta"];
+              data: unknown;
+            };
+          };
+        };
+      };
+    };
+  };
+  /** Verify a dial-in PIN (SIP bridge) */
   "room-verify-dial-in-pin": {
     parameters: {
       query: {

diff --git a/src/types/openapi/openapi-full.ts b/src/types/openapi/openapi-full.ts
@@ -501,7 +501,7 @@ export type paths = {
   };
   "/ocs/v2.php/apps/spreed/api/{apiVersion}/room/{token}/pin/{pin}": {
     /** Verify a dial-in PIN (SIP bridge) */
-    get: operations["room-verify-dial-in-pin"];
+    get: operations["room-verify-dial-in-pin-deprecated"];
   };
   "/ocs/v2.php/apps/spreed/api/{apiVersion}/room/{token}/verify-dialin": {
     /** Verify a dial-in PIN (SIP bridge) */
@@ -6582,6 +6582,67 @@ export type operations = {
     };
   };
   /** Verify a dial-in PIN (SIP bridge) */
+  "room-verify-dial-in-pin-deprecated": {
+    parameters: {
+      header: {
+        /** @description Required to be true for the API request to pass */
+        "OCS-APIRequest": boolean;
+      };
+      path: {
+        apiVersion: "v4";
+        token: string;
+        /** @description PIN the participant used to dial-in */
+        pin: string;
+      };
+    };
+    responses: {
+      /** @description Participant returned */
+      200: {
+        content: {
+          "application/json": {
+            ocs: {
+              meta: components["schemas"]["OCSMeta"];
+              data: components["schemas"]["Room"];
+            };
+          };
+        };
+      };
+      /** @description SIP request invalid */
+      401: {
+        content: {
+          "application/json": {
+            ocs: {
+              meta: components["schemas"]["OCSMeta"];
+              data: unknown;
+            };
+          };
+        };
+      };
+      /** @description Participant not found */
+      404: {
+        content: {
+          "application/json": {
+            ocs: {
+              meta: components["schemas"]["OCSMeta"];
+              data: unknown;
+            };
+          };
+        };
+      };
+      /** @description SIP dial-in is not configured */
+      501: {
+        content: {
+          "application/json": {
+            ocs: {
+              meta: components["schemas"]["OCSMeta"];
+              data: unknown;
+            };
+          };
+        };
+      };
+    };
+  };
+  /** Verify a dial-in PIN (SIP bridge) */
   "room-verify-dial-in-pin": {
     parameters: {
       query: {