feat: add project et environment to caller (#142)

Author: matthv

packages/Agent/src/Utils/CallerParser.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace ForestAdmin\AgentPHP\Agent\Utils;
+
+use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
+use ForestAdmin\AgentPHP\Agent\Http\Request;
+use ForestAdmin\AgentPHP\DatasourceToolkit\Components\Caller;
+use ForestAdmin\AgentPHP\DatasourceToolkit\Exceptions\ForestException;
+
+use function ForestAdmin\config;
+
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class CallerParser
+{
+    public function __construct(
+        protected Request $request,
+    ) {
+    }
+
+    public function parse(): Caller
+    {
+        $this->validateHeaders();
+        $params = $this->decodeToken();
+        $params['timezone'] = $this->extractTimezone();
+        $params['request'] = [ 'ip' => $this->request->getClientIp()];
+        [$project, $environment] = $this->extractForestContext();
+        $params['project'] = $project;
+        $params['environment'] = $environment;
+
+        return Caller::makeFromRequestData($params);
+    }
+
+    private function validateHeaders(): void
+    {
+        if (! $this->request->bearerToken()) {
+            throw new HttpException(Response::HTTP_UNAUTHORIZED, 'You must be logged in to access at this resource.');
+        }
+    }
+
+    private function decodeToken(): array
+    {
+        $decoded = (array) JWT::decode($this->request->bearerToken(), new Key(config('authSecret'), 'HS256'));
+        unset($decoded['exp']);
+
+        if (isset($decoded['tags']) && $decoded['tags'] instanceof \stdClass) {
+            $decoded['tags'] = (array) $decoded['tags'];
+        }
+
+        return $decoded;
+    }
+
+    private function extractTimezone(): string
+    {
+        $timezone = $this->request->get('timezone');
+
+        if (! $timezone) {
+            throw new ForestException('Missing timezone');
+        }
+
+        if (! in_array($timezone, \DateTimeZone::listIdentifiers(), true)) {
+            throw new ForestException("Invalid timezone: $timezone");
+        }
+
+        return $timezone;
+    }
+
+    private function extractForestContext(): array
+    {
+        $forestContextUrl = $this->request->header('forest-context-url');
+
+        if (preg_match('/https:\/\/[^\/]*\/([^\/]*)\/([^\/]*)/', $forestContextUrl, $matches)) {
+            return [$matches[1], $matches[2]];
+        }
+
+        return [null, null];
+    }
+}

packages/Agent/src/Utils/QueryStringParser.php

@@ -2,8 +2,6 @@
 
 namespace ForestAdmin\AgentPHP\Agent\Utils;
 
-use Firebase\JWT\JWT;
-use Firebase\JWT\Key;
 use ForestAdmin\AgentPHP\Agent\Http\Request;
 use ForestAdmin\AgentPHP\DatasourceToolkit\Components\Caller;
 use ForestAdmin\AgentPHP\DatasourceToolkit\Components\Contracts\CollectionContract;
@@ -18,11 +16,8 @@
 use ForestAdmin\AgentPHP\DatasourceToolkit\Validations\ProjectionValidator;
 use ForestAdmin\AgentPHP\DatasourceToolkit\Validations\SortValidator;
 
-use function ForestAdmin\config;
 
 use Illuminate\Support\Str;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class QueryStringParser
 {
@@ -134,29 +129,7 @@ public static function parseSegment(CollectionContract $collection, Request $req
      */
     public static function parseCaller(Request $request): Caller
     {
-        if (! $request->bearerToken()) {
-            throw new HttpException(Response::HTTP_UNAUTHORIZED, 'You must be logged in to access at this resource.');
-        }
-
-        $timezone = $request->get('timezone');
-        $params = [
-            'timezone' => $timezone,
-            'request'  => [
-                'ip' => $request->getClientIp(),
-            ],
-        ];
-
-        if (! $timezone) {
-            throw new ForestException('Missing timezone');
-        }
-
-        if (! in_array($timezone, \DateTimeZone::listIdentifiers(), true)) {
-            throw new ForestException("Invalid timezone: $timezone");
-        }
-
-        $tokenData = JWT::decode($request->bearerToken(), new Key(config('authSecret'), 'HS256'));
-
-        return Caller::makeFromRequestData($tokenData, $params);
+        return (new CallerParser($request))->parse();
     }
 
     /**

packages/DatasourceToolkit/src/Components/Caller.php

@@ -18,25 +18,15 @@ public function __construct(
         protected string $permissionLevel,
         protected ?string $role = null,
         protected array $request = [],
+        protected ?string $project = null,
+        protected ?string $environment = null,
     ) {
     }
 
-    public static function makeFromRequestData(object $requestObjectData, array $params): self
+    public static function makeFromRequestData(array $params): self
     {
-        // cast object to array recursively
-        $toArray = function ($x) use (&$toArray) {
-            return is_scalar($x)
-                ? $x
-                : array_map($toArray, (array) $x);
-        };
-        $data = $toArray($requestObjectData);
-
-        $data['timezone'] = $params['timezone'];
-        $data['request'] = $params['request'];
-        unset($data['exp']);
-
         $attributes = [];
-        foreach ($data as $key => $value) {
+        foreach ($params as $key => $value) {
             $attributes[Str::camel($key)] = $value;
         }