Stop bypassing the organization endpoint for subscriptions (#1532)

Author: pjcdawkins

go-tests/project_create_test.go

@@ -44,6 +44,8 @@ func TestProjectCreate(t *testing.T) {
 	assert.Contains(t, stdErr, "Project ID: "+projectID)
 	assert.Contains(t, stdErr, "Project title: "+title)
 	assert.Contains(t, stdErr, "Console URL: "+consoleURL)
+
+	f.Run("subscription:info", "-p", projectID)
 }
 
 func TestProjectCreate_CanCreateError(t *testing.T) {

src/Command/SubscriptionInfoCommand.php

@@ -45,7 +45,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $id = $project->getSubscriptionId();
         }
 
-        $subscription = $this->api()->loadSubscription($id, $project, $input->getArgument('value') !== null);
+        $subscription = $this->api()->loadSubscription($id, $project);
         if (!$subscription) {
             $this->stdErr->writeln(sprintf('Subscription not found: <error>%s</error>', $id));
 

src/Service/Api.php

@@ -1438,14 +1438,13 @@ private function on403(ErrorEvent $event)
      *
      * @param string $id
      * @param Project|null $project
-     * @param bool $forWrite
      *
      * @throws \GuzzleHttp\Exception\RequestException
      *
      * @return false|Subscription
      *   The subscription or false if not found.
      */
-    public function loadSubscription($id, Project $project = null, $forWrite = true)
+    public function loadSubscription($id, Project $project = null)
     {
         $organizations_enabled = $this->config->getWithDefault('api.organizations', false);
         if (!$organizations_enabled) {
@@ -1454,25 +1453,6 @@ public function loadSubscription($id, Project $project = null, $forWrite = true)
             return $this->getClient()->getSubscription($id);
         }
 
-        // Attempt to load the subscription directly.
-        // This is possible if the user is on the project's access list, or
-        // if the user has access to all subscriptions.
-        // However, while this legacy API works for reading, it won't always work for writing.
-        if (!$forWrite) {
-            try {
-                $subscription = $this->getClient()->getSubscription($id);
-            } catch (BadResponseException $e) {
-                if (!$e->getResponse() || $e->getResponse()->getStatusCode() !== 403) {
-                    throw $e;
-                }
-                $subscription = false;
-            }
-            if ($subscription) {
-                $this->debug('Loaded the subscription directly');
-                return $subscription;
-            }
-        }
-
         // Use the project's organization, if known.
         $organizationId = null;
         if (isset($project)) {