Merge pull request #158 from packbackbooks/lti-157-aud

Fix LtiServiceConnector aud

Author: dbhynds

src/LtiServiceConnector.php

@@ -45,7 +45,7 @@ public function getAccessToken(ILtiRegistration $registration, array $scopes): s
         $jwtClaim = [
             'iss' => $clientId,
             'sub' => $clientId,
-            'aud' => $registration->getAuthServer(),
+            'aud' => [$registration->getAuthTokenUrl()],
             'iat' => time() - 5,
             'exp' => time() + 60,
             'jti' => 'lti-service-token'.hash('sha256', random_bytes(64)),

tests/Certification/Lti13CertificationTest.php

@@ -145,7 +145,7 @@ class Lti13CertificationTest extends TestCase
     private $cookie;
     private $serviceConnector;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->issuer = [
             'id' => 'issuer_id',
@@ -283,7 +283,7 @@ public function buildJWT($data, $header)
     }
 
     // tests
-    public function testLtiVersionPassedIsNot13()
+    public function test_lti_version_passed_is_not13()
     {
         $payload = $this->payload;
         $payload[LtiConstants::VERSION] = 'not-1.3';
@@ -293,7 +293,7 @@ public function testLtiVersionPassedIsNot13()
         $this->launch($payload);
     }
 
-    public function testNoLtiVersionPassedIsInJwt()
+    public function test_no_lti_version_passed_is_in_jwt()
     {
         $payload = $this->payload;
         unset($payload[LtiConstants::VERSION]);
@@ -303,7 +303,7 @@ public function testNoLtiVersionPassedIsInJwt()
         $this->launch($payload);
     }
 
-    public function testJwtPassedIsNotLti13Jwt()
+    public function test_jwt_passed_is_not_lti13_jwt()
     {
         $jwt = $this->buildJWT([], $this->issuer);
         $jwt_r = explode('.', $jwt);
@@ -322,7 +322,7 @@ public function testJwtPassedIsNotLti13Jwt()
             ->initialize($params);
     }
 
-    public function testExpAndIatFieldsInvalid()
+    public function test_exp_and_iat_fields_invalid()
     {
         $payload = $this->payload;
         $payload['exp'] = Carbon::now()->subYear()->timestamp;
@@ -333,7 +333,7 @@ public function testExpAndIatFieldsInvalid()
         $this->launch($payload);
     }
 
-    public function testMessageTypeClaimMissing()
+    public function test_message_type_claim_missing()
     {
         $payload = $this->payload;
         unset($payload[LtiConstants::MESSAGE_TYPE]);
@@ -343,7 +343,7 @@ public function testMessageTypeClaimMissing()
         $this->launch($payload);
     }
 
-    public function testRoleClaimMissing()
+    public function test_role_claim_missing()
     {
         $payload = $this->payload;
         unset($payload[LtiConstants::ROLES]);
@@ -353,7 +353,7 @@ public function testRoleClaimMissing()
         $this->launch($payload);
     }
 
-    public function testDeploymentIdClaimMissing()
+    public function test_deployment_id_claim_missing()
     {
         $payload = $this->payload;
         unset($payload[LtiConstants::DEPLOYMENT_ID]);
@@ -363,7 +363,7 @@ public function testDeploymentIdClaimMissing()
         $this->launch($payload);
     }
 
-    public function testLti1p1MigrationSuccessfullyMakesDeployment()
+    public function test_lti1p1_migration_successfully_makes_deployment()
     {
         $payload = $this->payload;
         $db = $this->migrateDb;
@@ -394,7 +394,7 @@ public function testLti1p1MigrationSuccessfullyMakesDeployment()
         $this->assertInstanceOf(LtiMessageLaunch::class, $launch);
     }
 
-    public function testDoesNotMigrate1p1IfMissingOauthKeySign()
+    public function test_does_not_migrate1p1_if_missing_oauth_key_sign()
     {
         $payload = $this->payload;
         $db = $this->migrateDb;
@@ -417,7 +417,7 @@ public function testDoesNotMigrate1p1IfMissingOauthKeySign()
         $this->launch($payload, $db);
     }
 
-    public function testDoesNotMigrate1p1IfOauthKeySignDoesntMatch()
+    public function test_does_not_migrate1p1_if_oauth_key_sign_doesnt_match()
     {
         $payload = $this->payload;
         $db = $this->migrateDb;
@@ -441,7 +441,7 @@ public function testDoesNotMigrate1p1IfOauthKeySignDoesntMatch()
         $ltiMessageLaunch = $this->launch($payload, $db);
     }
 
-    public function testLaunchWithMissingResourceLinkId()
+    public function test_launch_with_missing_resource_link_id()
     {
         $payload = $this->payload;
         unset($payload['sub']);
@@ -451,7 +451,7 @@ public function testLaunchWithMissingResourceLinkId()
         $this->launch($payload);
     }
 
-    public function testInvalidCertificationCases()
+    public function test_invalid_certification_cases()
     {
         $testCasesDir = static::CERT_DATA_DIR.'invalid';
 
@@ -530,7 +530,7 @@ public function testInvalidCertificationCases()
         $this->assertEquals($casesCount, $testedCases);
     }
 
-    public function testValidCertificationCases()
+    public function test_valid_certification_cases()
     {
         $testCasesDir = static::CERT_DATA_DIR.'valid';
 

tests/DeepLinkResources/DateTimeIntervalTest.php

@@ -13,33 +13,33 @@ class DateTimeIntervalTest extends TestCase
     private DateTime $initialEnd;
     private DateTimeInterval $dateTimeInterval;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->initialStart = date_create();
         $this->initialEnd = date_create();
         $this->dateTimeInterval = new DateTimeInterval($this->initialStart, $this->initialEnd);
     }
 
-    public function testItInstantiates()
+    public function test_it_instantiates()
     {
         $this->assertInstanceOf(DateTimeInterval::class, $this->dateTimeInterval);
     }
 
-    public function testItCreatesANewInstance()
+    public function test_it_creates_a_new_instance()
     {
         $DeepLinkResources = DateTimeInterval::new();
 
         $this->assertInstanceOf(DateTimeInterval::class, $DeepLinkResources);
     }
 
-    public function testItGetsStart()
+    public function test_it_gets_start()
     {
         $result = $this->dateTimeInterval->getStart();
 
         $this->assertEquals($this->initialStart, $result);
     }
 
-    public function testItSetsStart()
+    public function test_it_sets_start()
     {
         $expected = date_create('+1 day');
 
@@ -49,14 +49,14 @@ public function testItSetsStart()
         $this->assertEquals($expected, $this->dateTimeInterval->getStart());
     }
 
-    public function testItGetsEnd()
+    public function test_it_gets_end()
     {
         $result = $this->dateTimeInterval->getEnd();
 
         $this->assertEquals($this->initialEnd, $result);
     }
 
-    public function testItSetsEnd()
+    public function test_it_sets_end()
     {
         $expected = date_create('+1 day');
 
@@ -66,7 +66,7 @@ public function testItSetsEnd()
         $this->assertEquals($expected, $this->dateTimeInterval->getEnd());
     }
 
-    public function testItThrowsExceptionWhenCreatingArrayWithBothPropertiesNull()
+    public function test_it_throws_exception_when_creating_array_with_both_properties_null()
     {
         $this->dateTimeInterval->setStart(null);
         $this->dateTimeInterval->setEnd(null);
@@ -77,7 +77,7 @@ public function testItThrowsExceptionWhenCreatingArrayWithBothPropertiesNull()
         $this->dateTimeInterval->toArray();
     }
 
-    public function testItThrowsExceptionWhenCreatingArrayWithInvalidTimeInterval()
+    public function test_it_throws_exception_when_creating_array_with_invalid_time_interval()
     {
         $this->dateTimeInterval->setStart(date_create());
         $this->dateTimeInterval->setEnd(date_create('-1 day'));
@@ -88,7 +88,7 @@ public function testItThrowsExceptionWhenCreatingArrayWithInvalidTimeInterval()
         $this->dateTimeInterval->toArray();
     }
 
-    public function testItCreatesArrayWithDefinedOptionalProperties()
+    public function test_it_creates_array_with_defined_optional_properties()
     {
         $expectedStart = date_create('+1 day');
         $expectedEnd = date_create('+2 days');

tests/DeepLinkResources/IconTest.php

@@ -9,32 +9,32 @@ class IconTest extends TestCase
 {
     private $imageUrl;
     private $icon;
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->imageUrl = 'https://example.com/image.png';
         $this->icon = new Icon($this->imageUrl, 1, 2);
     }
 
-    public function testItInstantiates()
+    public function test_it_instantiates()
     {
         $this->assertInstanceOf(Icon::class, $this->icon);
     }
 
-    public function testItCreatesANewInstance()
+    public function test_it_creates_a_new_instance()
     {
         $DeepLinkResources = Icon::new($this->imageUrl, 100, 200);
 
         $this->assertInstanceOf(Icon::class, $DeepLinkResources);
     }
 
-    public function testItGetsUrl()
+    public function test_it_gets_url()
     {
         $result = $this->icon->getUrl();
 
         $this->assertEquals($this->imageUrl, $result);
     }
 
-    public function testItSetsUrl()
+    public function test_it_sets_url()
     {
         $expected = 'expected';
 
@@ -43,14 +43,14 @@ public function testItSetsUrl()
         $this->assertEquals($expected, $this->icon->getUrl());
     }
 
-    public function testItGetsWidth()
+    public function test_it_gets_width()
     {
         $result = $this->icon->getWidth();
 
         $this->assertEquals(1, $result);
     }
 
-    public function testItSetsWidth()
+    public function test_it_sets_width()
     {
         $expected = 300;
 
@@ -59,14 +59,14 @@ public function testItSetsWidth()
         $this->assertEquals($expected, $this->icon->getWidth());
     }
 
-    public function testItGetsHeight()
+    public function test_it_gets_height()
     {
         $result = $this->icon->getHeight();
 
         $this->assertEquals(2, $result);
     }
 
-    public function testItSetsHeight()
+    public function test_it_sets_height()
     {
         $expected = 400;
 
@@ -75,7 +75,7 @@ public function testItSetsHeight()
         $this->assertEquals($expected, $this->icon->getHeight());
     }
 
-    public function testItCreatesArray()
+    public function test_it_creates_array()
     {
         $expected = [
             'url' => $this->imageUrl,

tests/DeepLinkResources/IframeTest.php

@@ -12,7 +12,7 @@ class IframeTest extends TestCase
     public const INITIAL_HEIGHT = 2;
     private Iframe $iframe;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->iframe = new Iframe(
             self::INITIAL_SRC,
@@ -21,26 +21,26 @@ public function setUp(): void
         );
     }
 
-    public function testItInstantiates()
+    public function test_it_instantiates()
     {
         $this->assertInstanceOf(Iframe::class, $this->iframe);
     }
 
-    public function testItCreatesANewInstance()
+    public function test_it_creates_a_new_instance()
     {
         $DeepLinkResources = Iframe::new();
 
         $this->assertInstanceOf(Iframe::class, $DeepLinkResources);
     }
 
-    public function testItGetsWidth()
+    public function test_it_gets_width()
     {
         $result = $this->iframe->getWidth();
 
         $this->assertEquals(self::INITIAL_WIDTH, $result);
     }
 
-    public function testItSetsWidth()
+    public function test_it_sets_width()
     {
         $expected = 300;
 
@@ -50,14 +50,14 @@ public function testItSetsWidth()
         $this->assertEquals($expected, $this->iframe->getWidth());
     }
 
-    public function testItGetsHeight()
+    public function test_it_gets_height()
     {
         $result = $this->iframe->getHeight();
 
         $this->assertEquals(self::INITIAL_HEIGHT, $result);
     }
 
-    public function testItSetsHeight()
+    public function test_it_sets_height()
     {
         $expected = 400;
 
@@ -67,14 +67,14 @@ public function testItSetsHeight()
         $this->assertEquals($expected, $this->iframe->getHeight());
     }
 
-    public function testItGetsSrc()
+    public function test_it_gets_src()
     {
         $result = $this->iframe->getSrc();
 
         $this->assertEquals(self::INITIAL_SRC, $result);
     }
 
-    public function testItSetsSrc()
+    public function test_it_sets_src()
     {
         $expected = 'https://example.com/foo/bar';
 
@@ -84,7 +84,7 @@ public function testItSetsSrc()
         $this->assertEquals($expected, $this->iframe->getSrc());
     }
 
-    public function testItCreatesArrayWithoutOptionalProperties()
+    public function test_it_creates_array_without_optional_properties()
     {
         $this->iframe->setWidth(null);
         $this->iframe->setHeight(null);
@@ -95,7 +95,7 @@ public function testItCreatesArrayWithoutOptionalProperties()
         $this->assertEquals([], $result);
     }
 
-    public function testItCreatesArrayWithDefinedOptionalProperties()
+    public function test_it_creates_array_with_defined_optional_properties()
     {
         $expected = [
             'width' => 100,