From 1c1084ff889b94d33372af33a206bc3f278c5f87 Mon Sep 17 00:00:00 2001 From: "T. Todua" <7117978+ttodua@users.noreply.github.com> Date: Sat, 26 Oct 2024 14:52:19 +0400 Subject: [PATCH 1/2] feat(keyFileContent) - content altenative --- src/Provider/Apple.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/Provider/Apple.php b/src/Provider/Apple.php index 6a2caa1..559f182 100644 --- a/src/Provider/Apple.php +++ b/src/Provider/Apple.php @@ -59,8 +59,8 @@ public function __construct(array $options = [], array $collaborators = []) throw new InvalidArgumentException('Required option not passed: "keyFileId"'); } - if (empty($options['keyFilePath'])) { - throw new InvalidArgumentException('Required option not passed: "keyFilePath"'); + if (empty($options['keyFilePath']) && empty($options['keyFileContent'])) { + throw new InvalidArgumentException('Required option not passed: "keyFilePath" or "keyFileContent"'); } parent::__construct($options, $collaborators); @@ -199,15 +199,8 @@ protected function getDefaultScopes() protected function checkResponse(ResponseInterface $response, $data) { if ($response->getStatusCode() >= 400) { - $message = $response->getReasonPhrase(); - if (array_key_exists('error', $data)) { - $message = $data['error']; - } - if (array_key_exists('error_description', $data)) { - $message .= ': ' . $data['error_description']; - } throw new AppleAccessDeniedException( - $message, + array_key_exists('error', $data) ? $data['error'] : $response->getReasonPhrase(), array_key_exists('code', $data) ? $data['code'] : $response->getStatusCode(), $response ); @@ -336,6 +329,9 @@ public function getConfiguration() */ public function getLocalKey() { + if (property_exists($this, 'keyFileContent')) { + return InMemory::plainText($this->keyFileContent); + } return InMemory::file($this->keyFilePath); } } From c5654e641c7909097f6f189517a276cbd362845d Mon Sep 17 00:00:00 2001 From: "T. Todua" <7117978+ttodua@users.noreply.github.com> Date: Sun, 23 Mar 2025 00:08:24 +0400 Subject: [PATCH 2/2] Update Apple.php --- src/Provider/Apple.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Provider/Apple.php b/src/Provider/Apple.php index 559f182..31ef828 100644 --- a/src/Provider/Apple.php +++ b/src/Provider/Apple.php @@ -199,8 +199,12 @@ protected function getDefaultScopes() protected function checkResponse(ResponseInterface $response, $data) { if ($response->getStatusCode() >= 400) { + $message = array_key_exists('error', $data) ? $data['error'] : $response->getReasonPhrase(); + if (array_key_exists('error_description', $data)) { + $message .= ': ' . $data['error_description']; + } throw new AppleAccessDeniedException( - array_key_exists('error', $data) ? $data['error'] : $response->getReasonPhrase(), + $message, array_key_exists('code', $data) ? $data['code'] : $response->getStatusCode(), $response );