Merge pull request #37 from modulusphp/feature/maintenance-update-and-bug-fixes

Feature/maintenance update and bug fixes

Author: donaldp

Controller.php

@@ -59,17 +59,4 @@ public function search(string $model, array $fields) : ?array
 
     return $response;
   }
-
-  /**
-   * Validate request
-   *
-   * @param Request $request
-   * @param array $rules
-   * @return void
-   */
-  public function validate(Request $request, array $rules = [])
-  {
-    $request->rules = $rules;
-    return $request->validate();
-  }
 }

Controllers/Auth/ForgotPasswordController.php

@@ -45,7 +45,7 @@ protected function sendPasswordResetNotification(string $email, string $token)
     return Notification::make(new MustResetPassword($email, $token));
   }
 
-   /**
+  /**
    * Redirect user after sending the reset password notification
    *
    * @return void
@@ -163,10 +163,9 @@ public function verify(string $token, string $provider, string $musked)
         if (Session::key('_reset') == $userToken->token) {
           return config("auth.provider.{$provider}.model")::where($musked, $userEmail)->first();
         }
-        else {
-          Session::delete('_reset');
-          return false;
-        }
+
+        Session::delete('_reset');
+        return false;
       }
     }
 

Mocks/ValidatesRequests.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Modulus\Http\Mocks;
+
+use Modulus\Http\Rest;
+use Modulus\Http\Request;
+use Modulus\Http\Redirect;
+use JeffOchoa\ValidatorFactory;
+use Illuminate\Validation\Validator;
+
+trait ValidatesRequests
+{
+  /**
+   * Validates requests and redirect or return rest response
+   *
+   * @param \Modulus\Http\Request $request
+   * @param array $rules
+   * @param array $messages
+   * @param array $customAttributes
+   * @return mixed
+   */
+  public function validateWithHttp(Request $request, array $rules, array $messages = [], array $customAttributes = [])
+  {
+    $response = (new ValidatorFactory)->make($request->all(), $rules, $messages, $customAttributes);
+
+    if (count($response->errors()) > 0 || $response->fails()) {
+
+      if (
+        $request->headers->has('Content-Type') &&
+        str_contains(strtolower($request->headers->get('Content-Type')), 'json')
+      ) {
+        cancel(Rest::response()->json($response->errors()->toArray(), 422));
+      }
+
+      $url = ($request->server->has('HTTPS') ? 'https://' : 'http://') . $request->server->get('HTTP_HOST');
+
+      if (
+        $request->server->has('HTTP_ORIGIN') &&
+        $request->server->get('HTTP_ORIGIN') == $url
+      ) {
+        $referer = $request->headers->get('Referer');
+
+        return Redirect::to($referer)
+                  ->with('validation.errors', $response->errors())
+                  ->with('form.old', $request->all())
+                  ->code(302)
+                  ->send();
+      }
+
+      cancel(Rest::response()->json($response->errors()->toArray(), 422));
+    }
+
+    return $response;
+  }
+
+  /**
+   * Validates requests and return factory
+   *
+   * @param \Modulus\Http\Request $request
+   * @param array $rules
+   * @param array $messages
+   * @param array $customAttributes
+   * @return Validator
+   */
+  public function validate(Request $request, array $rules, array $messages = [], array $customAttributes = []) : Validator
+  {
+    return (new ValidatorFactory)->make($request->all(), $rules, $messages, $customAttributes);
+  }
+}

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "modulusphp/http",
   "description": "Http component for Modulus",
-  "version": "1.9.6.1",
+  "version": "1.9.6.2",
   "license": "MIT",
   "type": "package",
   "authors": [{