fixed api token

akaunting · Nov 1, 2017 · dfac921 · dfac921
1 parent d67b5e7
commit dfac921
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 47 deletions.
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -57,4 +57,18 @@ public function countRelationships($model, $relationships)
 
         return $counter;
     }
+
+    /**
+     * Check for api token and redirect if empty.
+     *
+     * @return mixed
+     */
+    public function checkApiToken()
+    {
+        if (setting('general.api_token')) {
+            return;
+        }
+
+        redirect('apps/token/create')->send();
+    }
 }
diff --git a/app/Http/Controllers/Modules/Home.php b/app/Http/Controllers/Modules/Home.php
@@ -10,27 +10,15 @@ class Home extends Controller
 {
     use Modules;
 
-    /**
-     * Instantiate a new controller instance.
-     *
-     * @param  Route  $route
-     */
-    public function __construct(Route $route)
-    {
-        if (!setting('general.api_token')) {
-            return redirect('apps/token/create')->send();
-        }
-
-        parent::__construct($route);
-    }
-
     /**
      * Display a listing of the resource.
      *
      * @return Response
      */
     public function index()
     {
+        $this->checkApiToken();
+
         $paid = $this->getPaidModules();
         $new = $this->getNewModules();
         $free = $this->getFreeModules();

diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php
@@ -15,20 +15,6 @@ class Item extends Controller
 {
     use Modules;
 
-    /**
-     * Instantiate a new controller instance.
-     *
-     * @param  Route  $route
-     */
-    public function __construct(Route $route)
-    {
-        if (!setting('general.api_token')) {
-            return redirect('apps/token/create')->send();
-        }
-
-        parent::__construct($route);
-    }
-
     /**
      * Show the form for viewing the specified resource.
      *
@@ -38,6 +24,8 @@ public function __construct(Route $route)
      */
     public function show($alias)
     {
+        $this->checkApiToken();
+
         $installed = false;
         $enable = false;
 
@@ -59,12 +47,14 @@ public function show($alias)
     /**
      * Show the form for viewing the specified resource.
      *
-     * @param  $path
+     * @param  $request
      *
      * @return Response
      */
     public function steps(Request $request)
     {
+        $this->checkApiToken();
+
         $json = array();
         $json['step'] = array();
 
@@ -95,12 +85,14 @@ public function steps(Request $request)
     /**
      * Show the form for viewing the specified resource.
      *
-     * @param  $path
+     * @param  $request
      *
      * @return Response
      */
     public function download(Request $request)
     {
+        $this->checkApiToken();
+
         $path = $request['path'];
 
         $version = $request['version'];
@@ -115,12 +107,14 @@ public function download(Request $request)
     /**
      * Show the form for viewing the specified resource.
      *
-     * @param  $path
+     * @param  $request
      *
      * @return Response
      */
     public function unzip(Request $request)
     {
+        $this->checkApiToken();
+
         $path = $request['path'];
 
         $json = $this->unzipModule($path);
@@ -137,6 +131,8 @@ public function unzip(Request $request)
      */
     public function install(Request $request)
     {
+        $this->checkApiToken();
+
         $path = $request['path'];
 
         $json = $this->installModule($path);
@@ -154,6 +150,8 @@ public function install(Request $request)
 
     public function uninstall($alias)
     {
+        $this->checkApiToken();
+
         $json = $this->uninstallModule($alias);
 
         $module = Module::where('alias', $alias)->first();
@@ -179,6 +177,8 @@ public function uninstall($alias)
 
     public function update($alias)
     {
+        $this->checkApiToken();
+
         $json = $this->updateModule($alias);
 
         $module = Module::where('alias', $alias)->first();
@@ -202,6 +202,8 @@ public function update($alias)
 
     public function enable($alias)
     {
+        $this->checkApiToken();
+
         $json = $this->enableModule($alias);
 
         $module = Module::where('alias', $alias)->first();
@@ -229,6 +231,8 @@ public function enable($alias)
 
     public function disable($alias)
     {
+        $this->checkApiToken();
+
         $json = $this->disableModule($alias);
 
         $module = Module::where('alias', $alias)->first();

diff --git a/app/Http/Controllers/Modules/Tiles.php b/app/Http/Controllers/Modules/Tiles.php
@@ -10,20 +10,6 @@ class Tiles extends Controller
 {
     use Modules;
 
-    /**
-     * Instantiate a new controller instance.
-     *
-     * @param  Route  $route
-     */
-    public function __construct(Route $route)
-    {
-        if (!setting('general.api_token')) {
-            return redirect('apps/token/create')->send();
-        }
-
-        parent::__construct($route);
-    }
-
     /**
      * Show the form for viewing the specified resource.
      *
@@ -33,6 +19,8 @@ public function __construct(Route $route)
      */
     public function category($alias)
     {
+        $this->checkApiToken();
+
         $data = $this->getModulesByCategory($alias);
 
         $title = $data->category->name;
@@ -48,6 +36,8 @@ public function category($alias)
      */
     public function paid()
     {
+        $this->checkApiToken();
+
         $title = trans('modules.top_paid');
         $modules = $this->getPaidModules();
 
@@ -61,6 +51,8 @@ public function paid()
      */
     public function new()
     {
+        $this->checkApiToken();
+
         $title = trans('modules.new');
         $modules = $this->getNewModules();
 
@@ -74,6 +66,8 @@ public function new()
      */
     public function free()
     {
+        $this->checkApiToken();
+
         $title = trans('modules.top_free');
         $modules = $this->getFreeModules();
 

diff --git a/app/Http/Middleware/LoadSettings.php b/app/Http/Middleware/LoadSettings.php
@@ -23,6 +23,7 @@ public function handle($request, Closure $next)
 
         // Set the active company settings
         setting()->setExtraColumns(['company_id' => $company_id]);
+        setting()->load(true);
 
         // Timezone
         config(['app.timezone' => setting('general.timezone', 'UTC')]);

diff --git a/app/Http/ViewComposers/Modules.php b/app/Http/ViewComposers/Modules.php
@@ -25,8 +25,12 @@ public function compose(View $view)
                 return collect($this->getCategories())->pluck('name', 'slug')
                     ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
             });
-
-            $view->with(['categories' => $categories]);
+        } else {
+            $categories = collect([
+                '' => trans('general.all_type', ['type' => trans_choice('general.categories', 2)]),
+            ]);
         }
+
+        $view->with(['categories' => $categories]);
     }
 }