From 45acc2d9ab6ee8a3e9980d5ab2fb9191b51d1a7c Mon Sep 17 00:00:00 2001
From: Mingshen Sun <bob@mssun.me>
Date: Sat, 18 Mar 2023 20:51:50 -0700
Subject: [PATCH] Fix secrects injection in GitHub Actions

---
 .github/workflows/deploying.yml |  3 +++
 fastlane/Fastfile               | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploying.yml b/.github/workflows/deploying.yml
index 95e7113..e1897d9 100644
--- a/.github/workflows/deploying.yml
+++ b/.github/workflows/deploying.yml
@@ -59,6 +59,9 @@ jobs:
       env:
         APPLE_ID: ${{ secrets.APPLE_ID }}
         APP_IDENTIFIER: ${{ secrets.APP_IDENTIFIER }}
+        APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
+        APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
+        APP_STORE_CONNECT_API_KEY_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_CONTENT }}
         DESTINATION_EMAIL: ${{ secrets.DESTINATION_EMAIL }}
         EMAIL_FROM_NAME: ${{ secrets.EMAIL_FROM_NAME }}
         EMAIL_REPLY_TO: ${{ secrets.EMAIL_REPLY_TO }}
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index d43d335..ccb5333 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1,9 +1,4 @@
 default_platform :ios
-api_key = app_store_connect_api_key(
-  key_id: ENV["APP_STORE_CONNECT_API_KEY_KEY_ID"],
-  issuer_id: ENV["APP_STORE_CONNECT_API_KEY_ISSUER_ID"],
-  key_content: ENV["APP_STORE_CONNECT_API_KEY_KEY_CONTENT"],
-)
 
 lane :prepare do
   carthage(cache_builds: true, platform: "iOS")
@@ -75,6 +70,11 @@ platform :ios do
   desc "This will also make sure the profile is up to date"
   lane :beta do
     app_identifier = "me.mssun.passforiosbeta"
+    api_key = app_store_connect_api_key(
+      key_id: ENV["APP_STORE_CONNECT_API_KEY_KEY_ID"],
+      issuer_id: ENV["APP_STORE_CONNECT_API_KEY_ISSUER_ID"],
+      key_content: ENV["APP_STORE_CONNECT_API_KEY_KEY_CONTENT"]
+    )
 
     if is_ci?
       create_keychain(
@@ -129,6 +129,11 @@ platform :ios do
   desc "Submit a new build to AppStore"
   lane :release do
     app_identifier = "me.mssun.passforios"
+    api_key = app_store_connect_api_key(
+      key_id: ENV["APP_STORE_CONNECT_API_KEY_KEY_ID"],
+      issuer_id: ENV["APP_STORE_CONNECT_API_KEY_ISSUER_ID"],
+      key_content: ENV["APP_STORE_CONNECT_API_KEY_KEY_CONTENT"]
+    )
 
     if is_ci?
       create_keychain(