Check that array is not empty

.gitignore

@@ -3,3 +3,4 @@ composer.lock
 vendor
 coverage.clover
 .phpunit.result.cache
+.vscode

.travis.yml

@@ -1,20 +1,14 @@
 language: php
 
+php:
+    - 7.2
+
 cache:
     directories:
         - $HOME/.composer/cache
 
 matrix:
     fast_finish: true
-    include:
-        - php: 7.2
-          env: LARAVEL='5.7.*' TESTBENCH='3.7.*' PHPENUM='1.*' PHPUNIT='7.*' COMPOSER_FLAGS='--prefer-stable'
-        - php: 7.3
-          env: LARAVEL='5.7.*' TESTBENCH='3.7.*' PHPENUM='1.*' PHPUNIT='7.*' COMPOSER_FLAGS='--prefer-lowest'
-        - php: 7.2
-          env: LARAVEL='5.8.*' TESTBENCH='3.8.*' PHPENUM='1.*' PHPUNIT='8.*' COMPOSER_FLAGS='--prefer-stable'
-        - php: 7.3
-          env: LARAVEL='5.8.*' TESTBENCH='3.8.*' PHPENUM='1.*' PHPUNIT='8.*' COMPOSER_FLAGS='--prefer-lowest'
 
 before_install:
     - travis_retry composer self-update

README.md

@@ -1,6 +1,6 @@
 # Handle Appstore server-to-server notifications for auto-renewable subscriptions
 
-[![Latest Version on Packagist](https://img.shields.io/packagist/v/app-vise/laravel-appstore-server-notifications.svg?style=flat-square)](https://packagist.org/packages/app-vise/laravel-appstore-server-notifications)
+[![Latest Version on Packagist](https://img.shields.io/packagist/v/tag/app-vise/laravel-appstore-server-notifications.svg?style=flat-square&sort=semver)](https://packagist.org/packages/app-vise/laravel-appstore-server-notifications)
 [![Build Status](https://travis-ci.org/app-vise/laravel-appstore-notifications.svg?branch=master)](https://travis-ci.org/app-vise/laravel-appstore-notifications)
 [![StyleCI](https://styleci.io/repos/215539443/shield?branch=master)](https://styleci.io/repos/215539443)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/app-vise/laravel-appstore-notifications/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/app-vise/laravel-appstore-notifications/?branch=master)

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "app-vise/laravel-appstore-server-notifications",
+    "name": "rjgonzale/laravel-appstore-server-notifications",
     "description": "Handling Appstore server to server notifications",
     "keywords": [
         "app-vise",
@@ -19,8 +19,8 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.",
-        "illuminate/support": "~5.7.0|^6.0",
+        "illuminate/support": "^5.5|^6.0|^7.",
         "bensampo/laravel-enum": "^1.0"
     },
     "require-dev": {

src/WebhooksController.php

@@ -7,16 +7,18 @@ use Appvise\AppStoreNotifications\Model\NotificationType;
 use Appvise\AppStoreNotifications\Model\AppleNotification;
 use Appvise\AppStoreNotifications\Exceptions\WebhookFailed;
 use Appvise\AppStoreNotifications\Model\NotificationPayload;
+use Illuminate\Support\Facades\Log;
 
 class WebhooksController
 {
     public function __invoke(Request $request)
     {
         $jobConfigKey = NotificationType::{$request->input('notification_type')}();
-        $this->determineValidRequest($request->input('password'));
 
         AppleNotification::storeNotification($jobConfigKey, $request->input());
 
+        //$this->determineValidRequest($request->input('password'));
+
         $payload = NotificationPayload::createFromRequest($request);
 
         $jobClass = config("appstore-server-notifications.jobs.{$jobConfigKey}", null);

src/exceptions/WebhookFailed.php

@@ -8,7 +8,7 @@ class WebhookFailed extends Exception
 {
     public static function nonValidRequest()
     {
-        return new static("Your shared secret does not match password in Apple's request", 400);
+        return new static("Your shared secret does not match password in Apple's request", 500);
     }
 
     public static function jobClassDoesNotExist(string $jobClass)

src/model/NotificationPayload.php

@@ -28,6 +28,43 @@ class NotificationPayload
     {
     }
 
+    public static function createFromArray($notification) {
+        $instance = new self();
+        $instance->environment = $notification['environment'];
+        $instance->password = $notification['password'];
+        $instance->notificationType = $notification['notification_type'];
+        $instance->cancellationDate = $notification['cancellation_date'] ?? null;
+        $instance->cancellationDatePst = $notification['cancellation_date_pst'] ?? null;
+        $instance->cancellationDateMs = $notification['cancellation_date_ms'] ?? null;
+        $instance->webOrderLineItemId = $notification['web_order_line_item_id'] ?? null;
+        $instance->latestReceipt = $notification['latest_receipt'] ?? null;
+        if (isset($notification['latest_receipt_info'])) {
+            $instance->latestReceiptInfo = Receipt::createFromArray($notification['latest_receipt_info']);
+        } else {
+            $instance->latestReceiptInfo = null;
+        }
+        $instance->latestExpiredReceipt = $notification['latest_expired_receipt'] ?? null;
+        if (isset($notification['latest_expired_receipt_info'])) {
+            $instance->latestExpiredReceiptInfo = Receipt::createFromArray($notification['latest_expired_receipt_info']);
+        } else {
+            $instance->latestExpiredReceiptInfo = null;
+        }
+        $instance->autoRenewStatus = $notification['auto_renew_status'];
+        $instance->autoRenewProductId = $notification['auto_renew_product_id'];
+        $instance->autoRenewStatusChangeDate = $notification['auto_renew_status_change_date'] ?? null;
+        $instance->autoRenewStatusChangeDatePst = $notification['auto_renew_status_change_date_pst'] ?? null;
+        $instance->autoRenewStatusChangeDateMs = $notification['auto_renew_status_change_date_ms'] ?? null;
+        if (isset($notification['pending_renewal_info'])) {
+            foreach ($notification['pending_renewal_info'] as $pendingRenewalInfo) {
+                $instance->pendingRenewalInfo[] = RenewalInfo::createFromRequest($pendingRenewalInfo);
+            }
+        } else {
+            $instance->pendingRenewalInfo = null;
+        }
+
+        return $instance;
+    }
+
     public static function createFromRequest(Request $request)
     {
         $instance = new self();
@@ -38,11 +75,20 @@ class NotificationPayload
         $instance->cancellationDatePst = $request->input('cancellation_date_pst');
         $instance->cancellationDateMs = $request->input('cancellation_date_ms');
         $instance->webOrderLineItemId = $request->input('web_order_line_item_id');
-        $instance->latestReceipt = $request->input('latest_receipt');
+
-        $instance->latestReceiptInfo = Receipt::createFromArray($request->input('latest_receipt_info'));
+        $unified_receipt = $request->input('unified_receipt');
-        $instance->latestExpiredReceipt = $request->input('latest_expired_receipt');
+
-        if ($request->has('latest_expired_receipt_info')) {
+        $instance->latestReceipt = $request->input('unified_receipt.latest_receipt');
-            $instance->latestExpiredReceiptInfo = Receipt::createFromArray($request->input('latest_expired_receipt_info'));
+        if ($request->has('unified_receipt.latest_receipt_info')) {
+            $instance->latestReceiptInfo = Receipt::createFromArray($request->input('unified_receipt.latest_receipt_info'));
+        } else {
+            $instance->latestReceiptInfo = null;
+        }
+        $instance->latestExpiredReceipt = $request->input('unified_receipt.latest_expired_receipt');
+        if ($request->has('unified_receipt.latest_expired_receipt_info')) {
+            if (count($request->input('unified_receipt.latest_expired_receipt_info')) > 0) {
+                $instance->latestExpiredReceiptInfo = Receipt::createFromArray($request->input('unified_receipt.latest_expired_receipt_info')[0]);
+            }
         } else {
             $instance->latestExpiredReceiptInfo = null;
         }

src/model/NotificationType.php

@@ -15,4 +15,5 @@ class NotificationType extends Enum
     const DID_FAIL_TO_RENEW = 'did_fail_to_renew';
     const DID_RECOVER = 'did_recover'; // replaces RENEWAL
     const PRICE_INCREASE_CONSENT = 'price_increase_consent';
+    const DID_RENEW = 'did_renew';
 }