@fleetbase/solid-engine 0.0.2 → 0.0.4

package/server/src/Http/Controllers/SolidController.php

@@ -7,8 +7,9 @@ use Fleetbase\Http\Requests\AdminRequest;
 use Fleetbase\Models\Setting;
 use Fleetbase\Solid\Client\SolidClient;
 use Fleetbase\Solid\Models\SolidIdentity;
-use Fleetbase\Support\Utils;
+use Fleetbase\Solid\Support\Utils;
 use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 
 class SolidController extends BaseController
 {
@@ -90,9 +91,9 @@ class SolidController extends BaseController
                     'remember' => true,
                 ],
                 [
-                'withoutAuth' => true,
-                'headers'     => [
-                    'Cookie' => '_interaction=TDQMh2DWuC8wZvkEB2n_G; _interaction.sig=3HHA_FUVo7Cw9up2keCJ7IaQJws; _session.legacy=jdxTxnTGmvWx2ECaiwYeP; _session.legacy.sig=EUGYX6DAKtBNQqZN5PGcbIJ-5ac',
+                    'withoutAuth' => true,
+                    'headers'     => [
+                        'Cookie' => '_interaction=TDQMh2DWuC8wZvkEB2n_G; _interaction.sig=3HHA_FUVo7Cw9up2keCJ7IaQJws; _session.legacy=jdxTxnTGmvWx2ECaiwYeP; _session.legacy.sig=EUGYX6DAKtBNQqZN5PGcbIJ-5ac',
                     ],
                 ]
             );
@@ -114,4 +115,56 @@ class SolidController extends BaseController
             // dump($createFileResponse->json());
         }
     }
+
+    public function getPods(Request $request)
+    {
+        // Retrieve search and sort parameters from the request
+        $query = $request->searchQuery();
+        $sort  = $request->input('sort', '-created_at');
+        $id    = $request->input('id');
+        $slug  = $request->input('slug');
+
+        // Collection of pods data
+        $pods = json_decode(file_get_contents(base_path('vendor/fleetbase/solid-api/server/data/pods.json')));
+
+        // Get single content from pod via slug
+        if ($slug) {
+            $result = Utils::searchPods($pods, 'slug', $slug);
+
+            return response()->json($result);
+        }
+
+        // Get a single item via ID
+        if ($id && is_array($pods)) {
+            $result = Utils::searchPods($pods, 'id', $id);
+            if ($result && $query) {
+                $result->contents = array_values(
+                    array_filter(
+                        data_get($result, 'contents', []),
+                        function ($content) use ($query) {
+                            return Str::contains(strtolower(data_get($content, 'name')), strtolower($query));
+                        }
+                    )
+                );
+            }
+
+            return response()->json($result);
+        }
+
+        // Filtering by search query
+        if ($query) {
+            $pods = array_filter($pods, function ($pod) use ($query) {
+                return Str::contains(strtolower(data_get($pod, 'name')), strtolower($query));
+            });
+        }
+
+        // Determine sorting direction and key
+        $sortDesc = substr($sort, 0, 1) === '-';
+        $sortKey  = ltrim($sort, '-');
+
+        // Sorting by specified field
+        $pods = collect($pods)->sortBy($sortKey, SORT_REGULAR, $sortDesc);
+
+        return response()->json($pods->values());
+    }
 }

package/server/src/LegacyClient/OIDCClient.php

@@ -141,7 +141,7 @@ final class OIDCClient extends OpenIDConnectClient
         return rtrim($url, '=');
     }
 
-    public function createDPoP(string $method, string $url, bool $includeAth = true, string $accessToken = null): string
+    public function createDPoP(string $method, string $url, bool $includeAth = true, ?string $accessToken = null): string
     {
         if (null === $this->dpopPrivateKey) {
             $this->dpopPrivateKey = JWKFactory::createECKey('P-256', ['use' => 'sig', 'kid' => base64_encode(random_bytes(20))]);

package/server/src/LegacyClient/SolidClient.php

@@ -98,7 +98,7 @@ class SolidClient
      *
      * @return string the fully constructed URL
      */
-    private function createRequestUrl(string $uri = null): string
+    private function createRequestUrl(?string $uri = null): string
     {
         $url = $this->getServerUrl();
 
@@ -165,6 +165,7 @@ class SolidClient
             $url = $this->createRequestUrl($uri);
         }
         $this->setAuthenticationHeaders($options, $method, $url);
+
         return Http::withOptions($options)->{$method}($url, $data);
     }
 

package/server/src/Support/Utils.php

@@ -3,7 +3,45 @@
 namespace Fleetbase\Solid\Support;
 
 use Fleetbase\Support\Utils as FleetbaseUtils;
+use Illuminate\Support\Str;
 
 class Utils extends FleetbaseUtils
 {
+    /**
+     * Recursively searches through a nested array of pods and their contents
+     * to find an item that matches a given key-value pair.
+     *
+     * This function handles nested structures where each folder may contain
+     * additional folders and files. It returns the first matching item based
+     * on the specified key and value.
+     *
+     * @param array  $data   the array representing the pods and their nested contents
+     * @param string $key    The key used to search items (e.g., 'name', 'id').
+     * @param string $value  the value to match against the specified key
+     * @param bool   $search whether to perform a search match with string contains
+     *
+     * @return mixed|null returns the first matching item found in the structure or
+     *                    `null` if no item is found that matches the criteria
+     */
+    public static function searchPods(array $data = [], string $key, string $value, bool $search = false)
+    {
+        foreach ($data as $item) {
+            if ($search === false && data_get($item, $key) && strcasecmp(data_get($item, $key), $value) === 0) {
+                return $item;
+            }
+
+            if ($search === true && data_get($item, $key) && Str::contains(strtolower(data_get($item, $key)), strtolower($value))) {
+                return $item;
+            }
+
+            if (is_array(data_get($item, 'contents'))) {
+                $contentSearchResult = static::searchPods(data_get($item, 'contents', []), $key, $value);
+                if ($contentSearchResult) {
+                    return $contentSearchResult;
+                }
+            }
+        }
+
+        return null;
+    }
 }

package/server/src/routes.php

@@ -28,6 +28,7 @@ Route::prefix(config('solid.api.routing.prefix', 'solid'))->namespace('Fleetbase
                 $router->group(
                     ['prefix' => 'v1'],
                     function ($router) {
+                        $router->get('pods', 'SolidController@getPods');
                         $router->get('authenticate/{identifier}', 'SolidController@authenticate');
                         $router->group(['middleware' => ['fleetbase.protected']], function ($router) {
                             $router->get('account', 'SolidController@getAccountIndex');