Merge pull request #10951 from turbo124/v5-develop

Return early if webhook payload is not appropriate

app/Helpers/Bank/Nordigen/Nordigen.php

@@ -224,29 +224,28 @@ class Nordigen
      * isAccountActive
      *
      * @param  string $account_id
-     * @return bool
+     * @return array
      */
-    public function isAccountActive(string $account_id): bool
+    public function isAccountActive(string $account_id): array
     {
         try {
             $account = $this->client->account($account_id)->getAccountMetaData();
 
             if ($account['status'] != 'READY') {
                 nlog("Nordigen account '{$account_id}' is not ready (status={$account['status']})");
-
-                return false;
             }
 
-            return true;
+            return $account;
+
         } catch (\Exception $e) {
 
             nlog("Nordigen:: AccountActiveStatus:: {$e->getMessage()} {$e->getCode()}");
 
             if (strpos($e->getMessage(), 'Invalid Account ID') !== false) {
-                return false;
+                ['status' => 'Invalid Account ID'];
             }
 
-            throw $e;
+            return ['status' => 'EXPIRED'];
         }
     }
 

app/Http/Controllers/BankIntegrationController.php

@@ -291,7 +291,7 @@ class BankIntegrationController extends BaseController
 
                 $nordigen->disabledAccountEmail($bank_integration);
                 return;
-            } elseif (!$is_account_active || !$account || isset($account['requisition'])) {
+            } elseif ($is_account_active['status'] != 'READY' || !$account || isset($account['requisition'])) {
                 $bank_integration->disabled_upstream = true;
                 $bank_integration->save();
 

app/Http/Requests/GoCardless/OAuthConnectRequest.php

@@ -21,7 +21,7 @@ class OAuthConnectRequest extends FormRequest
 {
     public function authorize(): bool
     {
-        return true;
+        return Cache::has($this->token);
     }
 
     /**

app/Http/Requests/Yodlee/YodleeAuthRequest.php

@@ -32,7 +32,7 @@ class YodleeAuthRequest extends Request
      */
     public function authorize()
     {
-        return true;
+        return Cache::has($this->state ?? $this->token);
     }
 
     /**

app/PaymentDrivers/PayPal/PayPalWebhook.php

@@ -315,9 +315,8 @@ class PayPalWebhook implements ShouldQueue
     {
         // nlog($this->headers);
 
-        if(!isset($this->headers['paypal-auth-algo'][0])){
+        if(!isset($this->headers['paypal-auth-algo'][0]))
-          nlog(array_merge(["no paypal-auth-algo"], $this->webhook_request));
+          return false;
-        }
 
         $request = [
             'auth_algo' => $this->headers['paypal-auth-algo'][0],