Merge pull request #2 from herpaderpaldent/dev

Dev

docker-compose.yml

@@ -74,21 +74,5 @@ services:
     depends_on:
       - app
       - mariadb
-    networks:
-      - backend
-
-  ### websocket ################################################
-  websocket:
-    build: .docker/cron
-    restart: always
-    volumes:
-      - ${CODE}:/var/www
-    ports:
-      - 6001:6001
-    depends_on:
-      - app
-      - mariadb
-    environment:
-      CONTAINER_ROLE: websocket
     networks:
       - backend

src/.env.example

@@ -8,13 +8,13 @@ LOG_CHANNEL=stack
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+DB_HOST=mariadb
 DB_PORT=3306
-DB_DATABASE=laravel
-DB_USERNAME=root
-DB_PASSWORD=
+DB_DATABASE=oauth
+DB_USERNAME=default
+DB_PASSWORD=secret
 
-BROADCAST_DRIVER=log
+BROADCAST_DRIVER=pusher
 CACHE_DRIVER=file
 FILESYSTEM_DRIVER=local
 QUEUE_CONNECTION=sync

src/app/Http/Controllers/AuthorizationCodeController.php

@@ -7,10 +7,11 @@
 use App\Events\AuthorizationGranted;
 use App\Models\Client;
 use App\Models\Token;
-use Illuminate\Http\Client\HttpClientException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
+use Inertia\Inertia;
 
 class AuthorizationCodeController
 {
@@ -67,14 +68,15 @@ public function authorize(Request $request)
 
         broadcast(new AuthorizationGranted($client->client_id, array_merge(['method' => 'GET', 'url' => $redirect_url], $redirect_data)));
 
-        return redirect()->to($redirect_url);
+        return Inertia::location($redirect_url);
     }
 
     public function grant(Request $request)
     {
         $validated_data = $request->validate([
             'client_id' => ['required', 'exists:clients,client_id'],
             'client_secret' => ['required', 'exists:clients,client_secret'],
+            'grant_type' => ['required', 'string', Rule::in(['authorization_code'])],
             'code' => ['required', 'string']
         ]);
 

src/app/Http/Middleware/TrustProxies.php

@@ -12,7 +12,7 @@ class TrustProxies extends Middleware
      *
      * @var array|string|null
      */
-    protected $proxies;
+    protected $proxies = '*';
 
     /**
      * The headers that should be used to detect proxies.

src/config/broadcasting.php

@@ -37,11 +37,7 @@
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
                 'cluster' => env('PUSHER_APP_CLUSTER'),
-                //'useTLS' => true,
-                'encrypted' => true,
-                'host' => 'websocket'/*'172.21.0.6'*/, // must be the websocket host
-                'port' => 6001,
-                'scheme' => 'http'
+                'useTLS' => true,
             ],
         ],
 

src/resources/js/bootstrap.js

@@ -29,6 +29,7 @@ window.Pusher = require('pusher-js');
     forceTLS: true
 });*/
 
+/*
 window.Echo = new Echo({
     broadcaster: 'pusher',
     key: 'your-pusher-key',
@@ -37,3 +38,11 @@ window.Echo = new Echo({
     forceTLS: false,
     disableStats: true,
 });
+*/
+
+window.Echo = new Echo({
+    broadcaster: 'pusher',
+    key: process.env.MIX_PUSHER_APP_KEY,
+    cluster: process.env.MIX_PUSHER_APP_CLUSTER,
+    forceTLS: true
+});

src/tests/Feature/AuthorizationCodeTest.php

@@ -69,9 +69,14 @@ public function authorizationGrant() {
         $response = $this->actingAs($user)
             ->post(route('authorize.authorization-code'), [
                 'client_id' => $client->client_id
-            ])->assertRedirect();
+            ]);
+
+        $this->assertEquals(409, $response->status());
+
+        //dd($response->headers->get('x-inertia-location'));
+
+        $return_url = $response->headers->get('x-inertia-location');
 
-        $return_url = $response->headers->get('location');
         $url_arr = parse_url($return_url);
         $query = $url_arr['query'];
 
@@ -96,7 +101,8 @@ public function authorizationGrant() {
         $response = $this->post('/api/authorization-code/token', [
             'client_id' => $client->client_id,
             'client_secret' => $client->client_secret,
-            'code' => $code
+            'code' => $code,
+            'grant_type' => 'authorization_code'
         ])->assertJson(fn(AssertableJson $json) => $json
             ->has('access_token')
             ->has('token_type')