diff options
| author | Kate <26026535+provokateurin@users.noreply.github.com> | 2025-03-23 19:34:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-23 19:34:11 +0100 |
| commit | 519ceee5ab31d915be3f1899bf458705acef8cc3 (patch) | |
| tree | 94ad38454cdd3f14789a9f4bfafa23e6dfd074fe /lib | |
| parent | 9ffcdd8cdd8a8734c4beb8291c99a0b097450b77 (diff) | |
| parent | b9f919089417af9821255200f388b18f0f00b2cb (diff) | |
| download | nextcloud-server-519ceee5ab31d915be3f1899bf458705acef8cc3.tar.gz nextcloud-server-519ceee5ab31d915be3f1899bf458705acef8cc3.zip | |
Merge pull request #51622 from nextcloud/fix/ocm-public-key-is-optional
fix(ocm): `publicKey` can be disabled so capabilities do not match
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/OCM/Model/OCMProvider.php | 4 | ||||
| -rw-r--r-- | lib/public/OCM/IOCMProvider.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/OCM/Model/OCMProvider.php b/lib/private/OCM/Model/OCMProvider.php index 99a3770faef..f4b0ac584de 100644 --- a/lib/private/OCM/Model/OCMProvider.php +++ b/lib/private/OCM/Model/OCMProvider.php @@ -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 ]; } diff --git a/lib/public/OCM/IOCMProvider.php b/lib/public/OCM/IOCMProvider.php index a588d869655..a267abc52d2 100644 --- a/lib/public/OCM/IOCMProvider.php +++ b/lib/public/OCM/IOCMProvider.php @@ -151,7 +151,7 @@ interface IOCMProvider extends JsonSerializable { * enabled: bool, * apiVersion: '1.0-proposal1', * endPoint: string, - * publicKey: array{ + * publicKey?: array{ * keyId: string, * publicKeyPem: string * }, |