Skip to content

Commit

Permalink
Merge pull request #42948 from nextcloud/backport/42940/stable28
Browse files Browse the repository at this point in the history
  • Loading branch information
@skjnldsv
skjnldsv authored Jan 20, 2024
2 parents 0285fbe + 4420923 commit d1ef769
Show file tree
Hide file tree
Showing 11 changed files with 6,269 additions and 2,514 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
/core/routes.php @Altahrim

# OpenAPI
openapi.json @provokateurin
openapi*.json @provokateurin
ResponseDefinitions.php @provokateurin

# Talk team
Expand Down
1 change: 0 additions & 1 deletion apps/files/lib/Controller/TemplateController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
use OCP\IRequest;

/**
* @psalm-import-type FilesTemplate from ResponseDefinitions
* @psalm-import-type FilesTemplateFile from ResponseDefinitions
* @psalm-import-type FilesTemplateFileCreator from ResponseDefinitions
*/
Expand Down
15 changes: 0 additions & 15 deletions apps/files/lib/ResponseDefinitions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,6 @@
namespace OCA\Files;

/**
* @psalm-type FilesTemplate = array{
* templateType: string,
* templateId: string,
* basename: string,
* etag: string,
* fileid: int,
* filename: string,
* lastmod: int,
* mime: string,
* size: int,
* type: string,
* hasPreview: bool,
* previewUrl: ?string,
* }
*
* @psalm-type FilesTemplateFile = array{
* basename: string,
* etag: string,
Expand Down
59 changes: 0 additions & 59 deletions apps/files/openapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,65 +90,6 @@
}
}
},
"Template": {
"type": "object",
"required": [
"templateType",
"templateId",
"basename",
"etag",
"fileid",
"filename",
"lastmod",
"mime",
"size",
"type",
"hasPreview",
"previewUrl"
],
"properties": {
"templateType": {
"type": "string"
},
"templateId": {
"type": "string"
},
"basename": {
"type": "string"
},
"etag": {
"type": "string"
},
"fileid": {
"type": "integer",
"format": "int64"
},
"filename": {
"type": "string"
},
"lastmod": {
"type": "integer",
"format": "int64"
},
"mime": {
"type": "string"
},
"size": {
"type": "integer",
"format": "int64"
},
"type": {
"type": "string"
},
"hasPreview": {
"type": "boolean"
},
"previewUrl": {
"type": "string",
"nullable": true
}
}
},
"TemplateFile": {
"type": "object",
"required": [
Expand Down
154 changes: 7 additions & 147 deletions apps/files_sharing/openapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1320,16 +1320,6 @@
"schema": {
"type": "string"
}
},
{
"name": "OCS-APIRequest",
"in": "header",
"description": "Required to be true for the API request to pass",
"required": true,
"schema": {
"type": "boolean",
"default": true
}
}
],
"responses": {
Expand All @@ -1348,83 +1338,23 @@
"description": "Getting preview is not possible",
"content": {
"application/json": {
"schema": {
"type": "object",
"required": [
"ocs"
],
"properties": {
"ocs": {
"type": "object",
"required": [
"meta",
"data"
],
"properties": {
"meta": {
"$ref": "#/components/schemas/OCSMeta"
},
"data": {}
}
}
}
}
"schema": {}
}
}
},
"403": {
"description": "Getting preview is not allowed",
"content": {
"application/json": {
"schema": {
"type": "object",
"required": [
"ocs"
],
"properties": {
"ocs": {
"type": "object",
"required": [
"meta",
"data"
],
"properties": {
"meta": {
"$ref": "#/components/schemas/OCSMeta"
},
"data": {}
}
}
}
}
"schema": {}
}
}
},
"404": {
"description": "Share or preview not found",
"content": {
"application/json": {
"schema": {
"type": "object",
"required": [
"ocs"
],
"properties": {
"ocs": {
"type": "object",
"required": [
"meta",
"data"
],
"properties": {
"meta": {
"$ref": "#/components/schemas/OCSMeta"
},
"data": {}
}
}
}
}
"schema": {}
}
}
}
Expand Down Expand Up @@ -1498,16 +1428,6 @@
"schema": {
"type": "string"
}
},
{
"name": "OCS-APIRequest",
"in": "header",
"description": "Required to be true for the API request to pass",
"required": true,
"schema": {
"type": "boolean",
"default": true
}
}
],
"responses": {
Expand All @@ -1526,83 +1446,23 @@
"description": "Getting preview is not possible",
"content": {
"application/json": {
"schema": {
"type": "object",
"required": [
"ocs"
],
"properties": {
"ocs": {
"type": "object",
"required": [
"meta",
"data"
],
"properties": {
"meta": {
"$ref": "#/components/schemas/OCSMeta"
},
"data": {}
}
}
}
}
"schema": {}
}
}
},
"403": {
"description": "Getting preview is not allowed",
"content": {
"application/json": {
"schema": {
"type": "object",
"required": [
"ocs"
],
"properties": {
"ocs": {
"type": "object",
"required": [
"meta",
"data"
],
"properties": {
"meta": {
"$ref": "#/components/schemas/OCSMeta"
},
"data": {}
}
}
}
}
"schema": {}
}
}
},
"404": {
"description": "Share or preview not found",
"content": {
"application/json": {
"schema": {
"type": "object",
"required": [
"ocs"
],
"properties": {
"ocs": {
"type": "object",
"required": [
"meta",
"data"
],
"properties": {
"meta": {
"$ref": "#/components/schemas/OCSMeta"
},
"data": {}
}
}
}
}
"schema": {}
}
}
}
Expand Down Expand Up @@ -2609,7 +2469,7 @@
},
"/ocs/v2.php/apps/files_sharing/api/v1/deletedshares": {
"get": {
"operationId": "deleted_shareapi-list",
"operationId": "deleted_shareapi-index",
"summary": "Get a list of all deleted shares",
"tags": [
"deleted_shareapi"
Expand Down
Loading

0 comments on commit d1ef769

Please sign in to comment.