removed token requirement for core update

akaunting · Sep 21, 2017 · 380bd75 · 380bd75
1 parent 3b3e3bb
commit 380bd75
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/app/Http/Controllers/Install/Updates.php b/app/Http/Controllers/Install/Updates.php
@@ -6,26 +6,11 @@
 use App\Models\Module\Module as Model;
 use App\Utilities\Updater;
 use App\Utilities\Versions;
-use Illuminate\Routing\Route;
 use Module;
 
 class Updates extends Controller
 {
 
-    /**
-     * Instantiate a new controller instance.
-     *
-     * @param  Route  $route
-     */
-    public function __construct(Route $route)
-    {
-        if (!setting('general.api_token')) {
-            return redirect('modules/token/create')->send();
-        }
-
-        parent::__construct($route);
-    }
-
     /**
      * Show the form for creating a new resource.
      *

diff --git a/app/Utilities/Updater.php b/app/Utilities/Updater.php
@@ -124,7 +124,7 @@ public static function all()
         // Get data from cache
         $data = Cache::get('updates');
 
-        if (!empty($data) || !setting('general.api_token')) {
+        if (!empty($data)) {
             return $data;
         }
 

diff --git a/app/Utilities/Versions.php b/app/Utilities/Versions.php
@@ -60,7 +60,7 @@ public static function latest($modules = array())
         // Get data from cache
         $data = Cache::get('versions');
 
-        if (!empty($data) || !setting('general.api_token')) {
+        if (!empty($data)) {
             return $data;
         }
 
@@ -74,6 +74,13 @@ public static function latest($modules = array())
 
         $data['core'] = static::getLatestVersion($url);
 
+        // API token required for modules
+        if (!setting('general.api_token')) {
+            Cache::put('versions', $data, Date::now()->addHour(6));
+
+            return $data;
+        }
+
         // Then modules
         foreach ($modules as $module) {
             $alias = $module->get('alias');