Switch to the new Authorization Service hostname (https://api.npr.org/authorization/ -> https://authorization.api.npr.org) - closes DIG-9202

Author: xiehan

docs/NPR-One-Interfaces-ConfigInterface.md

@@ -66,14 +66,14 @@ grant type. Currently, client credentials tokens never expire, so hard-coding it
 
 
 
-### getNprApiHost
+### getNprAuthorizationServiceHost
 
-    string NPR\One\Interfaces\ConfigInterface::getNprApiHost()
-
-Returns the NPR One API Hostname, useful for testing on staging environments. Most consumers will want to
-hard-code this to always return `https://api.npr.org`. Please do not include a trailing slash.
+    string NPR\One\Interfaces\ConfigInterface::getNprAuthorizationServiceHost()
 
+Returns the NPR One Authorization Service hostname, useful for testing on staging environments.
 
+Most consumers will want to hard-code this to always return `https://authorization.api.npr.org`.
+Please do not include a trailing slash.
 
 * Visibility: **public**
 

examples/ConfigProvider.php

@@ -35,7 +35,7 @@ public function getClientCredentialsToken()
     /**
      * @inheritdoc
      */
-    public function getNprApiHost()
+    public function getNprAuthorizationServiceHost()
     {
         return 'https://api.npr.org';
     }

src/Controllers/AbstractOAuth2Controller.php

@@ -225,7 +225,7 @@ final protected function createAccessToken($grantType, $additionalParams = [])
 
         /** @var Client $client */
         $client = DI::container()->get(Client::class);
-        $response = $client->request('POST', $this->config->getNprApiHost() . '/authorization/v2/token', [
+        $response = $client->request('POST', $this->config->getNprAuthorizationServiceHost() . '/v2/token', [
             'headers'     => $this->headers,
             'form_params' => array_merge([
                 'client_id'     => $this->config->getClientId(),

src/Controllers/AuthCodeController.php

@@ -111,7 +111,7 @@ public function startAuthorizationGrant(array $scopes)
             'scope'         => join(' ', $scopes)
         ];
 
-        return $this->getConfigProvider()->getNprApiHost() . '/authorization/v2/authorize?' . http_build_query($queryParams);
+        return $this->getConfigProvider()->getNprAuthorizationServiceHost() . '/v2/authorize?' . http_build_query($queryParams);
     }
 
     /**

src/Controllers/DeviceCodeController.php

@@ -85,7 +85,7 @@ private function createDeviceCode(array $scopes)
     {
         /** @var Client $client */
         $client = DI::container()->get(Client::class);
-        $response = $client->request('POST', $this->getConfigProvider()->getNprApiHost() . '/authorization/v2/device', [
+        $response = $client->request('POST', $this->getConfigProvider()->getNprAuthorizationServiceHost() . '/v2/device', [
             'headers'     => $this->getHeaders(),
             'form_params' => [
                 'client_id'     => $this->getConfigProvider()->getClientId(),

src/Controllers/LogoutController.php

@@ -75,7 +75,7 @@ private function revokeToken($token, $isRefreshToken = false)
 
         /** @var Client $client */
         $client = DI::container()->get(Client::class);
-        $response = $client->request('POST', $this->getConfigProvider()->getNprApiHost() . '/authorization/v2/token/revoke', [
+        $response = $client->request('POST', $this->getConfigProvider()->getNprAuthorizationServiceHost() . '/v2/token/revoke', [
             'headers'     => [
                 'Authorization' => 'Bearer ' . $this->getConfigProvider()->getClientCredentialsToken()
             ],

src/Interfaces/ConfigInterface.php

@@ -42,12 +42,13 @@ public function getClientSecret();
     public function getClientCredentialsToken();
 
     /**
-     * Returns the NPR One API Hostname, useful for testing on staging environments. Most consumers will want to
-     * hard-code this to always return `https://api.npr.org`. Please do not include a trailing slash.
+     * Returns the NPR One Authorization Service hostname, useful for testing on staging environments.
+     * Most consumers will want to hard-code this to always return `https://authorization.api.npr.org`.
+     * Please do not include a trailing slash.
      *
      * @return string
      */
-    public function getNprApiHost();
+    public function getNprAuthorizationServiceHost();
 
     /**
      * Returns the host (or path) of the NPR One application (the client/frontend). This is where the `authorization_code`

tests/unit/AuthCodeControllerTests.php

@@ -52,7 +52,7 @@ public function setUp()
 
         $this->mockConfig = $this->getMock(ConfigInterface::class);
         $this->mockConfig->method('getClientId')->willReturn(self::$clientId);
-        $this->mockConfig->method('getNprApiHost')->willReturn('https://api.npr.org');
+        $this->mockConfig->method('getNprAuthorizationServiceHost')->willReturn('https://authorization.api.npr.org');
         $this->mockConfig->method('getClientUrl')->willReturn('https://one.example.com');
         $this->mockConfig->method('getAuthCodeCallbackUrl')->willReturn('https://one.example.com/oauth2/callback');
         $this->mockConfig->method('getCookieDomain')->willReturn('.example.com');
@@ -170,7 +170,7 @@ public function testStartAuthorizationGrant()
 
         $url = $controller->startAuthorizationGrant(['fake_scope']);
 
-        $this->assertContains('/authorization/v2/authorize', $url);
+        $this->assertContains('/v2/authorize', $url);
         $this->assertContains('client_id=' . self::$clientId, $url);
         $this->assertContains('redirect_uri=', $url);
         $this->assertContains('state=', $url);

tests/unit/CustomControllerTests.php

@@ -42,7 +42,7 @@ public function setUp()
 
         $this->mockConfig = $this->getMock(ConfigInterface::class);
         $this->mockConfig->method('getClientId')->willReturn(self::$clientId);
-        $this->mockConfig->method('getNprApiHost')->willReturn('https://api.npr.org');
+        $this->mockConfig->method('getNprAuthorizationServiceHost')->willReturn('https://authorization.api.npr.org');
         $this->mockConfig->method('getCookieDomain')->willReturn('.example.com');
         $this->mockConfig->method('getEncryptionSalt')->willReturn('asYh&%D9ne!j8HKQ');
 

tests/unit/DeviceCodeControllerTests.php

@@ -44,7 +44,7 @@ public function setUp()
 
         $this->mockConfig = $this->getMock(ConfigInterface::class);
         $this->mockConfig->method('getClientId')->willReturn(self::$clientId);
-        $this->mockConfig->method('getNprApiHost')->willReturn('https://api.npr.org');
+        $this->mockConfig->method('getNprAuthorizationServiceHost')->willReturn('https://authorization.api.npr.org');
         $this->mockConfig->method('getCookieDomain')->willReturn('.example.com');
         $this->mockConfig->method('getEncryptionSalt')->willReturn('asYh&%D9ne!j8HKQ');