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

Feature/maintenance update and bug fixes

Author: donaldp

Auth/MustAuthenticateUser.php

@@ -11,7 +11,6 @@
 use Modulus\Utility\Notification;
 use Modulus\Framework\Auth\RedirectsUsers;
 use Modulus\Framework\Auth\Notifications\MustLogin;
-use Modulus\Framework\Auth\Requests\EmailLoginRequest;
 
 trait MustAuthenticateUser
 {
@@ -73,12 +72,17 @@ public function showMagicLinkPage()
   /**
    * Login with rmail
    *
-   * @param EmailLoginRequest $request
+   * @param Request $request
    * @return void
    */
-  public function loginWithEmail(EmailLoginRequest $request)
+  public function loginWithEmail(Request $request)
   {
+    $request->rules = [
+      'email' => 'required'
+    ];
+
     $request->validate();
+
     $provider = $this->provider;
 
     $info = MagicLink::notify($request, $provider, $this->musk());

Auth/Requests/EmailLoginRequest.php

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Donald Pakkies
+Copyright (c) 2019 Donald Pakkies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -13,9 +13,11 @@ class Load
    * Load plugins
    *
    * @param bool $isConsole
+   * @param bool $start
+   * @param mixed $response
    * @return void
    */
-  public static function plugins(bool $isConsole)
+  public static function plugins(bool $isConsole, bool $start = true, $response = null)
   {
     $plugins = config('app.plugins');
 
@@ -39,8 +41,14 @@ public static function plugins(bool $isConsole)
 
         if (!Validate::check($extension, $class_info)) return;
 
-        $extension->instance($extendable, $DIR);
-        $extension->boot($extendable);
+        if ($start) {
+          $extension->instance($extendable, $DIR);
+          $extension->boot($extendable);
+        } else {
+          if ($extension->exit($response)) {
+            continue;
+          }
+        }
       }
     }
   }

Plugin/Load.php

@@ -1,3 +1,22 @@
 # Modulus Core
 
-This package is the core component of Modulus.
+This package is the core component of Modulus.
+
+Install
+-------
+
+This package is automatically installed with the Modulus Framework.
+
+```
+composer require modulusphp/framework
+```
+
+Security
+-------
+
+If you discover any security related issues, please email donaldpakkies@gmail.com instead of using the issue tracker.
+
+License
+-------
+
+The MIT License (MIT). Please see [License File](LICENSE) for more information.

README.md

@@ -21,6 +21,13 @@ public static function make(Upstart $app)
      */
     $response = $app->getResponse();
 
+    /**
+     * Convert to array
+     */
+    if (method_exists($response, 'toArray')) {
+      $response = $response->toArray();
+    }
+
     /**
      * Create a rest response
      */

Response.php

@@ -39,6 +39,13 @@ class Upstart
    */
   protected $request;
 
+  /**
+   * $service
+   *
+   * @var \App\Resolvers\AppServiceResolver
+   */
+  protected $service;
+
   /**
    * $response
    *
@@ -113,10 +120,15 @@ class_alias($class, $alias);
    */
   private function startApp(bool $isConsole)
   {
+    /**
+     * Create a new instance of the service resolver
+     */
+    $this->service = new AppServiceResolver;
+
     /**
      * Start the App Service Resolver
      */
-    (new AppServiceResolver)->start(Application::prototype($isConsole));
+    $this->service->start(Application::prototype($isConsole));
 
     /**
      * Load framework plugins
@@ -141,6 +153,17 @@ private function startRouter(bool $isConsole)
     $this->route($isConsole);
   }
 
+  /**
+   * Undocumented function
+   *
+   * @param mixed $response
+   * @return bool
+   */
+  public function parseResponse($response) : bool
+  {
+    return $this->service->onExit($response);
+  }
+
   /**
    * Set application request
    *

Upstart.php

@@ -46,4 +46,26 @@ public function start(?array $args = null)
 
     $this->boot($extendable);
   }
+
+  /**
+   * Handle on exit response
+   *
+   * @param mixed $response
+   * @return bool
+   */
+  public function onExit($response) : bool
+  {
+    return $this->exit($response);
+  }
+
+  /**
+   * Handle application response on exit
+   *
+   * @param mixed $response
+   * @return bool
+   */
+  protected function exit($response) : bool
+  {
+    return false;
+  }
 }

Upstart/Service.php

@@ -1,7 +1,7 @@
 {
   "name": "modulusphp/framework",
   "description": "Framework component for Modulus",
-  "version": "1.9.9.3",
+  "version": "1.9.9.4",
   "license": "MIT",
   "type": "package",
   "authors": [{