From f73a5587dc33ac051644800c5a3060be818e597e Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sat, 28 Nov 2020 19:02:37 +0000
Subject: [PATCH] No longer need our own token exception

---
 app/Exceptions/InvalidTokenException.php      | 13 --------
 app/Http/Controllers/MicropubController.php   |  2 --
 .../Controllers/MicropubMediaController.php   |  1 -
 app/Services/TokenService.php                 |  1 -
 tests/Feature/TokenServiceTest.php            | 31 ++++++++++---------
 5 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 app/Exceptions/InvalidTokenException.php

diff --git a/app/Exceptions/InvalidTokenException.php b/app/Exceptions/InvalidTokenException.php
deleted file mode 100644
index 8184cfa7..00000000
--- a/app/Exceptions/InvalidTokenException.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class InvalidTokenException extends Exception
-{
-    public function __construct($message, $code = 0, Exception $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-    }
-}
diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index 50fba921..76cf9610 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers;
 
-use App\Exceptions\InvalidTokenException;
 use App\Http\Responses\MicropubResponses;
 use App\Models\Place;
 use App\Services\Micropub\{HCardService, HEntryService, UpdateService};
@@ -39,7 +38,6 @@ class MicropubController extends Controller
      * then passes over the info to the relevant Service class.
      *
      * @return JsonResponse
-     * @throws InvalidTokenException
      */
     public function post(): JsonResponse
     {
diff --git a/app/Http/Controllers/MicropubMediaController.php b/app/Http/Controllers/MicropubMediaController.php
index d24c2c99..3aafa023 100644
--- a/app/Http/Controllers/MicropubMediaController.php
+++ b/app/Http/Controllers/MicropubMediaController.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers;
 
-use App\Exceptions\InvalidTokenException;
 use App\Http\Responses\MicropubResponses;
 use App\Jobs\ProcessMedia;
 use App\Models\Media;
diff --git a/app/Services/TokenService.php b/app/Services/TokenService.php
index 056f547a..11f25efd 100644
--- a/app/Services/TokenService.php
+++ b/app/Services/TokenService.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\Exceptions\InvalidTokenException;
 use App\Jobs\AddClientToDatabase;
 use DateTimeImmutable;
 use Lcobucci\JWT\{Configuration, Token};
diff --git a/tests/Feature/TokenServiceTest.php b/tests/Feature/TokenServiceTest.php
index dfd2e3ae..1d87b73f 100644
--- a/tests/Feature/TokenServiceTest.php
+++ b/tests/Feature/TokenServiceTest.php
@@ -2,11 +2,12 @@
 
 namespace Tests\Feature;
 
+use DateTimeImmutable;
+use Lcobucci\JWT\Configuration;
+use Lcobucci\JWT\Signer\Key\InMemory;
+use Lcobucci\JWT\Validation\RequiredConstraintsViolated;
 use Tests\TestCase;
-use Lcobucci\JWT\Builder;
 use App\Services\TokenService;
-use Lcobucci\JWT\Signer\Hmac\Sha256;
-use App\Exceptions\InvalidTokenException;
 
 class TokenServiceTest extends TestCase
 {
@@ -36,24 +37,26 @@ class TokenServiceTest extends TestCase
 
     public function test_token_with_different_signing_key_throws_exception()
     {
-        $this->expectException(InvalidTokenException::class);
-        $this->expectExceptionMessage('Token failed validation');
+        $this->expectException(RequiredConstraintsViolated::class);
 
         $data = [
             'me' => 'https://example.org',
             'client_id' => 'https://quill.p3k.io',
             'scope' => 'post'
         ];
-        $signer = new Sha256();
-        $token = (new Builder())->set('me', $data['me'])
-            ->set('client_id', $data['client_id'])
-            ->set('scope', $data['scope'])
-            ->set('date_issued', time())
-            ->set('nonce', bin2hex(random_bytes(8)))
-            ->sign($signer, 'r4ndomk3y')
-            ->getToken();
+
+        $config = resolve(Configuration::class);
+
+        $token = $config->builder()
+            ->issuedAt(new DateTimeImmutable())
+            ->withClaim('client_id', $data['client_id'])
+            ->withClaim('me', $data['me'])
+            ->withClaim('scope', $data['scope'])
+            ->withClaim('nonce', bin2hex(random_bytes(8)))
+            ->getToken($config->signer(), InMemory::plainText('r4andomk3y'))
+            ->toString();
 
         $service = new TokenService();
-        $token = $service->validateToken($token);
+        $service->validateToken($token);
     }
 }