send signed url istead of url with token

diff --git a/app/MailgunValidation.php b/app/MailgunValidation.php
index 9e71cbdcf44213999f70ac7ca8d340f978fa2860..1c39087cc9e179ba5bfcc752633acf55a6514aab 100644 (file)
--- a/app/MailgunValidation.php
+++ b/app/MailgunValidation.php
@@ -6,7 +6,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Arr;
 use Laravel\Nova\Fields\ActionFields;
-use Mailgun\Mailgun;
 
 /**
  * Class MailgunValidation
@@ -49,7 +48,7 @@ class MailgunValidation extends Model
         'tld_risk' => "TLD risqué",
         'mailbox_does_not_exist' => "Boite mail inexistante",
         'mailbox_is_disposable_address' => "Boite mail jetable",
-        'mailbox_is_role_address' => "BOite mail de rôle",
+        'mailbox_is_role_address' => "Boite mail de rôle",
     ];
 
 

diff --git a/app/PdfFile.php b/app/PdfFile.php
index b323d8fd22cef53cd6c8191b5b3613055b2532f6..24dce2f2589af3b951e3c7f1453d20ba8ed416d5 100644 (file)
--- a/app/PdfFile.php
+++ b/app/PdfFile.php
@@ -434,9 +434,9 @@ class PdfFile extends TwillModel implements Sortable
 //        if($user->receives_pdf) {
 //            return $this->getDownloadUrl();
 //        }
-        return ($user->type === User::TYPE_DISCOVER && !$user->reg_complete) ?
-            $this->getSignedUrl($user) :
-            $this->getUrlWithToken($user);
+        return ($user->reg_complete || $user->type === User::TYPE_SUBSCRIBER) ?
+            $this->getUrlWithToken($user) :
+            $this->getSignedUrl($user);
 
     }