Skip to content

Commit 6a991b2

Browse files
committed
Handle invalid payload exception on decrypt
1 parent 79cf70e commit 6a991b2

File tree

7 files changed

+49
-7
lines changed

7 files changed

+49
-7
lines changed

src/Http/Controllers/DealController.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace VentureDrake\LaravelCrm\Http\Controllers;
44

55
use Carbon\Carbon;
6+
use Illuminate\Contracts\Encryption\DecryptException;
67
use Illuminate\Http\Request;
78
use Illuminate\Support\Str;
89
use VentureDrake\LaravelCrm\Http\Requests\StoreDealRequest;
@@ -311,7 +312,12 @@ public function search(Request $request)
311312
$field = explode('.', $field);
312313

313314
if(config('laravel-crm.encrypt_db_fields')) {
314-
$relatedField = decrypt($record->{$field[1]});
315+
try {
316+
$relatedField = decrypt($record->{$field[1]});
317+
} catch (DecryptException $e) {
318+
}
319+
320+
$relatedField = $record->{$field[1]};
315321
} else {
316322
$relatedField = $record->{$field[1]};
317323
}

src/Http/Controllers/DeliveryController.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace VentureDrake\LaravelCrm\Http\Controllers;
44

55
use Barryvdh\DomPDF\Facade\Pdf;
6+
use Illuminate\Contracts\Encryption\DecryptException;
67
use Illuminate\Http\Request;
78
use Illuminate\Support\Str;
89
use VentureDrake\LaravelCrm\Http\Requests\StoreDeliveryRequest;
@@ -242,7 +243,12 @@ public function search(Request $request)
242243
$field = explode('.', $field);
243244

244245
if(config('laravel-crm.encrypt_db_fields')) {
245-
$relatedField = decrypt($record->{$field[1]});
246+
try {
247+
$relatedField = decrypt($record->{$field[1]});
248+
} catch (DecryptException $e) {
249+
}
250+
251+
$relatedField = $record->{$field[1]};
246252
} else {
247253
$relatedField = $record->{$field[1]};
248254
}

src/Http/Controllers/InvoiceController.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace VentureDrake\LaravelCrm\Http\Controllers;
44

55
use Barryvdh\DomPDF\Facade\Pdf;
6+
use Illuminate\Contracts\Encryption\DecryptException;
67
use Illuminate\Http\Request;
78
use Illuminate\Support\Str;
89
use VentureDrake\LaravelCrm\Http\Requests\StoreInvoiceRequest;
@@ -256,7 +257,12 @@ public function search(Request $request)
256257
$field = explode('.', $field);
257258

258259
if(config('laravel-crm.encrypt_db_fields')) {
259-
$relatedField = decrypt($record->{$field[1]});
260+
try {
261+
$relatedField = decrypt($record->{$field[1]});
262+
} catch (DecryptException $e) {
263+
}
264+
265+
$relatedField = $record->{$field[1]};
260266
} else {
261267
$relatedField = $record->{$field[1]};
262268
}

src/Http/Controllers/LeadController.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace VentureDrake\LaravelCrm\Http\Controllers;
44

55
use Carbon\Carbon;
6+
use Illuminate\Contracts\Encryption\DecryptException;
67
use Illuminate\Http\Request;
78
use Illuminate\Support\Str;
89
use VentureDrake\LaravelCrm\Http\Requests\StoreLeadRequest;
@@ -307,7 +308,12 @@ public function search(Request $request)
307308
$field = explode('.', $field);
308309

309310
if(config('laravel-crm.encrypt_db_fields')) {
310-
$relatedField = decrypt($record->{$field[1]});
311+
try {
312+
$relatedField = decrypt($record->{$field[1]});
313+
} catch (DecryptException $e) {
314+
}
315+
316+
$relatedField = $record->{$field[1]};
311317
} else {
312318
$relatedField = $record->{$field[1]};
313319
}

src/Http/Controllers/OrderController.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace VentureDrake\LaravelCrm\Http\Controllers;
44

55
use Barryvdh\DomPDF\Facade\Pdf;
6+
use Illuminate\Contracts\Encryption\DecryptException;
67
use Illuminate\Http\Request;
78
use Illuminate\Support\Str;
89
use Ramsey\Uuid\Uuid;
@@ -346,7 +347,12 @@ public function search(Request $request)
346347
$field = explode('.', $field);
347348

348349
if(config('laravel-crm.encrypt_db_fields')) {
349-
$relatedField = decrypt($record->{$field[1]});
350+
try {
351+
$relatedField = decrypt($record->{$field[1]});
352+
} catch (DecryptException $e) {
353+
}
354+
355+
$relatedField = $record->{$field[1]};
350356
} else {
351357
$relatedField = $record->{$field[1]};
352358
}

src/Http/Controllers/PurchaseOrderController.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace VentureDrake\LaravelCrm\Http\Controllers;
44

55
use Barryvdh\DomPDF\Facade\Pdf;
6+
use Illuminate\Contracts\Encryption\DecryptException;
67
use Illuminate\Http\Request;
78
use Illuminate\Support\Str;
89
use VentureDrake\LaravelCrm\Http\Requests\StorePurchaseOrderRequest;
@@ -322,7 +323,12 @@ public function search(Request $request)
322323
$field = explode('.', $field);
323324

324325
if(config('laravel-crm.encrypt_db_fields')) {
325-
$relatedField = decrypt($record->{$field[1]});
326+
try {
327+
$relatedField = decrypt($record->{$field[1]});
328+
} catch (DecryptException $e) {
329+
}
330+
331+
$relatedField = $record->{$field[1]};
326332
} else {
327333
$relatedField = $record->{$field[1]};
328334
}

src/Http/Controllers/QuoteController.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Barryvdh\DomPDF\Facade\Pdf;
66
use Carbon\Carbon;
7+
use Illuminate\Contracts\Encryption\DecryptException;
78
use Illuminate\Http\Request;
89
use Illuminate\Support\Str;
910
use VentureDrake\LaravelCrm\Http\Requests\StoreQuoteRequest;
@@ -332,7 +333,12 @@ public function search(Request $request)
332333
$field = explode('.', $field);
333334

334335
if(config('laravel-crm.encrypt_db_fields')) {
335-
$relatedField = decrypt($record->{$field[1]});
336+
try {
337+
$relatedField = decrypt($record->{$field[1]});
338+
} catch (DecryptException $e) {
339+
}
340+
341+
$relatedField = $record->{$field[1]};
336342
} else {
337343
$relatedField = $record->{$field[1]};
338344
}

0 commit comments

Comments
 (0)