mirror of
https://github.com/nextcloud/server.git
synced 2026-06-06 15:23:17 -04:00
Merge pull request #42948 from nextcloud/backport/42940/stable28
This commit is contained in:
John Molakvoæ
GitHub
commit
d1ef76913c
11 changed files with 5640 additions and 1885 deletions
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
|
|
@ -43,7 +43,7 @@
|
|||
/core/routes.php @Altahrim
|
||||
|
||||
# OpenAPI
|
||||
openapi.json @provokateurin
|
||||
openapi*.json @provokateurin
|
||||
ResponseDefinitions.php @provokateurin
|
||||
|
||||
# Talk team
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ use OCP\Files\Template\TemplateFileCreator;
|
|||
use OCP\IRequest;
|
||||
|
||||
/**
|
||||
* @psalm-import-type FilesTemplate from ResponseDefinitions
|
||||
* @psalm-import-type FilesTemplateFile from ResponseDefinitions
|
||||
* @psalm-import-type FilesTemplateFileCreator from ResponseDefinitions
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -27,21 +27,6 @@ declare(strict_types=1);
|
|||
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,
|
||||
|
|
|
|||
|
|
@ -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": [
|
||||
|
|
|
|||
|
|
@ -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": {
|
||||
|
|
@ -1348,27 +1338,7 @@
|
|||
"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": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1376,27 +1346,7 @@
|
|||
"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": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1404,27 +1354,7 @@
|
|||
"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": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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": {
|
||||
|
|
@ -1526,27 +1446,7 @@
|
|||
"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": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1554,27 +1454,7 @@
|
|||
"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": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1582,27 +1462,7 @@
|
|||
"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": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
1570
apps/provisioning_api/openapi-administration.json
Normal file
1570
apps/provisioning_api/openapi-administration.json
Normal file
File diff suppressed because it is too large
Load diff
4056
apps/provisioning_api/openapi-full.json
Normal file
4056
apps/provisioning_api/openapi-full.json
Normal file
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -20,27 +20,6 @@
|
|||
}
|
||||
},
|
||||
"schemas": {
|
||||
"Background": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
"backgroundImage",
|
||||
"backgroundColor",
|
||||
"version"
|
||||
],
|
||||
"properties": {
|
||||
"backgroundImage": {
|
||||
"type": "string",
|
||||
"nullable": true
|
||||
},
|
||||
"backgroundColor": {
|
||||
"type": "string"
|
||||
},
|
||||
"version": {
|
||||
"type": "integer",
|
||||
"format": "int64"
|
||||
}
|
||||
}
|
||||
},
|
||||
"OCSMeta": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
|
|
@ -619,18 +598,6 @@
|
|||
"basic_auth": []
|
||||
}
|
||||
],
|
||||
"parameters": [
|
||||
{
|
||||
"name": "OCS-APIRequest",
|
||||
"in": "header",
|
||||
"description": "Required to be true for the API request to pass",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "boolean",
|
||||
"default": true
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Background image returned",
|
||||
|
|
@ -656,151 +623,6 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"/index.php/apps/theming/background/{type}": {
|
||||
"post": {
|
||||
"operationId": "user_theme-set-background",
|
||||
"summary": "Set the background",
|
||||
"tags": [
|
||||
"user_theme"
|
||||
],
|
||||
"security": [
|
||||
{
|
||||
"bearer_auth": []
|
||||
},
|
||||
{
|
||||
"basic_auth": []
|
||||
}
|
||||
],
|
||||
"parameters": [
|
||||
{
|
||||
"name": "value",
|
||||
"in": "query",
|
||||
"description": "Path of the background image",
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"default": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "color",
|
||||
"in": "query",
|
||||
"description": "Color for the background",
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"nullable": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "type",
|
||||
"in": "path",
|
||||
"description": "Type of background",
|
||||
"required": true,
|
||||
"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": {
|
||||
"200": {
|
||||
"description": "Background set successfully",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/Background"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"400": {
|
||||
"description": "Setting background is not possible",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
"error"
|
||||
],
|
||||
"properties": {
|
||||
"error": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"500": {
|
||||
"description": "",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
"error"
|
||||
],
|
||||
"properties": {
|
||||
"error": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/index.php/apps/theming/background/custom": {
|
||||
"delete": {
|
||||
"operationId": "user_theme-delete-background",
|
||||
"summary": "Delete the background",
|
||||
"tags": [
|
||||
"user_theme"
|
||||
],
|
||||
"security": [
|
||||
{
|
||||
"bearer_auth": []
|
||||
},
|
||||
{
|
||||
"basic_auth": []
|
||||
}
|
||||
],
|
||||
"parameters": [
|
||||
{
|
||||
"name": "OCS-APIRequest",
|
||||
"in": "header",
|
||||
"description": "Required to be true for the API request to pass",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "boolean",
|
||||
"default": true
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Background deleted successfully",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/Background"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/ocs/v2.php/apps/theming/api/v1/theme/{themeId}/enable": {
|
||||
"put": {
|
||||
"operationId": "user_theme-enable-theme",
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
namespace OCA\User_LDAP\Controller;
|
||||
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\Attribute\OpenAPI;
|
||||
use OCP\AppFramework\Http\RedirectResponse;
|
||||
use OCP\AppFramework\Http\TemplateResponse;
|
||||
use OCP\HintException;
|
||||
|
|
@ -35,6 +36,7 @@ use OCP\IURLGenerator;
|
|||
use OCP\IUser;
|
||||
use OCP\IUserManager;
|
||||
|
||||
#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
|
||||
class RenewPasswordController extends Controller {
|
||||
/** @var IUserManager */
|
||||
private $userManager;
|
||||
|
|
|
|||
8
vendor-bin/openapi-extractor/composer.lock
generated
8
vendor-bin/openapi-extractor/composer.lock
generated
|
|
@ -82,12 +82,12 @@
|
|||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/nextcloud/openapi-extractor.git",
|
||||
"reference": "d60f9911c30b7f3b7a5de046cf3bcaaa998376f5"
|
||||
"reference": "3b7b6ff9659a5f15612d4749e085bbcb83509049"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/nextcloud/openapi-extractor/zipball/d60f9911c30b7f3b7a5de046cf3bcaaa998376f5",
|
||||
"reference": "d60f9911c30b7f3b7a5de046cf3bcaaa998376f5",
|
||||
"url": "https://api.github.com/repos/nextcloud/openapi-extractor/zipball/3b7b6ff9659a5f15612d4749e085bbcb83509049",
|
||||
"reference": "3b7b6ff9659a5f15612d4749e085bbcb83509049",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
"source": "https://github.com/nextcloud/openapi-extractor/tree/main",
|
||||
"issues": "https://github.com/nextcloud/openapi-extractor/issues"
|
||||
},
|
||||
"time": "2024-01-08T13:18:50+00:00"
|
||||
"time": "2024-01-18T14:53:21+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nikic/php-parser",
|
||||
|
|
|
|||
Loading…
Reference in a new issue