upgrade to enso v7

src/Action.php

@@ -7,7 +7,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
 use LaravelEnso\Api\Contracts\Endpoint;
-use LaravelEnso\Api\Enums\Calls;
+use LaravelEnso\Api\Enums\Call;
 use LaravelEnso\Api\Exceptions\Api as Exception;
 use LaravelEnso\Api\Exceptions\Handler;
 use LaravelEnso\Api\Models\Log;
@@ -62,13 +62,13 @@ abstract protected function endpoint(): Endpoint;
     private function log(Response $response, string $duration): void
     {
         Log::create([
-            'user_id'  => Auth::user()?->id,
-            'url'      => $this->endpoint()->url(),
-            'route'    => Route::currentRouteName(),
-            'method'   => $this->endpoint()->method(),
-            'status'   => $response->status(),
-            'try'      => $this->api->tries(),
-            'type'     => Calls::Outbound,
+            'user_id' => Auth::user()?->id,
+            'url' => $this->endpoint()->url(),
+            'route' => Route::currentRouteName(),
+            'method' => $this->endpoint()->method(),
+            'status' => $response->status(),
+            'try' => $this->api->tries(),
+            'type' => Call::Outbound->value,
             'duration' => $duration,
         ]);
     }

src/Api.php

@@ -15,14 +15,13 @@
 use LaravelEnso\Api\Contracts\Retry;
 use LaravelEnso\Api\Contracts\Timeout;
 use LaravelEnso\Api\Contracts\UsesAuth;
-use LaravelEnso\Api\Enums\Authorization;
-use LaravelEnso\Api\Enums\Methods;
-use LaravelEnso\Api\Enums\ResponseCodes;
+use LaravelEnso\Api\Enums\Method;
+use LaravelEnso\Api\Enums\ResponseCode;
 
 class Api
 {
     protected int $tries;
-    protected string $method;
+    protected Method $method;
 
     public function __construct(protected Endpoint $endpoint)
     {
@@ -88,8 +87,8 @@ protected function headers(): array
 
         if ($this->endpoint instanceof UsesAuth) {
             $token = $this->endpoint->tokenProvider()->current();
-            $type = Authorization::get($this->endpoint->tokenProvider()->type());
-            $headers['Authorization'] = "{$type} {$token}";
+            $type = $this->endpoint->tokenProvider()->type();
+            $headers['Authorization'] = "{$type->value} {$token}";
         }
 
         return $headers;
@@ -104,13 +103,13 @@ protected function shouldRetry(): bool
     protected function possibleTokenExpiration(Response $response): bool
     {
         return $this->endpoint instanceof UsesAuth
-            && ResponseCodes::needsAuth($response->status())
+            && ResponseCode::from($response->status())->needsAuth()
             && $this->tries === 1;
     }
 
     protected function body(): string|array|null
     {
-        if ($this->method === Methods::post) {
+        if ($this->method === Method::post) {
             return $this->endpoint->body();
         }
 

src/Contracts/Endpoint.php

@@ -2,9 +2,11 @@
 
 namespace LaravelEnso\Api\Contracts;
 
+use LaravelEnso\Api\Enums\Method;
+
 interface Endpoint
 {
-    public function method(): string;
+    public function method(): Method;
 
     public function url(): string;
 

src/Contracts/Token.php

@@ -2,9 +2,11 @@
 
 namespace LaravelEnso\Api\Contracts;
 
+use LaravelEnso\Api\Enums\Authorization;
+
 interface Token
 {
-    public function type(): string;
+    public function type(): Authorization;
 
     public function auth(): self;
 

src/Enums/Authorization.php

@@ -2,13 +2,8 @@
 
 namespace LaravelEnso\Api\Enums;
 
-use LaravelEnso\Enums\Services\Enum;
-
-class Authorization extends Enum
+enum Authorization :string
 {
-    protected static bool $localisation = false;
-    protected static bool $validatesKeys = true;
-
-    public const Basic = 'Basic';
-    public const Bearer = 'Bearer';
+    case Basic = 'Basic';
+    case Bearer = 'Bearer';
 }

src/Enums/Call.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace LaravelEnso\Api\Enums;
+
+enum Call: int
+{
+    case Inbound = 1;
+    case Outbound = 2;
+}

src/Enums/Method.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace LaravelEnso\Api\Enums;
+
+enum Method: string
+{
+    case get = 'get';
+    case post = 'post';
+    case put = 'put';
+    case delete = 'delete';
+}

src/Enums/ResponseCode.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace LaravelEnso\Api\Enums;
+
+enum ResponseCode: int
+{
+    case OK = 200;
+    case Created = 201;
+
+    case Unauthorized = 401;
+    case Forbidden = 403;
+
+    case NotFound = 404;
+    case UnprocessableEntity = 422;
+
+    // public static function needsAuth(int $code): bool
+    // {
+    //     return in_array($code, [self::Unauthorized, self::Forbidden]);
+    // }
+    public function needsAuth(): bool
+    {
+        return match ($this) {
+            self::OK => false,
+            self::Created => false,
+            self::Unauthorized => true,
+            self::Forbidden => true,
+            self::NotFound => false,
+            self::UnprocessableEntity => false,
+        };
+    }
+}

src/Http/Middleware/ApiLogger.php

@@ -3,7 +3,7 @@
 namespace LaravelEnso\Api\Http\Middleware;
 
 use Closure;
-use LaravelEnso\Api\Enums\Calls;
+use LaravelEnso\Api\Enums\Call;
 use LaravelEnso\Api\Exceptions\Handler;
 use LaravelEnso\Api\Models\Log;
 use LaravelEnso\Helpers\Services\Decimals;
@@ -23,7 +23,7 @@ public function terminate($request, $response)
             'route' => $request->route()->getName(),
             'method' => $request->method(),
             'status' => $response->status(),
-            'type' => Calls::Inbound,
+            'type' => Call::Inbound->value,
             'duration' => Decimals::sub(microtime(true), LARAVEL_START),
         ]);