Run auth export on the right places

eiriksm · May 6, 2020 · 68b6bd4 · 68b6bd4
1 parent a02b524
commit 68b6bd4
Showing 1 changed file with 33 additions and 22 deletions.
diff --git a/src/CosyComposer.php b/src/CosyComposer.php
@@ -494,18 +494,10 @@ public function run()
         }
         switch ($hostname) {
             case 'github.com':
-                $this->execCommand(
-                    sprintf('COMPOSER_ALLOW_SUPERUSER=1 composer config --auth github-oauth.github.com %s', $this->userToken),
-                    false
-                );
                 $url = sprintf('https://%s:%s@github.com/%s', $this->userToken, $this->githubPass, $this->slug->getSlug());
                 break;
 
             case 'gitlab.com':
-                $this->execCommand(
-                    sprintf('composer config --auth gitlab-oauth.gitlab.com %s', $this->userToken),
-                    false
-                );
                 $url = sprintf('https://oauth2:%s@gitlab.com/%s', $this->userToken, $this->slug->getSlug());
                 break;
 
@@ -514,10 +506,6 @@ public function run()
                 break;
 
             default:
-                $this->execCommand(
-                    sprintf('composer config --auth gitlab-oauth.%s %s', $this->userToken, $hostname),
-                    false
-                );
                 $url = sprintf('%s://oauth2:%s@%s:%d/%s', $this->urlArray['scheme'], $this->userToken, $hostname, $this->urlArray['port'], $this->slug->getSlug());
                 break;
         }
@@ -538,6 +526,7 @@ public function run()
         if (!$this->chdir($this->compserJsonDir)) {
             throw new ChdirException('Problem with changing dir to the clone dir.');
         }
+        $this->runAuthExport($hostname);
         $local_adapter = new Local($this->compserJsonDir);
         $this->composerGetter = new ComposerFileGetter($local_adapter);
         if (!$this->composerGetter->hasComposerFile()) {
@@ -831,6 +820,37 @@ protected function commitFiles($package_name)
         }
     }
 
+    protected function runAuthExport($hostname)
+    {
+
+        switch ($hostname) {
+            case 'github.com':
+                $this->execCommand(
+                    sprintf('composer config --auth github-oauth.github.com %s', $this->userToken),
+                    false
+                );
+                break;
+
+            case 'gitlab.com':
+                $this->execCommand(
+                    sprintf('composer config --auth gitlab-oauth.gitlab.com %s', $this->userToken),
+                    false
+                );
+                break;
+
+            case 'bitbucket.org':
+                // @todo: Find out?
+                break;
+
+            default:
+                $this->execCommand(
+                    sprintf('composer config --auth gitlab-oauth.%s %s', $this->userToken, $hostname),
+                    false
+                );
+                break;
+        }
+    }
+
     protected function handleIndividualUpdates($data, $lockdata, $cdata, $one_pr_per_dependency, $lock_file_contents, $prs_named, $default_base, $hostname, $default_branch, $alerts, $user_name, $user_repo)
     {
         foreach ($data as $item) {
@@ -978,16 +998,7 @@ protected function handleIndividualUpdates($data, $lockdata, $cdata, $one_pr_per
                 }
                 $this->log('Successfully ran command composer update for package ' . $package_name);
                 $this->commitFiles($package_name);
-                if ($hostname === 'github.com') {
-                    // This might have cleaned out the auth file, so we re-export it.
-                    $this->execCommand(sprintf('composer config --auth github-oauth.github.com %s', $this->userToken));
-                }
-                if ($hostname === 'gitlab.com') {
-                    $this->execCommand(
-                        sprintf('composer config --auth gitlab-oauth.gitlab.com %s', $this->userToken),
-                        false
-                    );
-                }
+                $this->runAuthExport($hostname);
                 $origin = 'fork';
                 if ($this->isPrivate) {
                     $origin = 'origin';