From 6f0c050fb09da6fa57357c7006899bfed709b988 Mon Sep 17 00:00:00 2001
From: Ostin Drais <odrais@amsi-corp.com>
Date: Thu, 18 Dec 2025 15:46:47 -0600
Subject: [PATCH 1/3] Move composer auth to secret

---
 .github/workflows/magento-package.yml  | 12 ++++--------
 workflow-templates/magento-package.yml |  1 +
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/magento-package.yml b/.github/workflows/magento-package.yml
index bd91c24..998502f 100644
--- a/.github/workflows/magento-package.yml
+++ b/.github/workflows/magento-package.yml
@@ -15,6 +15,8 @@ on:
         required: true
       GH_TOKEN:
         required: true
+      COMPOSER_AUTH:
+        required: false
 
 jobs:
   build_magento_package:
@@ -23,15 +25,9 @@ jobs:
     steps:
       - name: Setup SSH Key
         run: mkdir -p ~/.ssh && chmod 0700 ~/.ssh && echo "${{ secrets.SSH }}" > ~/.ssh/id_ed25519 && chmod 600 ~/.ssh/id_ed25519
-        
+      - name: Setup Composer GitHub token
+        run: echo '${{ secrets.COMPOSER_AUTH }}' > $HOME/.composer/auth.json  
       - name: Composer config
-        env:
-          COMPOSER_AUTH: |
-            {
-              "github-oauth": {
-                "github.com": "${{ secrets.GH_TOKEN }}"
-              }
-            }
         run: |
           composer config --global http-basic.repo.magento.com ${{ secrets.REPO_MAGENTO_COM_USER }} ${{ secrets.REPO_MAGENTO_COM_PASSWORD }}
           composer config --global repositories.magento composer https://repo.magento.com
diff --git a/workflow-templates/magento-package.yml b/workflow-templates/magento-package.yml
index 655f998..856bb60 100644
--- a/workflow-templates/magento-package.yml
+++ b/workflow-templates/magento-package.yml
@@ -16,6 +16,7 @@ jobs:
       REPO_MAGENTO_COM_PASSWORD: ${{ secrets.REPO_MAGENTO_COM_PASSWORD }}
       SSH: ${{ secrets.SSH }}
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
 
   phpcs:
     uses: AssetMarketingServicesInc/.github/.github/workflows/phpcs.yml@master

From 7e1fb2e5e9ec4f7129d4e12d6c0b296e8e80cc44 Mon Sep 17 00:00:00 2001
From: odrais-amsicorp <110840860+odrais-amsicorp@users.noreply.github.com>
Date: Thu, 18 Dec 2025 15:55:50 -0600
Subject: [PATCH 2/3] Update .github/workflows/magento-package.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/magento-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/magento-package.yml b/.github/workflows/magento-package.yml
index 998502f..f9b223d 100644
--- a/.github/workflows/magento-package.yml
+++ b/.github/workflows/magento-package.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup SSH Key
         run: mkdir -p ~/.ssh && chmod 0700 ~/.ssh && echo "${{ secrets.SSH }}" > ~/.ssh/id_ed25519 && chmod 600 ~/.ssh/id_ed25519
       - name: Setup Composer GitHub token
-        run: echo '${{ secrets.COMPOSER_AUTH }}' > $HOME/.composer/auth.json  
+        run: mkdir -p $HOME/.composer && echo '${{ secrets.COMPOSER_AUTH }}' > $HOME/.composer/auth.json  
       - name: Composer config
         run: |
           composer config --global http-basic.repo.magento.com ${{ secrets.REPO_MAGENTO_COM_USER }} ${{ secrets.REPO_MAGENTO_COM_PASSWORD }}

From 4666d64b63d34188982d185753f8982fca2718ad Mon Sep 17 00:00:00 2001
From: odrais-amsicorp <110840860+odrais-amsicorp@users.noreply.github.com>
Date: Thu, 18 Dec 2025 15:58:08 -0600
Subject: [PATCH 3/3] Update .github/workflows/magento-package.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/magento-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/magento-package.yml b/.github/workflows/magento-package.yml
index f9b223d..46a0703 100644
--- a/.github/workflows/magento-package.yml
+++ b/.github/workflows/magento-package.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup SSH Key
         run: mkdir -p ~/.ssh && chmod 0700 ~/.ssh && echo "${{ secrets.SSH }}" > ~/.ssh/id_ed25519 && chmod 600 ~/.ssh/id_ed25519
       - name: Setup Composer GitHub token
-        run: mkdir -p $HOME/.composer && echo '${{ secrets.COMPOSER_AUTH }}' > $HOME/.composer/auth.json  
+        run: mkdir -p $HOME/.composer && echo '${{ secrets.COMPOSER_AUTH }}' > $HOME/.composer/auth.json
       - name: Composer config
         run: |
           composer config --global http-basic.repo.magento.com ${{ secrets.REPO_MAGENTO_COM_USER }} ${{ secrets.REPO_MAGENTO_COM_PASSWORD }}