From b1363d9d52fbde2e2e64415a9e99d1cf25c5f953 Mon Sep 17 00:00:00 2001
From: Marc Mintel <marc@mintel.me>
Date: Wed, 4 Mar 2026 14:58:16 +0100
Subject: [PATCH] fix(build): restore NPM_TOKEN string redaction bash
 workaround to fix intermittent docker build failures

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

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 6bb484b4..b995aa70 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -205,20 +205,31 @@ jobs:
         uses: actions/checkout@v4
       - name: 🐳 Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: 🕵️ Discover Token
+      - name: 🔐 Discover Valid Registry Token
         id: discover_token
         run: |
-          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 }}
+          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
       - name: 🏗️ Build and Push
         uses: docker/build-push-action@v5
         with: