Skip to content

Commit ac4b5fe

Browse files
committed
Move password exception to its own file
1 parent fbe6391 commit ac4b5fe

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
namespace ProcessMaker\Exception;
4+
5+
use Exception;
6+
7+
class ImportPasswordException extends Exception
8+
{
9+
}

‎ProcessMaker/Http/Controllers/Api/ImportController.php‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44

55
use Illuminate\Http\JsonResponse;
66
use Illuminate\Http\Request;
7+
use ProcessMaker\Exception\ImportPasswordException;
78
use ProcessMaker\Http\Controllers\Controller;
89
use ProcessMaker\ImportExport\ExportEncrypted;
910
use ProcessMaker\ImportExport\Importer;
1011
use ProcessMaker\ImportExport\Options;
1112
use ProcessMaker\Models\Process;
1213

13-
class PasswordException extends \Exception
14-
{
15-
}
16-
1714
class ImportController extends Controller
1815
{
1916
/**
@@ -25,7 +22,7 @@ public function preview(Request $request): JsonResponse
2522

2623
try {
2724
$payload = $this->handlePasswordDecrypt($request, $payload);
28-
} catch (PasswordException $e) {
25+
} catch (ImportPasswordException $e) {
2926
return response()->json(['error' => $e->getMessage()], 400);
3027
}
3128

@@ -46,7 +43,7 @@ public function import(Request $request): JsonResponse
4643

4744
try {
4845
$payload = $this->handlePasswordDecrypt($request, $payload);
49-
} catch (PasswordException $e) {
46+
} catch (ImportPasswordException $e) {
5047
return response()->json(['error' => $e->getMessage()], 400);
5148
}
5249
$options = file_get_contents(utf8_decode($request->file('options')));
@@ -66,13 +63,13 @@ private function handlePasswordDecrypt(Request $request, array $payload)
6663
if (isset($payload['encrypted']) && $payload['encrypted']) {
6764
$password = $request->input('password');
6865
if (!$password) {
69-
throw new PasswordException('password required');
66+
throw new ImportPasswordException('password required');
7067
}
7168

7269
$payload = (new ExportEncrypted($password))->decrypt($payload);
7370

7471
if ($payload['export'] === null) {
75-
throw new PasswordException('incorrect password');
72+
throw new ImportPasswordException('incorrect password');
7673
}
7774
}
7875

0 commit comments

Comments
 (0)