deprecate apps (#6)

* add support for deprecating applications

* update project resource

Author: Dotunj

README.md

@@ -27,55 +27,29 @@ use Convoy\Convoy;
 $convoy = new Convoy(["api_key" => "your_api_key"]);
 ```
 
-The SDK also supports authenticating via Basic Auth by defining your username and password.
+### Create an Endpoint
 
-```php
-$convoy = new Convoy(["username" => "default", "password" => "default"]);
-```
-
-In the event you're using a self hosted convoy instance, you can define the url as part of what is passed into convoy's constructor.
-
-```php
-$convoy = new Convoy([
-    "api_key" => "your_api_key",
-    "uri" => "self-hosted-instance"
-]);
-```
-
-### Creating an Application
-
-An application represents a user's application trying to receive webhooks. Once you create an application, you'll receive a `uid` as part of the response that you should save and supply in subsequent API calls to perform other requests such as creating an event.
-
-```php
-$appData = ["name" => "my_app", "support_email" => "support@myapp.com"];
-
-$response = $convoy->applications()->create($appData);
-
-$appId = $response['data']['uid'];
-```
-
-### Add Application Endpoint
-
-After creating an application, you'll need to add an endpoint to the application you just created. An endpoint represents a target URL to receive events.
+An endpoint represents a target URL to receive events.
 
 ```php
 $endpointData = [
+    "name" => "Default Endpoint",
     "url" => "https://0d87-102-89-2-172.ngrok.io",
     "description" => "Default Endpoint",
     "secret" => "endpoint-secret",
     "events" => ["*"]
 ]
 
-$response = $convoy->endpoints()->create($appId, $endpointData);
+$response = $convoy->endpoints()->create($endpointData);
 ```
 
 ### Sending an Event
 
-To send an event, you'll need the `uid` from the application we created earlier.
+To send an event, you'll need the `uid` from the endpoint we created earlier.
 
 ```php
 $eventData = [
-    "app_id" => $appId,
+    "endpoint_id" => $endpointId,
     "event_type" => "payment.success",
     "data" => [
         "event" => "payment.success",

src/Api/Endpoint.php

@@ -4,28 +4,28 @@
 
 class Endpoint extends AbstractApi
 {
-    public function all(string $appId, array $parameters = []): array
+    public function all(array $parameters = []): array
     {
-        return $this->httpGet(sprintf('/applications/%s/endpoints', $appId), $parameters);
+        return $this->httpGet('/endpoints', $parameters);
     }
 
-    public function create(string $appId, array $data, array $parameters): array
+    public function create(array $data, array $parameters): array
     {
-        return $this->httpPost(sprintf('/applications/%s/endpoints', $appId), $data, $parameters);
+        return $this->httpPost('/endpoints', $data, $parameters);
     }
 
-    public function find(string $appId, string $endpointId, array $parameters = []): array
+    public function find(string $endpointId, array $parameters = []): array
     {
-        return $this->httpGet(sprintf('/applications/%s/endpoints/%s', $appId, $endpointId), $parameters);
+        return $this->httpGet(sprintf('/endpoints/%s', $endpointId), $parameters);
     }
 
-    public function update(string $appId, string $endpointId, array $data, array $parameters = []): array
+    public function update(string $endpointId, array $data, array $parameters = []): array
     {
-        return $this->httpPut(sprintf('/applications/%s/endpoints/%s', $appId, $endpointId), $data, $parameters);
+        return $this->httpPut(sprintf('/endpoints/%s', $endpointId), $data, $parameters);
     }
 
-    public function delete(string $appId, string $endpointId, array $data = [], array $parameters = []): array
+    public function delete(string $endpointId, array $data = [], array $parameters = []): array
     {
-        return $this->httpDelete(sprintf('/applications/%s/endpoints/%s', $appId, $endpointId), $data, $parameters);
+        return $this->httpDelete(sprintf('/endpoints/%s', $endpointId), $data, $parameters);
     }
 }

src/Api/Group.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Convoy\Api;
+
+class Project extends AbstractApi
+{
+    public function find(array $parameters = []): array
+    {
+        return $this->httpGet("/", $parameters);
+    }
+
+    public function update(array $data, array $parameters = []): array
+    {
+        return $this->httpPut("/", $data, $parameters);
+    }
+
+    public function delete(array $data = [], array $parameters = []): array
+    {
+        return $this->httpDelete("/", $data, $parameters);
+    }
+}

src/Api/Project.php

@@ -2,12 +2,11 @@
 
 namespace Convoy;
 
-use Convoy\Api\Application;
 use Convoy\Api\DeliveryAttempt;
 use Convoy\Api\Endpoint;
 use Convoy\Api\Event;
 use Convoy\Api\EventDelivery;
-use Convoy\Api\Group;
+use Convoy\Api\Project;
 use Convoy\Api\Source;
 use Convoy\Api\Subscription;
 use Convoy\HttpClient\ClientBuilder;
@@ -47,14 +46,9 @@ public function getHttpClient(): HttpMethodsClientInterface
         return $this->clientBuilder->getHttpClient();
     }
 
-    public function groups(): Group
+    public function projects(): Project
     {
-        return new Group($this->getHttpClient());
-    }
-
-    public function applications(): Application
-    {
-        return new Application($this->getHttpClient());
+        return new Project($this->getHttpClient());
     }
 
     public function events(): Event

src/Convoy.php

@@ -31,9 +31,8 @@ private function configureDefaultOptions(OptionsResolver $resolver): void
             'client_builder' => new ClientBuilder(),
             'uri_factory' => Psr17FactoryDiscovery::findUriFactory(),
             'uri' => self::URI,
+            'project_id' => '',
             'api_key' => '',
-            'username' => '',
-            'password' => '',
         ]);
 
 
@@ -44,8 +43,7 @@ private function setAllowedTypes(OptionsResolver $resolver): void
     {
         $resolver->setAllowedTypes('uri', 'string');
         $resolver->setAllowedTypes('api_key', 'string');
-        $resolver->setAllowedTypes('username', 'string');
-        $resolver->setAllowedTypes('password', 'string');
+        $resolver->setAllowedTypes('project_id', 'string');
         $resolver->setAllowedTypes('client_builder', ClientBuilder::class);
         $resolver->setAllowedTypes('uri_factory', UriFactoryInterface::class);
     }
@@ -62,35 +60,18 @@ public function getUriFactory(): UriFactoryInterface
 
     public function getUri(): UriInterface
     {
-        return $this->getUriFactory()->createUri($this->config['uri']);
+        $uri = sprintf('%s/projects/%s', $this->config['uri'], $this->config['project_id']);
+        
+        return $this->getUriFactory()->createUri($uri);
     }
 
     public function getApiKey(): string
     {
         return $this->config['api_key'];
     }
 
-    public function getUsername(): string
-    {
-        return $this->config['username'];
-    }
-
-    public function getPassword(): string
-    {
-        return $this->config['password'];
-    }
-
-    public function isBearerTokenAuthentication(): bool
-    {
-        return array_key_exists('api_key', $this->config) && ! empty($this->config['api_key']);
-    }
-
     public function getAuthenticationPlugin(): Authentication
     {
-        if ($this->isBearerTokenAuthentication()) {
-            return new Bearer($this->getApiKey());
-        }
-
-        return new BasicAuth($this->getUsername(), $this->getPassword());
+        return new Bearer($this->getApiKey());
     }
 }