upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-24 23:59:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #51622 from nextcloud/fix/ocm-public-key-is-optional

Browse source 
fix(ocm): `publicKey` can be disabled so capabilities do not match
This commit is contained in:
Kate 2025-03-23 19:34:11 +01:00 committed by GitHub
commit 519ceee5ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/cloud_federation_api/lib/Capabilities.php
View file

@ -38,7 +38,7 @@ class Capabilities implements ICapability {
* apiVersion: '1.0-proposal1',
* enabled: bool,
* endPoint: string,
* publicKey: array{
* publicKey?: array{
* keyId: string,
* publicKeyPem: string,
* },

1
apps/cloud_federation_api/openapi.json
View file

@ -46,7 +46,6 @@
"apiVersion",
"enabled",
"endPoint",
"publicKey",
"resourceTypes",
"version"
],

4
lib/private/OCM/Model/OCMProvider.php
View file

@ -213,7 +213,7 @@ class OCMProvider implements IOCMProvider {
* enabled: bool,
* apiVersion: '1.0-proposal1',
* endPoint: string,
* publicKey: array{
* publicKey?: array{
* keyId: string,
* publicKeyPem: string
* },
@ -236,7 +236,7 @@ class OCMProvider implements IOCMProvider {
'apiVersion' => '1.0-proposal1', // deprecated, but keep it to stay compatible with old version
'version' => $this->getApiVersion(), // informative but real version
'endPoint' => $this->getEndPoint(),
'publicKey' => $this->getSignatory()->jsonSerialize(),
'publicKey' => $this->getSignatory()?->jsonSerialize(),
'resourceTypes' => $resourceTypes
];
}

2
lib/public/OCM/IOCMProvider.php
View file

@ -151,7 +151,7 @@ interface IOCMProvider extends JsonSerializable {
* enabled: bool,
* apiVersion: '1.0-proposal1',
* endPoint: string,
* publicKey: array{
* publicKey?: array{
* keyId: string,
* publicKeyPem: string
* },