diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2024-12-10 15:30:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-10 15:30:50 +0100 |
| commit | 28ec9c7e80e825aea2537f865e2862aecf25c8f1 (patch) | |
| tree | a3e0be87e769f15ec57049630e14a4016d3fe891 /lib | |
| parent | 70346e0214de4f0da0eab33fc05771bd1efe8097 (diff) | |
| parent | 280b4929191981d3f10ece95575a7981cdfc0ae4 (diff) | |
| download | nextcloud-server-28ec9c7e80e825aea2537f865e2862aecf25c8f1.tar.gz nextcloud-server-28ec9c7e80e825aea2537f865e2862aecf25c8f1.zip | |
Merge pull request #49750 from nextcloud/bugfix/noid/oracle-federation
fix(federation): Allow Oracles empty strings
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/unstable/Security/Signature/Model/Signatory.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/unstable/Security/Signature/Model/Signatory.php b/lib/unstable/Security/Signature/Model/Signatory.php index c3a275082ae..6bd50bb1098 100644 --- a/lib/unstable/Security/Signature/Model/Signatory.php +++ b/lib/unstable/Security/Signature/Model/Signatory.php @@ -39,8 +39,7 @@ use OCP\AppFramework\Db\Entity; * @method void setType(int $type) * @method int getStatus() * @method void setStatus(int $status) - * @method void setAccount(string $account) - * @method string getAccount() + * @method void setAccount(?string $account) * @method void setMetadata(array $metadata) * @method ?array getMetadata() * @method void setCreation(int $creation) @@ -56,7 +55,7 @@ class Signatory extends Entity implements JsonSerializable { protected string $host = ''; protected string $publicKey = ''; protected string $privateKey = ''; - protected string $account = ''; + protected ?string $account = ''; protected int $type = 9; protected int $status = 1; protected ?array $metadata = null; @@ -146,6 +145,13 @@ class Signatory extends Entity implements JsonSerializable { } /** + * @experimental 31.0.0 + */ + public function getAccount(): string { + return $this->account ?? ''; + } + + /** * update an entry in metadata * * @param string $key |