Replace all inputs by env vars. They were duplicated

Author: nauaros

.github/workflows/firebase-app-distribution.yml

@@ -43,22 +43,25 @@ jobs:
           XCODE_AUTHENTICATION_KEY_ID: ${{ secrets.XCODE_AUTHENTICATION_KEY_ID }}
           XCODE_AUTHENTICATION_KEY_ISSUER_ID: ${{ secrets.XCODE_AUTHENTICATION_KEY_ISSUER_ID }}
           XCODE_AUTHENTICATION_KEY_BASE64: ${{ secrets.XCODE_AUTHENTICATION_KEY_BASE64 }}
+
+          # Firebase env
           FIREBASE_SERVICE_ACCOUNT_JSON: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_JSON }}
           FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
+          FIREBASE_RELEASE_NAME: ${{ env.RELEASE_NAME }}
 
-          # Build configuration
+          # App build configuration
           MERCHANT_CLIENT_KEY: ${{ secrets.DEMO_APP_TEST_ENV_CLIENT_KEY }}
           MERCHANT_SERVER_HOST: ${{ secrets.MERCHANT_SERVER_HOST }}
           MERCHANT_ACCOUNT: ${{ secrets.MERCHANT_ACCOUNT }}
           ADYEN_SERVER_API_KEY: ${{ secrets.DEMO_SERVER_TEST_ENV_API_KEY }}
           APPLE_TEAM_IDENTIFIER: ${{ secrets.APPLE_DEVELOPMENT_TEAM_ID }}
           ENVIRONMENT: ${{ secrets.ENVIRONMENT }}
         run: |
+          AUTH_KEY_PATH=$RUNNER_TEMP/authentication_key_path.p8
+          rm -f $AUTH_KEY_PATH
+          echo -n "$XCODE_AUTHENTICATION_KEY_BASE64" | base64 --decode -o $AUTH_KEY_PATH
+
+          echo "AUTH_KEY_PATH=$AUTH_KEY_PATH" >> $GITHUB_ENV
+
           chmod +x ./Scripts/publish-demo-app.sh
-          ./Scripts/publish-demo-app.sh \
-            "${{ secrets.APPLE_ID_USERNAME }}" \
-            "${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}" \
-            "${{ secrets.XCODE_AUTHENTICATION_KEY_PATH }}" \
-            "firebase"
-        env:
-          FIREBASE_RELEASE_NAME: ${{ env.RELEASE_NAME }}
+          ./Scripts/publish-demo-app.sh  "firebase" 

.github/workflows/publish-demo-app.yml

@@ -108,21 +108,30 @@ jobs:
         sed -i '' "s/static let componentsEnvironment.*=.*/static let componentsEnvironment = Environment.$ENVIRONMENT/g" ./Demo/Configuration.swift
     - name: 🚀 Publish Demo App
       env:
+        # Workflow configuration
         APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
         APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
+        APPLE_PAY_MERCHANT_IDENTIFIER: ${{ secrets.APPLE_PAY_MERCHANT_IDENTIFIER }}
         XCODE_AUTHENTICATION_KEY_ID: ${{ secrets.XCODE_AUTHENTICATION_KEY_ID }}
         XCODE_AUTHENTICATION_KEY_ISSUER_ID: ${{ secrets.XCODE_AUTHENTICATION_KEY_ISSUER_ID }}
         XCODE_AUTHENTICATION_KEY_BASE64: ${{ secrets.XCODE_AUTHENTICATION_KEY_BASE64 }}
-        
-        CLIENT_KEY: ${{ secrets.DEMO_APP_TEST_ENV_CLIENT_KEY }}
-        DEMO_SERVER_API_KEY: ${{ secrets.DEMO_SERVER_TEST_ENV_API_KEY }}
+        FIREBASE_SERVICE_ACCOUNT_JSON: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_JSON }}
+        FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
+        FIREBASE_RELEASE_NAME: ${{ env.RELEASE_NAME }}
+          
+        # Build configuration
+        MERCHANT_CLIENT_KEY: ${{ secrets.DEMO_APP_TEST_ENV_CLIENT_KEY }}
+        MERCHANT_SERVER_HOST: ${{ secrets.MERCHANT_SERVER_HOST }}
         MERCHANT_ACCOUNT: ${{ secrets.MERCHANT_ACCOUNT }}
-        APPLE_DEVELOPMENT_TEAM_ID: ${{ secrets.APPLE_DEVELOPMENT_TEAM_ID }}
+        ADYEN_SERVER_API_KEY: ${{ secrets.DEMO_SERVER_TEST_ENV_API_KEY }}
+        APPLE_TEAM_IDENTIFIER: ${{ secrets.APPLE_DEVELOPMENT_TEAM_ID }}
         ENVIRONMENT: ${{ secrets.ENVIRONMENT }}
-        APPLE_PAY_MERCHANT_IDENTIFIER: ${{ secrets.APPLE_PAY_MERCHANT_IDENTIFIER }}
-      run: |
-        AUTH_KEY_PATH=$RUNNER_TEMP/authentication_key_path.p8
-        rm -f $AUTH_KEY_PATH
-        echo -n "$XCODE_AUTHENTICATION_KEY_BASE64" | base64 --decode -o $AUTH_KEY_PATH
+        run: |
+          AUTH_KEY_PATH=$RUNNER_TEMP/authentication_key_path.p8
+          rm -f $AUTH_KEY_PATH
+          echo -n "$XCODE_AUTHENTICATION_KEY_BASE64" | base64 --decode -o $AUTH_KEY_PATH
+
+          echo "AUTH_KEY_PATH=$AUTH_KEY_PATH" >> $GITHUB_ENV
 
-        ./Scripts/publish-demo-app.sh "$APPLE_ID_USERNAME" "$APPLE_APP_SPECIFIC_PASSWORD" "$AUTH_KEY_PATH"
+          chmod +x ./Scripts/publish-demo-app.sh
+          ./Scripts/publish-demo-app.sh

Scripts/publish-demo-app.sh

@@ -9,14 +9,11 @@ IPA_PATH="$BUILD_PATH/AdyenUIHost.ipa"
 EXPORT_OPTIONS_PLIST="$SCRIPT_DIR/exportOptions.plist"
 
 # Input arguments
-APPLE_ID_USERNAME="$1"
-APPLE_APP_SPECIFIC_PASSWORD="$2"
-AUTH_KEY_PATH="$3"
-DISTRIBUTION_TYPE="${4:-testflight}"  # testflight (default) or firebase
+DISTRIBUTION_TYPE="${1:-testflight}"  # testflight (default) or firebase
 
 # Validate inputs
-if [[ -z "$APPLE_ID_USERNAME" || -z "$APPLE_APP_SPECIFIC_PASSWORD" || -z "$AUTH_KEY_PATH" ]]; then
-  echo "❌ Usage: $0 <APPLE_ID_USERNAME> <APPLE_APP_SPECIFIC_PASSWORD> <AUTH_KEY_PATH> [distribution_type]"
+if [[ -z "$DISTRIBUTION_TYPE"]]; then
+  echo "❌ Usage: $0 [distribution_type]"
   exit 1
 fi
 
@@ -32,8 +29,7 @@ fi
 : "${XCODE_AUTHENTICATION_KEY_ID:?Environment variable XCODE_AUTHENTICATION_KEY_ID not set}"
 : "${XCODE_AUTHENTICATION_KEY_ISSUER_ID:?Environment variable XCODE_AUTHENTICATION_KEY_ISSUER_ID not set}"
 : "${XCODE_AUTHENTICATION_KEY_BASE64:?Environment variable XCODE_AUTHENTICATION_KEY_BASE64 not set}"
-: "${FIREBASE_SERVICE_ACCOUNT_JSON:?Environment variable FIREBASE_SERVICE_ACCOUNT_JSON not set}"
-: "${FIREBASE_APP_ID:?Environment variable FIREBASE_APP_ID not set}"
+: "${AUTH_KEY_PATH:?Environment variable AUTH_KEY_PATH not set}"
 
 : "${MERCHANT_CLIENT_KEY:?Environment variable MERCHANT_CLIENT_KEY not set}"
 : "${MERCHANT_SERVER_HOST:?Environment variable MERCHANT_SERVER_HOST not set}"
@@ -42,6 +38,15 @@ fi
 : "${APPLE_TEAM_IDENTIFIER:?Environment variable APPLE_TEAM_IDENTIFIER not set}"
 : "${ENVIRONMENT:?Environment variable ENVIRONMENT not set}"
 
+if [[ "$DISTRIBUTION" == "firebase" ]]; then
+  : "${FIREBASE_SERVICE_ACCOUNT_JSON:?Environment variable FIREBASE_SERVICE_ACCOUNT_JSON not set}"
+  : "${FIREBASE_APP_ID:?Environment variable FIREBASE_APP_ID not set}"
+  : "${FIREBASE_RELEASE_NAME:?Environment variable FIREBASE_RELEASE_NAME not set}"
+
+  echo "ℹ️ Firebase distribution selected — Firebase env vars validated."
+fi
+
+
 echo "🧹 Cleaning project..."
 xcodebuild clean -project Adyen.xcodeproj \
   -scheme AdyenUIHost \
@@ -97,7 +102,7 @@ if [[ "$DISTRIBUTION_TYPE" == "testflight" ]]; then
   echo "✅ TestFlight upload complete!"
 
 elif [[ "$DISTRIBUTION_TYPE" == "firebase" ]]; then
-  echo "☁️ Uploading to Firebase App Distribution..."
+  echo "🔥 Uploading to Firebase App Distribution..."
 
   if [[ -z "${FIREBASE_SERVICE_ACCOUNT_JSON:-}" || -z "${FIREBASE_APP_ID:-}" ]]; then
     echo "❌ FIREBASE_SERVICE_ACCOUNT_JSON and FIREBASE_APP_ID environment variables must be set for Firebase distribution"
@@ -112,7 +117,7 @@ elif [[ "$DISTRIBUTION_TYPE" == "firebase" ]]; then
   firebase appdistribution:distribute "$IPA_PATH" \
     --app "$FIREBASE_APP_ID" \
     --groups "ios-team" \
-    --release-notes "Build from branch ${GITHUB_REF:-manual}" \
+    --release-notes "${FIREBASE_RELEASE_NAME:-Build from branch ${GITHUB_REF_NAME:-manual}}" \
     --service-account "$FIREBASE_JSON_PATH"
 
   echo "✅ Firebase upload complete!"