fix sdkgen repo

apioo · Oct 27, 2023 · 9f27cb6 · 9f27cb6
1 parent b62b45d
commit 9f27cb6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Generator/Proxy/SDKgen.php b/src/Generator/Proxy/SDKgen.php
@@ -59,7 +59,7 @@ public function generate(SpecificationInterface $specification): Generator\Code\
         // transform to TypeAPI spec
         $body = (new TypeAPI($this->baseUrl))->generate($specification);
 
-        $uri = Uri::parse('https://api.sdkgen.app/generator/generate/' . $this->type);
+        $uri = Uri::parse('https://api.sdkgen.app/generate/' . $this->type);
         $uri = $uri->withParameters([
             'base_url' => $this->baseUrl,
             'config' => $this->config,

diff --git a/src/Repository/SDKgenRepository.php b/src/Repository/SDKgenRepository.php
@@ -26,6 +26,7 @@
 use PSX\Http\Client\Client;
 use PSX\Http\Client\ClientInterface;
 use PSX\Http\Client\GetRequest;
+use PSX\Http\Client\PostRequest;
 
 /**
  * SDKgenRepository
@@ -56,14 +57,17 @@ public function getAll(): array
         }
 
         $accessToken = $this->obtainAccessToken($clientId, $clientSecret);
+        if (empty($accessToken)) {
+            return [];
+        }
 
         $return = [];
         $types = $this->getTypes($accessToken);
         foreach ($types as $type) {
             [$name, $fileExtension, $mime] = $type;
 
             $return[$name] = new GeneratorConfig(
-                fn(string $baseUrl, string $config) => new Generator\Proxy\SDKgen($this->httpClient, $accessToken, $name, $baseUrl, $config),
+                fn(?string $baseUrl, ?string $config) => new Generator\Proxy\SDKgen($this->httpClient, $accessToken, $name, $baseUrl, $config),
                 $fileExtension,
                 $mime
             );
@@ -79,7 +83,7 @@ private function getTypes(string $accessToken): array
             return $item->get();
         }
 
-        $response = $this->httpClient->request(new GetRequest('https://api.sdkgen.app/generator/types', [
+        $response = $this->httpClient->request(new GetRequest('https://api.sdkgen.app/types', [
             'Authorization' => 'Bearer ' . $accessToken,
             'Accept' => 'application/json',
         ]));
@@ -139,9 +143,11 @@ private function obtainAccessToken(string $clientId, string $clientSecret): ?str
             return $item->get();
         }
 
-        $response = $this->httpClient->request(new GetRequest('https://api.sdkgen.app/authorization/token', [
+        $response = $this->httpClient->request(new PostRequest('https://api.sdkgen.app/authorization/token', [
             'Authorization' => 'Basic ' . base64_encode($clientId . ':' . $clientSecret),
             'Accept' => 'application/json',
+        ], [
+            'grant_type' => 'client_credentials'
         ]));
 
         if ($response->getStatusCode() !== 200) {
@@ -159,7 +165,7 @@ private function obtainAccessToken(string $clientId, string $clientSecret): ?str
         }
 
         $item->set($accessToken);
-        $item->expiresAfter(new \DateInterval('P1D'));
+        $item->expiresAfter(60 * 60 * 24);
         $this->cache->save($item);
 
         return $accessToken;