Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable29] fix(openapi): Make the operation-id unique #12030

Merged
merged 2 commits into from
Apr 9, 2024
Merged

[stable29] fix(openapi): Make the operation-id unique #12030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf720c1
fix(openapi): Make the operation-id unique
nickvergessen Apr 9, 2024
f210a02
chore(assets): Recompile OpenAPI
nickvergessen Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appinfo/routes/routesRoomController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() */
Expand Down
2 changes: 1 addition & 1 deletion openapi-backend-sipbridge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion openapi-full.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
63 changes: 62 additions & 1 deletion src/types/openapi/openapi-backend-sipbridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down Expand Up @@ -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: {
Expand Down
63 changes: 62 additions & 1 deletion src/types/openapi/openapi-full.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down Expand Up @@ -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: {
Expand Down
Loading