From dd83391beaa98d93eeb596670ea5b6a436678559 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 17 Jun 2018 11:27:36 +0300
Subject: [PATCH] Changes for mobile app

---
 app/Constants.php                             |  2 +-
 app/Http/Controllers/AccountApiController.php | 17 +++++++++--------
 app/Http/Middleware/ApiCheck.php              |  2 ++
 app/Libraries/Utils.php                       | 12 ++++++++++++
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/Constants.php b/app/Constants.php
index 8ed02d2f1332..53d6e4d06e1e 100644
--- a/app/Constants.php
+++ b/app/Constants.php
@@ -431,7 +431,7 @@ if (! defined('APP_NAME')) {
     define('TEST_PASSWORD', 'password');
     define('API_SECRET', 'API_SECRET');
     define('DEFAULT_API_PAGE_SIZE', 15);
-    define('MAX_API_PAGE_SIZE', 500);
+    define('MAX_API_PAGE_SIZE', 10000);
 
     define('IOS_DEVICE', env('IOS_DEVICE', ''));
     define('ANDROID_DEVICE', env('ANDROID_DEVICE', ''));
diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index e758d0744897..25a50cb0cb4d 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -95,6 +95,14 @@ class AccountApiController extends BaseAPIController
         $transformer = new UserAccountTransformer($user->account, $request->serializer, $request->token_name);
         $data = $this->createCollection($users, $transformer, 'user_account');
 
+        if (request()->include_static) {
+            $data = [
+                'accounts' => $data,
+                'static' => Utils::getStaticData(),
+                'version' => NINJA_VERSION,
+            ]
+        }
+
         return $this->response($data);
     }
 
@@ -112,14 +120,7 @@ class AccountApiController extends BaseAPIController
 
     public function getStaticData()
     {
-        $data = [];
-
-        $cachedTables = unserialize(CACHED_TABLES);
-        foreach ($cachedTables as $name => $class) {
-            $data[$name] = Cache::get($name);
-        }
-
-        return $this->response($data);
+        return $this->response(Utils::getStaticData());
     }
 
     public function getUserAccounts(Request $request)
diff --git a/app/Http/Middleware/ApiCheck.php b/app/Http/Middleware/ApiCheck.php
index 88ff4b9656f9..fbb168d219fc 100644
--- a/app/Http/Middleware/ApiCheck.php
+++ b/app/Http/Middleware/ApiCheck.php
@@ -37,6 +37,8 @@ class ApiCheck
         if ($secret = env(API_SECRET)) {
             $requestSecret = Request::header('X-Ninja-Secret') ?: ($request->api_secret ?: '');
             $hasApiSecret = hash_equals($requestSecret, $secret);
+        } elseif (Utils::isSelfHost()) {
+            $hasApiSecret = true;
         }
 
         if ($loggingIn) {
diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index f7542b23a130..511d751c1180 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -501,6 +501,18 @@ class Utils
         }
     }
 
+    public static function getStaticData()
+    {
+        $data = [];
+
+        $cachedTables = unserialize(CACHED_TABLES);
+        foreach ($cachedTables as $name => $class) {
+            $data[$name] = Cache::get($name);
+        }
+
+        return $data;
+    }
+
     public static function getFromCache($id, $type)
     {
         $cache = Cache::get($type);