From fb8e9897c4d737fed0d8529492d557b8f6a18f09 Mon Sep 17 00:00:00 2001
From: Franck DAKIA <dakiafranck@gmail.com>
Date: Tue, 19 May 2020 13:54:12 +0000
Subject: [PATCH] feat: refonte app structure

---
 .../Controller.php                            |   3 +-
 .../WelcomeController.php                     |   4 +-
 app/{ => Exceptions}/ErrorHandle.php          |   2 +-
 app/Kernel.php                                |  16 +--
 .../Authenticate.php                          |   3 +-
 .../ClientCsrfMiddleware.php                  |   2 +-
 app/{Middleware => Middlewares}/Guest.php     |   2 +-
 app/{Model => Models}/User.php                |   2 +-
 bow                                           | 110 +++++++++---------
 config/app.php                                |   7 +-
 config/auth.php                               |  21 +++-
 routes/app.php                                |   8 +-
 12 files changed, 97 insertions(+), 83 deletions(-)
 rename app/{Controller => Controllers}/Controller.php (98%)
 rename app/{Controller => Controllers}/WelcomeController.php (82%)
 rename app/{ => Exceptions}/ErrorHandle.php (98%)
 rename app/{Middleware => Middlewares}/Authenticate.php (90%)
 rename app/{Middleware => Middlewares}/ClientCsrfMiddleware.php (89%)
 rename app/{Middleware => Middlewares}/Guest.php (95%)
 rename app/{Model => Models}/User.php (91%)

diff --git a/app/Controller/Controller.php b/app/Controllers/Controller.php
similarity index 98%
rename from app/Controller/Controller.php
rename to app/Controllers/Controller.php
index 720d8725..4b66ce50 100644
--- a/app/Controller/Controller.php
+++ b/app/Controllers/Controller.php
@@ -1,5 +1,6 @@
 <?php
-namespace App\Controller;
+
+namespace App\Controllers;
 
 use Bow\Http\Request;
 use Bow\Configuration\Loader as Config;
diff --git a/app/Controller/WelcomeController.php b/app/Controllers/WelcomeController.php
similarity index 82%
rename from app/Controller/WelcomeController.php
rename to app/Controllers/WelcomeController.php
index c6e07721..ce9b1f53 100644
--- a/app/Controller/WelcomeController.php
+++ b/app/Controllers/WelcomeController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Controller;
+namespace App\Controllers;
 
-use App\Controller\Controller;
+use App\Controllers\Controller;
 use Bow\Http\Request;
 
 class WelcomeController extends Controller
diff --git a/app/ErrorHandle.php b/app/Exceptions/ErrorHandle.php
similarity index 98%
rename from app/ErrorHandle.php
rename to app/Exceptions/ErrorHandle.php
index 185bfe3a..c3d9a080 100644
--- a/app/ErrorHandle.php
+++ b/app/Exceptions/ErrorHandle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Exceptions;
 
 use Bow\Database\Exception\NotFoundException as ModelNotFoundException;
 use Bow\Http\Exception\ResponseException as HttpResponseException;
diff --git a/app/Kernel.php b/app/Kernel.php
index 471e8327..fcdb9c4f 100644
--- a/app/Kernel.php
+++ b/app/Kernel.php
@@ -14,11 +14,11 @@ class Kernel extends ApplicationLoader
     public function namespaces()
     {
         return [
-            'controller' => 'App\\Controller',
-            'middleware' => 'App\\Middleware',
-            'configuration' => 'App\\Configuration',
-            'validation' => 'App\\Validation',
-            'model' => 'App\\Model',
+            'controller' => 'App\\Controllers',
+            'middleware' => 'App\\Middlewares',
+            'configuration' => 'App\\Configurations',
+            'validation' => 'App\\Validations',
+            'model' => 'App\\Models',
         ];
     }
 
@@ -30,9 +30,9 @@ public function namespaces()
     public function middlewares()
     {
         return [
-            'csrf' => \App\Middleware\ClientCsrfMiddleware::class,
-            'auth' => \App\Middleware\Authenticate::class,
-            'guest' => \App\Middleware\Guest::class
+            'csrf' => \App\Middlewares\ClientCsrfMiddleware::class,
+            'auth' => \App\Middlewares\Authenticate::class,
+            'guest' => \App\Middlewares\Guest::class
         ];
     }
 
diff --git a/app/Middleware/Authenticate.php b/app/Middlewares/Authenticate.php
similarity index 90%
rename from app/Middleware/Authenticate.php
rename to app/Middlewares/Authenticate.php
index 751bb0f9..aad2baa0 100644
--- a/app/Middleware/Authenticate.php
+++ b/app/Middlewares/Authenticate.php
@@ -1,5 +1,6 @@
 <?php
-namespace App\Middleware;
+
+namespace App\Middlewares;
 
 use Bow\Middleware\AuthMiddleware;
 
diff --git a/app/Middleware/ClientCsrfMiddleware.php b/app/Middlewares/ClientCsrfMiddleware.php
similarity index 89%
rename from app/Middleware/ClientCsrfMiddleware.php
rename to app/Middlewares/ClientCsrfMiddleware.php
index d74424b7..83219ee9 100644
--- a/app/Middleware/ClientCsrfMiddleware.php
+++ b/app/Middlewares/ClientCsrfMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Middleware;
+namespace App\Middlewares;
 
 use Bow\Http\Request;
 use Bow\Middleware\CsrfMiddleware;
diff --git a/app/Middleware/Guest.php b/app/Middlewares/Guest.php
similarity index 95%
rename from app/Middleware/Guest.php
rename to app/Middlewares/Guest.php
index 272357ee..1642383f 100644
--- a/app/Middleware/Guest.php
+++ b/app/Middlewares/Guest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Middleware;
+namespace App\Middlewares;
 
 use Bow\Auth\Auth;
 use Bow\Http\Request;
diff --git a/app/Model/User.php b/app/Models/User.php
similarity index 91%
rename from app/Model/User.php
rename to app/Models/User.php
index cd58798a..e7880a51 100644
--- a/app/Model/User.php
+++ b/app/Models/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model;
+namespace App\Models;
 
 use Bow\Auth\Authentication as Model;
 
diff --git a/bow b/bow
index 473c89de..035b09fb 100755
--- a/bow
+++ b/bow
@@ -1,55 +1,55 @@
-#!/usr/bin/env php
-<?php
-
-require __DIR__."/vendor/autoload.php";
-
-/**
- * Make kernel instance
- */
-$kernel = \App\Kernel::configure(__DIR__.'/config');
-
-/**
- * Create command instance and set filename
- */
-$setting = new \Bow\Console\Setting(__DIR__);
-$setting->setNamespaces($kernel->namespaces());
-
-/**
- * Change preset destination
- */
-$setting->setModelDirectory(__DIR__.'/app/Model');
-$setting->setValidationDirectory(__DIR__.'/app/Validation');
-$setting->setPackageDirectory(__DIR__.'/app/Configuration');
-$setting->setControllerDirectory(__DIR__.'/app/Controller');
-$setting->setMiddlewareDirectory(__DIR__.'/app/Middleware');
-$setting->setMigrationDirectory(__DIR__.'/migrations');
-$setting->setSeederDirectory(__DIR__.'/seeders');
-$setting->setComponentDirectory(__DIR__.'/frontend');
-$setting->setConfigDirectory(__DIR__.'/config');
-$setting->setPublicDirectory(__DIR__.'/public');
-
-/**
- * Defines the local server starter
- */
-$setting->setServerFilename(__DIR__.'/server.php');
-$setting->setVarDirectory(__DIR__.'/var');
-
-/**
- * Create console instance
- */
-$console = new \Bow\Console\Console($setting);
-
-/**
- * Bind kernel to console
- */
-$console->bind($kernel);
-
-/**
- * Load the custom command application
- */
-require __DIR__.'/routes/console.php';
-
-/**
- * Start console
- */
-$console->run();
+#!/usr/bin/env php
+<?php
+
+require __DIR__."/vendor/autoload.php";
+
+/**
+ * Make kernel instance
+ */
+$kernel = \App\Kernel::configure(__DIR__.'/config');
+
+/**
+ * Create command instance and set filename
+ */
+$setting = new \Bow\Console\Setting(__DIR__);
+$setting->setNamespaces($kernel->namespaces());
+
+/**
+ * Change preset destination
+ */
+$setting->setModelDirectory(__DIR__.'/app/Models');
+$setting->setValidationDirectory(__DIR__.'/app/Validations');
+$setting->setPackageDirectory(__DIR__.'/app/Configurations');
+$setting->setControllerDirectory(__DIR__.'/app/Controllers');
+$setting->setMiddlewareDirectory(__DIR__.'/app/Middlewares');
+$setting->setMigrationDirectory(__DIR__.'/migrations');
+$setting->setSeederDirectory(__DIR__.'/seeders');
+$setting->setComponentDirectory(__DIR__.'/frontend');
+$setting->setConfigDirectory(__DIR__.'/config');
+$setting->setPublicDirectory(__DIR__.'/public');
+
+/**
+ * Defines the local server starter
+ */
+$setting->setServerFilename(__DIR__.'/server.php');
+$setting->setVarDirectory(__DIR__.'/var');
+
+/**
+ * Create console instance
+ */
+$console = new \Bow\Console\Console($setting);
+
+/**
+ * Bind kernel to console
+ */
+$console->bind($kernel);
+
+/**
+ * Load the custom command application
+ */
+require __DIR__.'/routes/console.php';
+
+/**
+ * Start console
+ */
+$console->run();
diff --git a/config/app.php b/config/app.php
index 87fff921..dbfcc7d7 100644
--- a/config/app.php
+++ b/config/app.php
@@ -53,5 +53,10 @@
      *
      * development | production
      */
-    'debug' => app_env('APP_ENV', 'development')
+    'debug' => app_env('APP_ENV', 'development'),
+
+    /**
+     * The app error handler
+     */
+    "error_handle" => \App\Exceptions\ErrorHandle::class
 ];
diff --git a/config/auth.php b/config/auth.php
index 0a157ff6..c4781d2e 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -10,8 +10,8 @@
      * Default authentication branch
      */
     "web" => [
-        "type" => "jwt",
-        'model' => App\Model\User::class,
+        "type" => "session",
+        'model' => App\Models\User::class,
         'credentials' => [
             'username' => 'email',
             'password' => 'password'
@@ -23,10 +23,23 @@
      */
     "admin" => [
         'type' => "session",
-        "model" => App\Model\User::class,
+        "model" => App\Models\User::class,
         'credentials' => [
             'username' => 'email',
             'password' => 'password'
         ]
-    ]
+    ],
+
+    /**
+     * Default authentication branch
+     */
+    "api" => [
+        "type" => "jwt",
+        'model' => App\Models\User::class,
+        'credentials' => [
+            'username' => 'email',
+            'password' => 'password'
+        ]
+    ],
+
 ];
diff --git a/routes/app.php b/routes/app.php
index 59f55d49..c36822e9 100644
--- a/routes/app.php
+++ b/routes/app.php
@@ -1,9 +1,3 @@
 <?php
 
-/**
- * Just tell Bow which URIs he should answer and give him the
- * controller to call when this URL is requested.
- * Follow the following example, it gives you an overview on how it works in general.
- */
-$app->get('/', 'WelcomeController')->middleware('auth');
-$app->get('/login', 'WelcomeController')->middleware('guest');
+$app->get('/', 'WelcomeController');