Retry with PAT on gitlabs (#219)

eiriksm · Sep 5, 2021 · 4041e63 · 4041e63
1 parent f2a8612
commit 4041e63
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/CosyComposer.php b/src/CosyComposer.php
@@ -807,9 +807,25 @@ public function run()
         $this->client = $this->getClient($this->slug);
         $this->privateClient = $this->getClient($this->slug);
         $this->privateClient->authenticate($this->userToken, null);
-        $this->isPrivate = $this->privateClient->repoIsPrivate($this->slug);
-        // Get the default branch of the repo.
-        $default_branch = $this->privateClient->getDefaultBranch($this->slug);
+        try {
+            $this->isPrivate = $this->privateClient->repoIsPrivate($this->slug);
+            // Get the default branch of the repo.
+            $default_branch = $this->privateClient->getDefaultBranch($this->slug);
+        } catch (\Throwable $e) {
+            // Could be a personal access token.
+            if (!method_exists($this->privateClient, 'authenticatePersonalAccessToken')) {
+                throw $e;
+            }
+            try {
+                $this->privateClient->authenticatePersonalAccessToken($this->userToken, null);
+                $this->isPrivate = $this->privateClient->repoIsPrivate($this->slug);
+                // Get the default branch of the repo.
+                $default_branch = $this->privateClient->getDefaultBranch($this->slug);
+            } catch (\Throwable $other_exception) {
+                // Throw the first exception, probably.
+                throw $e;
+            }
+        }
         // We also allow the project to override this for violinist.
         if ($config->getDefaultBranch()) {
             // @todo: Would be better to make sure this can actually be set, based on the branches available. Either

diff --git a/src/Providers/Gitlab.php b/src/Providers/Gitlab.php
@@ -30,6 +30,11 @@ public function authenticatePrivate($user, $token)
         $this->client->authenticate($user, Client::AUTH_OAUTH_TOKEN);
     }
 
+    public function authenticatePersonalAccessToken($user, $token)
+    {
+        $this->client->authenticate($user, Client::AUTH_URL_TOKEN);
+    }
+
     public function repoIsPrivate(Slug $slug)
     {
         // Consider all gitlab things private, since we have the API key to do so anyway.