Support new user invitations

Author: pjcdawkins

composer.json

@@ -8,7 +8,7 @@
         "guzzlehttp/guzzle": "^5.3",
         "guzzlehttp/ringphp": "^1.1",
         "platformsh/console-form": ">=0.0.24 <2.0",
-        "platformsh/client": ">=0.33.0 <2.0",
+        "platformsh/client": ">=0.35.2 <2.0",
         "symfony/console": "^3.0 >=3.2",
         "symfony/yaml": "^3.0 || ^2.6",
         "symfony/finder": "^3.0",

composer.lock

@@ -149,6 +149,9 @@ api:
   # Overridden by {application.env_prefix}AUTO_LOAD_SSH_CERT env var
   auto_load_ssh_cert: false
 
+  # Whether the API supports project invitations.
+  invitations: true
+
 # How the CLI detects and configures Git repositories as projects.
 detection:
   git_remote_name: 'platform'

config.yaml

@@ -3,6 +3,8 @@
 
 use Platformsh\Cli\Command\CommandBase;
 use Platformsh\Client\Model\EnvironmentAccess;
+use Platformsh\Client\Model\Invitation\AlreadyInvitedException;
+use Platformsh\Client\Model\Invitation\Environment;
 use Platformsh\Client\Model\ProjectAccess;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Helper\ProgressBar;
@@ -251,20 +253,37 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Ask for confirmation.
         if ($existingProjectAccess) {
             if (!$questionHelper->confirm('Are you sure you want to make these change(s)?')) {
-
                 return 1;
             }
         } else {
             $this->stdErr->writeln('<comment>Adding users can result in additional charges.</comment>');
             $this->stdErr->writeln('');
             if (!$questionHelper->confirm('Are you sure you want to add this user?')) {
-
                 return 1;
             }
         }
+        $this->stdErr->writeln('');
+
+        // If the user does not already exist on the project, then use the Invitations API.
+        if (!$existingProjectAccess && $this->config()->getWithDefault('api.invitations', false)) {
+            $this->stdErr->writeln('Inviting the user to the project...');
+            $environments = [];
+            foreach ($desiredEnvironmentRoles as $id => $role) {
+                $environments[] = new Environment($id, $role);
+            }
+            try {
+                $project->inviteUserByEmail($email, $desiredProjectRole, $environments);
+                $this->stdErr->writeln('');
+                $this->stdErr->writeln(sprintf('An invitation has been sent to <info>%s</info>', $email));
+            } catch (AlreadyInvitedException $e) {
+                $this->stdErr->writeln('');
+                $this->stdErr->writeln(sprintf('An invitation has already been sent to <info>%s</info>', $e->getEmail()));
+            }
+
+            return 0;
+        }
 
-        // Make the required modifications on the project level: add the user,
-        // change their role, or do nothing.
+        // Make the desired changes at the project level.
         if (!$existingProjectAccess) {
             $this->stdErr->writeln("Adding the user to the project");
             $result = $project->addUser($email, $desiredProjectRole);

src/Command/User/UserAddCommand.php

@@ -247,6 +247,7 @@ private function getUserAgent()
     private function getConnectorOptions() {
         $connectorOptions = [];
         $connectorOptions['accounts'] = rtrim($this->config->get('api.accounts_api_url'), '/') . '/';
+        $connectorOptions['api_url'] = $this->config->getWithDefault('api.base_url', '');
         $connectorOptions['certifier_url'] = $this->config->get('api.certifier_url');
         $connectorOptions['verify'] = !$this->config->get('api.skip_ssl');
         $connectorOptions['debug'] = $this->config->get('api.debug') ? STDERR : false;
@@ -531,8 +532,12 @@ public function getProjects($refresh = null)
             $this->cache->save($cacheKey, $cachedProjects, $this->config->get('api.projects_ttl'));
         } else {
             $guzzleClient = $this->getHttpClient();
+            $apiUrl = $this->config->getWithDefault('api.base_url', '');
             foreach ((array) $cached as $id => $data) {
                 $projects[$id] = new Project($data, $data['_endpoint'], $guzzleClient);
+                if ($apiUrl) {
+                    $projects[$id]->setApiUrl($apiUrl);
+                }
             }
         }
 
@@ -580,6 +585,10 @@ public function getProject($id, $host = null, $refresh = null)
             $baseUrl = $cached['_endpoint'];
             unset($cached['_endpoint']);
             $project = new Project($cached, $baseUrl, $guzzleClient);
+            $apiUrl = $this->config->getWithDefault('api.base_url', '');
+            if ($apiUrl) {
+                $projects[$id]->setApiUrl($apiUrl);
+            }
         }
 
         return $project;