fix api path

Signed-off-by: Maurice Preuß <hello@envoyr.com>

composer.json

@@ -15,8 +15,8 @@
   "require": {
     "php": "^8.1",
     "ext-json": "*",
-    "illuminate/support": "^10.0|^11.0|^12.0",
-    "illuminate/console": "^10.0|^11.0|^12.0",
+    "illuminate/support": "^11.0|^12.0",
+    "illuminate/console": "^11.0|^12.0",
     "guzzlehttp/guzzle": "^6.3|^7.0",
     "socialiteproviders/manager": "^3.4|^4.0.1",
     "firebase/php-jwt": "^6.0"
@@ -49,4 +49,4 @@
       }
     }
   }
-}
+}

oauth-public.staging.key

@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAi4Ta8r01zKaGSnGi1EiD
+uMFWRXBlK4y/ZIfWBpElmS2ygv4mGeP3hT4Flm696Z2UMy56KC+c7CC/PQCiutLk
+5NUphyX/t+0QS5Dqpw6FB33fLTNNY7GqSmGIUE4os8XYZRSyDQRgtOgq3R3vJkoV
+7zoavTJmSCQlG5Qf0T//iMmzQ+b+6VZm1CJSz5nGx94u1DuXNyP5Epkk0wuHrtwy
+kADR2lmydNodJzqpSD+8yQqnAhOZNtNF4qwQ3g13fRvHycBp3G2nlCfOn2g5PmYD
+KYBKqvTq4PQH4E+K3pbbMz6zf/T6Dw7zTfksqHR4hqMgN6byRRxmwuBczIumcu9b
+y7xbgoIGIVZXgJliALPFi+zTPTN7c8MedFs/xCBHCmzWYTCZfHgr8RPRewD19tCG
+NSny5R0vlArpuZCTTgedPESDeGU4eNEddg4yXFzKlpE2nNuvzZ1Ohruc5ETOSU19
+RTCBUBkjeL6ESZRd/yKGjbVx4dEYxZdIz4yBl+hZ2ZOIyG7L3zPrccAWrPpG56xr
+E5IDBXxLFhaJ5LlyEAGQehB0ShEuCdkr88Xz7ba9PHpGqY83l4//ULrqPIZPAa4Z
+E3AWHT1ZtXNPeA4SzZ9Y9Oij4M3chyHxqM0lL3kYP+dstZehTujStfElDIx2Ni10
+73tILu4edYS0FxsL19m8gbsCAwEAAQ==
+-----END PUBLIC KEY-----

phpunit.xml

@@ -23,7 +23,7 @@
     <php>
         <env name="ANIKEEN_ID_KEY" value="38"/>
         <env name="ANIKEEN_ID_SECRET" value="2goNRF8x37HPVZVaa28ySZGVXJuksvxnxM7TcGzM"/>
-        <env name="ANIKEEN_ID_BASE_URL" value="https://id.anikeen.com/api/"/>
+        <env name="ANIKEEN_ID_BASE_URL" value="https://id.anikeen.com"/>
         <env name="CLIENT_ACCESS_TOKEN" value="eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJhdWQiOiIxNSIsImp0aSI6IjAxN2QxZDg0Y2MxNjAyZTYxOGZkNjYwZGViZWVjMDY4MTk2YmYzMDk1OGMzY2RiYzBjZmJkZWFjZjFhOTUxODQzZDU1YTk3OGY2YWIxY2YzIiwiaWF0IjoxNjY0NjIzMzA4LjQyODI4MSwibmJmIjoxNjY0NjIzMzA4LjQyODI4NCwiZXhwIjoxNjgwMzQ4MTA4LjQxNjc4MSwic3ViIjoiMzkiLCJzY29wZXMiOlsiYXBpIiwicmVhZF91c2VyIl0sImNsaWVudCI6eyJ0cnVzdGVkIjpmYWxzZX19.vxnzCaU4PpOrNVHa5AnGSS6gX_RCvxIERAnHFhjTrUzRafV9mr2Cvwd-BDVYoUr10wHvxa_TJSYfnAdDuhE-MEyDv13O3dL2XGTtJNa_Rg6L6CQ0JvC3wL-lWPvGPFax9pu-_lqbA3jm5B08hc3-7tq3f2nXcxjhtkqT6TTJv1-RCAppb2HCXiUDAqANzbhyInDjOH2WvFj1OGC_AI03J3W2KRWyeFLtUne8XKPFyr9XGcPuTrqogcuuXLeUt2kcf2bXbuIV1OlgIECrDiP1Ee0F2AzPs27ZVJ2z0R0JbT6AubKhGl5_Qi27cwjOH7hT2dmjcF1mLjzpN1uChLIdSnGSoStH8VzYHnHE2I8G-owW_aadG2UmGdnRY143q6g_28f3WIZNSucBSXkwFeS_t4fylsvpxhpjYJusf5qiEU_X3YbeawYMUCFUkSD2XTIypAqMJLNZQAeJ52eyL-9fln-Bv7n9v7K9G6ieR6Tm0tsJ1PRnaQi7rA1NTFwHoQmIOW9tfMycLzT7bgSoz3ra6Ez2J7ZNuWBZNKS0O-0YfSrAWyWK5U8YRfQuSVzP2VrIU63K6RGU2c284PfQGy11kgKUNQPykirb8p7MDQ8PwrxKaylBnD6hhDgjqEh2bfsr_43DfJA0R58L1HK3BmQnxgap0C77wK1e0yNlABpN28Q"/>
     </php>
 </phpunit>

src/Id/AnikeenId.php

@@ -46,16 +46,6 @@ class AnikeenId
      */
     public static bool $unserializesCookies = false;
 
-    /**
-     * The base URL for Anikeen ID API.
-     */
-    private static string $baseUrl = 'https://id.anikeen.com/api/';
-
-    /**
-     * The staging base URL for Anikeen ID API.
-     */
-    private static string $stagingBaseUrl = 'https://staging.id.anikeen.com/api/';
-
     /**
      * The key for the access token.
      */
@@ -96,6 +86,16 @@ class AnikeenId
      */
     protected ?string $redirectUri = null;
 
+    /**
+     * The base URL for Anikeen ID.
+     */
+    protected string $baseUrl = 'https://id.anikeen.com';
+
+    /**
+     * The staging base URL for Anikeen ID.
+     */
+    protected string $stagingBaseUrl = 'https://staging.id.anikeen.com';
+
     /**
      * Constructor.
      */
@@ -110,25 +110,25 @@ class AnikeenId
         if ($redirectUri = config('services.anikeen.redirect')) {
             $this->setRedirectUri($redirectUri);
         }
-        if (config('services.anikeen.mode') === 'staging') {
-            self::setBaseUrl(self::$stagingBaseUrl);
+        if (self::getMode() === 'staging' && !config('services.anikeen.base_url')) {
+            self::setBaseUrl($this->stagingBaseUrl);
         }
         if ($baseUrl = config('services.anikeen.base_url')) {
             self::setBaseUrl($baseUrl);
         }
         $this->client = new Client([
-            'base_uri' => self::$baseUrl,
+            'base_uri' => $this->baseUrl . '/api/',
         ]);
     }
 
-    /**
-     * @param string $baseUrl
-     *
-     * @internal only for internal and debug purposes.
-     */
-    public static function setBaseUrl(string $baseUrl): void
+    protected function setBaseUrl(string $baseUrl): void
     {
-        self::$baseUrl = $baseUrl;
+        $this->baseUrl = $baseUrl;
+    }
+
+    public function getBaseUrl(): string
+    {
+        return rtrim($this->baseUrl, '/');
     }
 
     public static function useAccessTokenField(string $accessTokenField): void
@@ -141,6 +141,11 @@ class AnikeenId
         return self::$accessTokenField;
     }
 
+    public static function getMode(): string
+    {
+        return config('services.anikeen.mode') ?: 'production';
+    }
+
     public static function useRefreshTokenField(string $refreshTokenField): void
     {
         self::$refreshTokenField = $refreshTokenField;

src/Id/Enums/Scope.php

@@ -6,11 +6,35 @@ class Scope
 {
     const USER = 'user';
     const USER_READ = 'user:read';
-    const ORDERS = 'orders';
-    const ORDERS_READ = 'orders:read';
-    const PRODUCTS = 'products';
-    const PRODUCTS_READ = 'products:read';
+
+    const ADDRESSES = 'addresses';
+    const ADDRESSES_READ = 'addresses:read';
+
     const BILLING = 'billing';
     const BILLING_READ = 'billing:read';
+    const BILLING_CLIENT = 'billing:client';
+
+    const INVOICES = 'invoices';
+    const INVOICES_READ = 'invoices:read';
+    const INVOICES_CLIENT = 'invoices:client';
+
+    const ORDERS = 'orders';
+    const ORDERS_READ = 'orders:read';
+    const ORDERS_CLIENT = 'orders:client';
+
+    const PAYMENT_METHODS = 'payment-methods';
+    const PAYMENT_METHODS_READ = 'payment-methods:read';
+
+    const SUBSCRIPTIONS = 'subscriptions';
+    const SUBSCRIPTIONS_READ = 'subscriptions:read';
+    const SUBSCRIPTIONS_CLIENT = 'subscriptions:client';
+
+    const TRANSACTIONS = 'transactions';
+    const TRANSACTIONS_READ = 'transactions:read';
+    const TRANSACTIONS_CLIENT = 'transactions:client';
+
+    const SSH_KEYS = 'ssh-keys';
+    const SSH_KEYS_READ = 'ssh-keys:read';
+
     const ADMIN = 'admin';
 }

src/Id/Helpers/JwtParser.php

@@ -2,6 +2,7 @@
 
 namespace Anikeen\Id\Helpers;
 
+use Anikeen\Id\AnikeenId;
 use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
 use Illuminate\Auth\AuthenticationException;
@@ -30,6 +31,8 @@ class JwtParser
 
     private function getOauthPublicKey(): bool|string
     {
-        return file_get_contents(dirname(__DIR__, 3) . '/oauth-public.key');
+        return AnikeenId::getMode() === 'staging'
+            ? file_get_contents(dirname(__DIR__, 3) . '/oauth-public.staging.key')
+            : file_get_contents(dirname(__DIR__, 3) . '/oauth-public.key');
     }
 }

src/Id/OauthTrait.php

@@ -23,11 +23,13 @@ trait OauthTrait
                     ],
             ]);
 
-            $result = new Result($response, null, $this);
+            $result = new Result($response, null);
         } catch (RequestException $exception) {
-            $result = new Result($exception->getResponse(), $exception, $this);
+            $result = new Result($exception->getResponse(), $exception);
         }
 
+        $result->anikeenId = $this;
+
         return $result;
     }
-}
+}

src/Id/Resources/BaseCollection.php

@@ -24,7 +24,8 @@ use Throwable;
  * @property Response $response
  * @property null|Throwable $exception
  */
-abstract class BaseCollection implements JsonSerializable
+#[\AllowDynamicProperties]
+abstract class BaseCollection implements JsonSerializable
 {
     private Closure $callable;
     public ?Result $result = null;
@@ -87,4 +88,4 @@ abstract class BaseCollection implements JsonSerializable
     {
         return isset($this->result->{$name});
     }
-}
+}

src/Id/Resources/BaseResource.php

@@ -6,7 +6,8 @@ use Anikeen\Id\Exceptions\ResourceException;
 use Anikeen\Id\Result;
 use JsonSerializable;
 
-abstract class BaseResource implements JsonSerializable
+#[\AllowDynamicProperties]
+abstract class BaseResource implements JsonSerializable
 {
     public Result $result;
 
@@ -53,4 +54,4 @@ abstract class BaseResource implements JsonSerializable
     {
         return false;
     }
-}
+}

src/Id/Resources/Transactions.php

@@ -10,25 +10,12 @@ class Transactions extends BaseCollection
 {
     use HasBillable;
 
-    /**
-     * Create a new transaction for the current user.
-     *
-     * @param array $attributes The attributes for the transaction.
-     * @throws Throwable
-     * @todo Add type hinting for the attributes array.
-     */
-    public function create(array $attributes = []): Transaction
-    {
-        return (new Transaction($this->billable->request('POST', 'v1/transactions', $attributes)))
-            ->setBillable($this->billable);
-    }
-
     /**
      * {@inheritDoc}
      */
     public function find(string $id): ?Transaction
     {
         return (new Transaction(fn() => $this->billable->request('GET', sprintf('v1/transactions/%s', $id))))
-                ->setBillable($this->billable);
+            ->setBillable($this->billable);
     }
 }

src/Id/Socialite/Provider.php

@@ -2,6 +2,7 @@
 
 namespace Anikeen\Id\Socialite;
 
+use Anikeen\Id\AnikeenId;
 use Anikeen\Id\Enums\Scope;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Http\Request;
@@ -32,11 +33,7 @@ class Provider extends AbstractProvider implements ProviderInterface
      */
     protected function getBaseUrl(): string
     {
-        $mode = config('services.anikeen.mode') ?? 'production';
-
-        return $mode === 'staging'
-            ? 'https://staging.id.anikeen.com'
-            : 'https://id.anikeen.com';
+        return app(AnikeenId::class)->getBaseUrl();
     }
 
     /**
@@ -98,4 +95,12 @@ class Provider extends AbstractProvider implements ProviderInterface
             'grant_type' => 'authorization_code',
         ]);
     }
+
+    /**
+     * Returns the user logout url for the provider.
+     */
+    public function getLogoutUrl(string $redirect = null): string
+    {
+        return app(AnikeenId::class)->getBaseUrl() . '/logout?redirect=' . urlencode($redirect ?: '/');
+    }
 }