Merge branch 'headers-update' of https://github.com/5pitf1re/seat-dis…

…course into 5pitf1re/headers-update
herpaderpaldent · Apr 17, 2020 · fcb5487 · fcb5487
2 parents 83dca83 + 138ff2e
commit fcb5487
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -3,7 +3,6 @@ preset: laravel
 risky: false
 
 enabled:
-- alpha_ordered_imports
 - concat_with_spaces
 - no_empty_comment
 

diff --git a/src/Action/Discourse/Groups/Create.php b/src/Action/Discourse/Groups/Create.php
@@ -20,17 +20,17 @@ class Create
      * @return string
      * @throws \Herpaderpaldent\Seat\SeatDiscourse\Exceptions\DiscourseGuzzleException
      */
-    public function execute(String $groupname) : string
+    public function execute(string $groupname): string
     {
         $client = new Client();
         try {
             $response = $client->request('POST', getenv('DISCOURSE_URL') . '/admin/groups', [
                 'form_params' => [
-                    'group[name]' => $groupname
+                    'group[name]' => $groupname,
                 ],
                 'headers' => [
-                    'api_key' => getenv('DISCOURSE_API_KEY'),
-                    'api_username' => getenv('DISCOURSE_API_USERNAME'),
+                    'api-key' => getenv('DISCOURSE_API_KEY'),
+                    'api-username' => getenv('DISCOURSE_API_USERNAME'),
                 ],
             ]);
 

diff --git a/src/Action/Discourse/Groups/Delete.php b/src/Action/Discourse/Groups/Delete.php
@@ -26,8 +26,8 @@ public function execute(int $group_id)
         try {
             $response = $client->request('DELETE', getenv('DISCOURSE_URL') . '/admin/groups/' . $group_id . '.json', [
                 'headers' => [
-                    'api_key'      => getenv('DISCOURSE_API_KEY'),
-                    'api_username' => getenv('DISCOURSE_API_USERNAME'),
+                    'api-key'      => getenv('DISCOURSE_API_KEY'),
+                    'api-username' => getenv('DISCOURSE_API_USERNAME'),
                 ],
             ]);
 

diff --git a/src/Action/Discourse/Groups/Get.php b/src/Action/Discourse/Groups/Get.php
@@ -20,14 +20,14 @@ class Get
      * @return \Illuminate\Support\Collection
      * @throws \Herpaderpaldent\Seat\SeatDiscourse\Exceptions\DiscourseGuzzleException
      */
-    public function execute() : Collection
+    public function execute(): Collection
     {
         $client = new Client();
         try {
             $response = $client->request('GET', getenv('DISCOURSE_URL') . '/groups/search.json', [
                 'headers' => [
-                    'api_key' => getenv('DISCOURSE_API_KEY'),
-                    'api_username' => getenv('DISCOURSE_API_USERNAME'),
+                    'api-key' => getenv('DISCOURSE_API_KEY'),
+                    'api-username' => getenv('DISCOURSE_API_USERNAME'),
                 ],
             ]);
 

diff --git a/src/Action/Discourse/Users/GetUserByCharacterId.php b/src/Action/Discourse/Users/GetUserByCharacterId.php
@@ -19,8 +19,8 @@ public function execute(int $id)
         try {
             $response = $client->request('GET', getenv('DISCOURSE_URL') . '/users/by-external/' . $id . '.json', [
                 'headers' => [
-                    'api_key' => getenv('DISCOURSE_API_KEY'),
-                    'api_username' => getenv('DISCOURSE_API_USERNAME'),
+                    'api-key' => getenv('DISCOURSE_API_KEY'),
+                    'api-username' => getenv('DISCOURSE_API_USERNAME'),
                 ],
             ]);
 

diff --git a/src/Action/Discourse/Users/ListUsers.php b/src/Action/Discourse/Users/ListUsers.php
@@ -26,8 +26,8 @@ public function execute()
                     'show_emails' => 'true',
                 ],
                 'headers' => [
-                    'api_key' => getenv('DISCOURSE_API_KEY'),
-                    'api_username' => getenv('DISCOURSE_API_USERNAME'),
+                    'api-key' => getenv('DISCOURSE_API_KEY'),
+                    'api-username' => getenv('DISCOURSE_API_USERNAME'),
                 ],
             ]);
 

diff --git a/src/Jobs/Logout.php b/src/Jobs/Logout.php
@@ -85,8 +85,8 @@ public function handle()
             try {
                 $response = $this->client->request('POST', getenv('DISCOURSE_URL') . '/admin/users/' . $this->discourse_user_id . '/log_out', [
                     'headers' => [
-                        'api_key' => getenv('DISCOURSE_API_KEY'),
-                        'api_username' => getenv('DISCOURSE_API_USERNAME'),
+                        'api-key' => getenv('DISCOURSE_API_KEY'),
+                        'api-username' => getenv('DISCOURSE_API_USERNAME'),
                     ],
                 ]);
 
@@ -109,8 +109,8 @@ public function beforeStart()
 
         $response = $this->client->request('GET', $uri, [
             'headers' => [
-                'api_key' => getenv('DISCOURSE_API_KEY'),
-                'api_username' => getenv('DISCOURSE_API_USERNAME'),
+                'api-key' => getenv('DISCOURSE_API_KEY'),
+                'api-username' => getenv('DISCOURSE_API_USERNAME'),
             ],
         ]);