Changeset bd9e8e3 for app/Http/Requests/Dashboard

Timestamp:

10/17/21 20:28:35 (3 years ago)

Author:

Berat Kjufliju <kufliju@…>

Branches:

develop, master

Children:

e6c1f87

Parents:

d795fa6

Message:

added arch_id validation

Location:

app/Http/Requests/Dashboard

Files:

• DocumentRequest.php (modified) (3 diffs)
• UsernameSettingsRequest.php (modified) (2 diffs)

app/Http/Requests/Dashboard/DocumentRequest.php

@@ -16 +16 @@
     public function authorize()
     {
-        if($this->isMethod("patch")) {
+        if ($this->isMethod("patch")) {
             $document = Document::find($this->route("id"));
             return auth()->user()->hasPermission("edit_all_documents") || ($document->user->id == auth()->user()->id);
@@ -33 +33 @@
 
         $rules = [
-            "arch_id" => "required|min:10|max:255",
+            "arch_id" => [
+                "required",
+                function($attribute, $value, $fail) {
+                    $arch_id = $this->request->get('arch_id');
+                    $deptId = explode('/', $arch_id)[0];
+                    if ($deptId !== $this->request->get('department')) {
+                        $fail("Dept id error");
+                    }
+                }
+            ],
             "name" => "required|min:10|max:255",
             "department" => "required|integer|exists:departments,id",
@@ -39 +48 @@
         ];
 
-        if($this->isMethod("patch")) {
+        if ($this->isMethod("patch")) {
             $fileRules = [
                 "file_item.*" => "mimes:jpg,jpeg,png|max:4096"
-                ];
+            ];
         } else {
             $fileRules = [

app/Http/Requests/Dashboard/UsernameSettingsRequest.php

@@ -4 +4 @@
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Validation\ValidationException;
 
 class UsernameSettingsRequest extends FormRequest
@@ -28 +30 @@
         ];
     }
+
+    protected function failedValidation(Validator $validator)
+    {
+        $response = redirect()
+            ->route('dashboard.settings.index')
+            ->with(['active_tab' => 'security'])
+            ->withErrors($validator);
+
+        throw (new ValidationException($validator, $response))
+            ->errorBag($this->errorBag)
+            ->redirectTo($this->getRedirectUrl());
+    }
 }