@fleetbase/solid-engine 0.0.2 → 0.0.3

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/solid-api",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "description": "Solid Protocol Extension to Store and Share Data with Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -28,8 +28,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.16",
-        "fleetbase/fleetops-api": "^0.4.25",
+        "fleetbase/core-api": "^1.4.22",
+        "fleetbase/fleetops-api": "^0.4.27",
         "php-http/guzzle7-adapter": "^1.0",
         "psr/http-factory-implementation": "*",
         "jumbojett/openid-connect-php": "^0.9.10",
@@ -50,6 +50,12 @@
         "phpstan/phpstan": "^1.10.38",
         "symfony/var-dumper": "^5.4.29"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/fleetbase/laravel-model-caching"
+        }
+    ],
     "autoload": {
         "psr-4": {
             "Fleetbase\\Solid\\": "server/src/",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Solid",
-    "version": "0.0.1",
+    "version": "0.0.3",
     "description": "Solid Protocol Extension to Store and Share Data with Fleetbase",
     "repository": "https://github.com/fleetbase/solid",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/solid-engine",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "description": "Solid Protocol Extension to Store and Share Data with Fleetbase",
     "fleetbase": {
         "route": "solid-protocol"
@@ -45,8 +45,8 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.2.8",
-        "@fleetbase/ember-ui": "^0.2.12",
+        "@fleetbase/ember-core": "^0.2.9",
+        "@fleetbase/ember-ui": "^0.2.13",
         "@fleetbase/fleetops-data": "^0.1.14",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",

package/server/data/pods.json

@@ -0,0 +1,328 @@
+[
+    {
+        "id": "pod_x2y4bdc",
+        "name": "Fleetbase-Sync-2024-03-01",
+        "slug": "fleetbase-sync-2024-03-01",
+        "size": "346kb",
+        "updated_at": "May 07, 2024 13:25",
+        "created_at": "May 07, 2024 13:25",
+        "contents": [
+            {
+                "id": "content_wsyz38",
+                "name": "Orders-May-2024",
+                "slug": "orders-may-2024",
+                "size": "80kb",
+                "type": "folder",
+                "updated_at": "May 05, 2024 14:33",
+                "created_at": "May 05, 2024 14:33",
+                "contents": [
+                    {
+                        "id": "content_wxyz12",
+                        "name": "EmployeeHandbook_2024.pdf",
+                        "slug": "employeehandbook-2024-pdf",
+                        "size": "450kb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:22",
+                        "created_at": "May 07, 2024 14:22"
+                    },
+                    {
+                        "id": "content_345ghi",
+                        "name": "FinancialSummary_Annual_2024.xlsx",
+                        "slug": "financialsummary-annual-2024-xlsx",
+                        "size": "625kb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:24",
+                        "created_at": "May 07, 2024 14:24"
+                    },
+                    {
+                        "id": "content_789jkl",
+                        "name": "DeveloperGuide_Version2.md",
+                        "slug": "developerguide-version2-md",
+                        "size": "75kb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:26",
+                        "created_at": "May 07, 2024 14:26"
+                    },
+                    {
+                        "id": "content_mnopqr",
+                        "name": "ProjectTimeline_Roadmap2024.gantt",
+                        "slug": "projecttimeline-roadmap2024-gantt",
+                        "size": "1.1mb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:28",
+                        "created_at": "May 07, 2024 14:28"
+                    }
+                ]
+            },
+            {
+                "id": "content_xjdwkj",
+                "name": "RandomCode13.txt",
+                "slug": "random-code-13-txt",
+                "size": "346kb",
+                "type": "file",
+                "updated_at": "May 07, 2024 13:25",
+                "created_at": "May 07, 2024 13:25"
+            },
+            {
+                "id": "content_1a2b3c",
+                "name": "SalesReport_Q1_2024.xlsx",
+                "slug": "salesreport-q1-2024-xlsx",
+                "size": "525kb",
+                "type": "file",
+                "updated_at": "May 07, 2024 14:10",
+                "created_at": "May 07, 2024 14:10"
+            },
+            {
+                "id": "content_4d5e6f",
+                "name": "CustomerFeedback_May2024.pdf",
+                "slug": "customerfeedback-may2024-pdf",
+                "size": "275kb",
+                "type": "file",
+                "updated_at": "May 07, 2024 14:12",
+                "created_at": "May 07, 2024 14:12"
+            }
+        ]
+    },
+    {
+        "id": "pod_a9c7jkl",
+        "name": "Fleetbase-Backup-2024-04-19",
+        "slug": "fleetbase-backup-2024-04-19",
+        "size": "420kb",
+        "updated_at": "May 08, 2024 11:00",
+        "created_at": "May 08, 2024 11:00",
+        "contents": [
+            {
+                "id": "content_dn3892",
+                "name": "Vehicles-May-2024",
+                "slug": "vehicles-may-2024",
+                "size": "80kb",
+                "type": "folder",
+                "updated_at": "May 05, 2024 14:33",
+                "created_at": "May 05, 2024 14:33",
+                "contents": [
+                    {
+                        "id": "content_stuvwx",
+                        "name": "HR_PolicyDocument.pdf",
+                        "slug": "hr-policydocument-pdf",
+                        "size": "350kb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:30",
+                        "created_at": "May 07, 2024 14:30"
+                    },
+                    {
+                        "id": "content_yza123",
+                        "name": "DesignMockup_2024.sketch",
+                        "slug": "designmockup-2024-sketch",
+                        "size": "3.2mb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:32",
+                        "created_at": "May 07, 2024 14:32"
+                    },
+                    {
+                        "id": "content_456bcd",
+                        "name": "BugTracker_Report_Apr2024.xlsx",
+                        "slug": "bugtracker-report-apr2024-xlsx",
+                        "size": "280kb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:34",
+                        "created_at": "May 07, 2024 14:34"
+                    },
+                    {
+                        "id": "content_789efg",
+                        "name": "TrainingMaterials_Mar2024.pptx",
+                        "slug": "trainingmaterials-mar2024-pptx",
+                        "size": "1.5mb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:36",
+                        "created_at": "May 07, 2024 14:36"
+                    },
+                    {
+                        "id": "content_hijklm",
+                        "name": "TestPlan_ReleaseCycle_Apr2024.docx",
+                        "slug": "testplan-releasecycle-apr2024-docx",
+                        "size": "650kb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:38",
+                        "created_at": "May 07, 2024 14:38"
+                    }
+                ]
+            },
+            {
+                "id": "content_7g8h9i",
+                "name": "ProductCatalog_Spring2024.csv",
+                "slug": "productcatalog-spring2024-csv",
+                "size": "1.2mb",
+                "type": "file",
+                "updated_at": "May 07, 2024 14:15",
+                "created_at": "May 07, 2024 14:15"
+            },
+            {
+                "id": "content_jklmno",
+                "name": "ProjectPlan_SummerLaunch.docx",
+                "slug": "projectplan-summerlaunch-docx",
+                "size": "825kb",
+                "type": "file",
+                "updated_at": "May 07, 2024 14:18",
+                "created_at": "May 07, 2024 14:18"
+            },
+            {
+                "id": "content_pqrsuv",
+                "name": "MarketingStrategy_Q3_2024.pptx",
+                "slug": "marketingstrategy-q3-2024-pptx",
+                "size": "2.3mb",
+                "type": "file",
+                "updated_at": "May 07, 2024 14:20",
+                "created_at": "May 07, 2024 14:20"
+            },
+            {
+                "id": "content_wxyz12",
+                "name": "EmployeeHandbook_2024.pdf",
+                "slug": "employeehandbook-2024-pdf",
+                "size": "450kb",
+                "type": "file",
+                "updated_at": "May 07, 2024 14:22",
+                "created_at": "May 07, 2024 14:22"
+            }
+        ]
+    },
+    {
+        "id": "pod_b3z1mno",
+        "name": "Fleetbase-Demo-2024-05-01",
+        "slug": "fleetbase-demo-2024-05-01",
+        "size": "512kb",
+        "updated_at": "May 09, 2024 09:45",
+        "created_at": "May 09, 2024 09:45",
+        "contents": [
+            {
+                "id": "content_dnsus7s",
+                "name": "Issues-May-2024",
+                "slug": "issues-may-2024",
+                "size": "80kb",
+                "type": "folder",
+                "updated_at": "May 05, 2024 14:33",
+                "created_at": "May 05, 2024 14:33",
+                "contents": [
+                    {
+                        "id": "content_d732sz",
+                        "name": "Fleet-Reports-May-2024",
+                        "slug": "fleet-reports-may-2024",
+                        "size": "80kb",
+                        "type": "folder",
+                        "updated_at": "May 05, 2024 14:33",
+                        "created_at": "May 05, 2024 14:33",
+                        "contents": [
+                            {
+                                "id": "content_pqrstuv",
+                                "name": "MockDataSet1.1.json",
+                                "slug": "mockdataset1-1-json",
+                                "size": "250kb",
+                                "type": "file",
+                                "updated_at": "May 07, 2024 14:52",
+                                "created_at": "May 07, 2024 14:52"
+                            }
+                        ]
+                    },
+                    {
+                        "id": "content_nopqrs",
+                        "name": "ProjectSpecification_V3.pdf",
+                        "slug": "projectspecification-v3-pdf",
+                        "size": "990kb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:40",
+                        "created_at": "May 07, 2024 14:40"
+                    },
+                    {
+                        "id": "content_tuvwxyz",
+                        "name": "DeploymentScript_Linux.bash",
+                        "slug": "deploymentscript-linux-bash",
+                        "size": "45kb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:42",
+                        "created_at": "May 07, 2024 14:42"
+                    },
+                    {
+                        "id": "content_abc123",
+                        "name": "QAReport_EndOfQuarter_Mar2024.pdf",
+                        "slug": "qareport-endofquarter-mar2024-pdf",
+                        "size": "1.0mb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:44",
+                        "created_at": "May 07, 2024 14:44"
+                    },
+                    {
+                        "id": "content_456def",
+                        "name": "ReleaseNotes_Patch1.3.json",
+                        "slug": "releasenotes-patch1-3-json",
+                        "size": "150kb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:46",
+                        "created_at": "May 07, 2024 14:46"
+                    },
+                    {
+                        "id": "content_789ghi",
+                        "name": "SprintRetrospective_May2024.csv",
+                        "slug": "sprintretrospective-may2024-csv",
+                        "size": "340kb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:48",
+                        "created_at": "May 07, 2024 14:48"
+                    },
+                    {
+                        "id": "content_jklmno",
+                        "name": "CodeReview_Analysis.xlsx",
+                        "slug": "codereview-analysis-xlsx",
+                        "size": "480kb",
+                        "type": "file",
+                        "updated_at": "May 07, 2024 14:50",
+                        "created_at": "May 07, 2024 14:50"
+                    }
+                ]
+            },
+            {
+                "id": "content_1a2b3c",
+                "name": "SalesReport_Q1_2024.xlsx",
+                "slug": "salesreport-q1-2024-xlsx",
+                "size": "525kb",
+                "type": "file",
+                "updated_at": "May 07, 2024 14:10",
+                "created_at": "May 07, 2024 14:10"
+            },
+            {
+                "id": "content_4d5e6f",
+                "name": "CustomerFeedback_May2024.pdf",
+                "slug": "customerfeedback-may2024-pdf",
+                "size": "275kb",
+                "type": "file",
+                "updated_at": "May 07, 2024 14:12",
+                "created_at": "May 07, 2024 14:12"
+            },
+            {
+                "id": "content_7g8h9i",
+                "name": "ProductCatalog_Spring2024.csv",
+                "slug": "productcatalog-spring2024-csv",
+                "size": "1.2mb",
+                "type": "file",
+                "updated_at": "May 07, 2024 14:15",
+                "created_at": "May 07, 2024 14:15"
+            },
+            {
+                "id": "content_jklmno",
+                "name": "ProjectPlan_SummerLaunch.docx",
+                "slug": "projectplan-summerlaunch-docx",
+                "size": "825kb",
+                "type": "file",
+                "updated_at": "May 07, 2024 14:18",
+                "created_at": "May 07, 2024 14:18"
+            },
+            {
+                "id": "content_pqrsuv",
+                "name": "MarketingStrategy_Q3_2024.pptx",
+                "slug": "marketingstrategy-q3-2024-pptx",
+                "size": "2.3mb",
+                "type": "file",
+                "updated_at": "May 07, 2024 14:20",
+                "created_at": "May 07, 2024 14:20"
+            }
+        ]
+    }
+]

package/server/src/Client/OpenIDConnectClient.php

@@ -86,7 +86,7 @@ final class OpenIDConnectClient extends BaseOpenIDConnectClient
         return parent::authenticate();
     }
 
-    private function setClientCredentials(string $clientName = CLIENT_NAME, $clientCredentials, bool $save = false, \Closure $callback = null): OpenIDConnectClient
+    private function setClientCredentials(string $clientName = CLIENT_NAME, $clientCredentials, bool $save = false, ?\Closure $callback = null): OpenIDConnectClient
     {
         $this->setClientID($clientCredentials->client_id);
         $this->setClientName($clientCredentials->client_name);
@@ -156,7 +156,7 @@ final class OpenIDConnectClient extends BaseOpenIDConnectClient
         return $value;
     }
 
-    public function getOpenIdConfiguration(string $key = null)
+    public function getOpenIdConfiguration(?string $key = null)
     {
         $openIdConfigResponse = $this->solid->get('.well-known/openid-configuration');
         if ($openIdConfigResponse instanceof Response) {

package/server/src/Client/SolidClient.php

@@ -70,7 +70,7 @@ class SolidClient
      *
      * @return string the fully constructed URL
      */
-    private function createRequestUrl(string $uri = null): string
+    private function createRequestUrl(?string $uri = null): string
     {
         if (Str::startsWith($uri, 'http')) {
             return $uri;

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');