From 118cecf423ccc2644fe1d8ce1ef1164e478e019f Mon Sep 17 00:00:00 2001
From: Marc Mintel <marc@mintel.me>
Date: Wed, 4 Mar 2026 11:44:23 +0100
Subject: [PATCH] fix(build): simplify token discovery to ensure NPM_TOKEN is
 passed to pnpm install

---
 .gitea/workflows/deploy.yml | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index da7c91c3..bb72ee3c 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -202,31 +202,20 @@ jobs:
         uses: actions/checkout@v4
       - name: 🐳 Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: 🔐 Discover Valid Registry Token
+      - name: 🕵️ Discover Token
         id: discover_token
         run: |
-          echo "Testing available secrets against git.infra.mintel.me Docker registry..."
-          TOKENS="${{ secrets.GITEA_PAT }} ${{ secrets.MINTEL_PRIVATE_TOKEN }} ${{ secrets.NPM_TOKEN }}"
-          USERS="${{ github.repository_owner }} ${{ github.actor }} marcmintel mintel mmintel"
-
-          for TOKEN in $TOKENS; do
-            if [ -n "$TOKEN" ]; then
-              for U in $USERS; do
-                if [ -n "$U" ]; then
-                  echo "Attempting docker login for a token with user $U..."
-                  if echo "$TOKEN" | docker login git.infra.mintel.me -u "$U" --password-stdin > /dev/null 2>&1; then
-                    echo "✅ Successfully authenticated with a token."
-                    echo "::add-mask::$TOKEN"
-                    echo "token=$TOKEN" >> $GITHUB_OUTPUT
-                    echo "user=$U" >> $GITHUB_OUTPUT
-                    exit 0
-                  fi
-                fi
-              done
-            fi
-          done
-          echo "❌ All available tokens failed to authenticate!"
-          exit 1
+          if [ -n "${{ secrets.NPM_TOKEN }}" ]; then
+            echo "token=${{ secrets.NPM_TOKEN }}" >> $GITHUB_OUTPUT
+          else
+            echo "token=${{ vars.NPM_TOKEN }}" >> $GITHUB_OUTPUT
+          fi
+      - name: 🔐 Registry Login
+        uses: docker/login-action@v3
+        with:
+          registry: git.infra.mintel.me
+          username: ${{ github.repository_owner }}
+          password: ${{ steps.discover_token.outputs.token }}
       - name: 🏗️ Build and Push
         uses: docker/build-push-action@v5
         with: