fix: Address Comments

Author: AlejandroOrozco

.circleci/config.yml

@@ -139,50 +139,18 @@ commands:
   setup-certificates:
     steps:
       - run:
-          name: Setup Certificate and Keychain
+          name: Install Apple Certificate and Provisioning Profile
           command: |
-            # create variables
-            CERTIFICATE_PATH=$HOME/build_certificate.p12
-            KEYCHAIN_PATH=$HOME/app-signing.keychain-db
+            chmod +x ./scripts/certificate_setup.sh
+            ./scripts/certificate_setup.sh setup
 
-            # import certificate from CircleCI context
-            echo -n "$VERIFY_DEMO_CERT" | base64 --decode -o $CERTIFICATE_PATH
-
-            # create temporary keychain
-            security create-keychain -p "$KEYCHAIN_PASS" $KEYCHAIN_PATH
-            security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
-            security unlock-keychain -p "$KEYCHAIN_PASS" $KEYCHAIN_PATH
-
-            # import certificate to keychain
-            security import $CERTIFICATE_PATH -P "$VERIFY_DEMO_CERT_PASS" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-            security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASS" $KEYCHAIN_PATH
-            security list-keychain -d user -s $KEYCHAIN_PATH
-      - run:
-          name: Setup Provisioning Profiles
-          command: |
-            setup_provisioning_profile() {
-              local profile_var=$1
-              local profile_path="$HOME/profile_$(basename "$profile_var").mobileprovision"
-
-              # decode and save the provisioning profile
-              echo -n "${!profile_var}" | base64 --decode -o "$profile_path"
-
-              # create profiles directory if it doesn't exist
-              mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
-
-              # copy the profile to the correct location
-              cp "$profile_path" ~/Library/MobileDevice/Provisioning\ Profiles/
-            }
-            setup_provisioning_profile "VERIFY_DEMO_PROFILE"
-            setup_provisioning_profile "HOST_APP_PROFILE"
-            setup_provisioning_profile "APP_SIZER_PROFILE"
   cleanup-signing:
     steps:
       - run:
           name: Clean Up Keychain and Provisioning Profile
           command: |
-            security delete-keychain $HOME/app-signing.keychain-db || true
-            rm -f ~/Library/MobileDevice/Provisioning\ Profiles/build_pp.mobileprovision || true
+            chmod +x ./scripts/certificate_setup.sh
+            ./scripts/certificate_setup.sh cleanup
   
   release:
     steps:

Scripts/certificate_setup.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+set -e
+
+COMMAND=$1
+
+CERTIFICATE_PATH=$HOME/build_certificate.p12
+PP_PATH=$HOME/build_pp.mobileprovision
+KEYCHAIN_PATH=$HOME/app-signing.keychain-db
+
+setup_certificates() {
+    echo "Setting up Apple certificates and provisioning profiles..."
+    
+    # Import certificate and provisioning profile from CircleCI context
+    echo -n "$VERIFY_DEMO_CERT" | base64 --decode -o $CERTIFICATE_PATH
+    echo -n "$VERIFY_DEMO_PROFILE" | base64 --decode -o $PP_PATH
+    echo -n "$HOST_APP_PROFILE" | base64 --decode -o $PP_PATH
+    echo -n "$APP_SIZER_PROFILE" | base64 --decode -o $PP_PATH
+
+    # Create temporary keychain
+    security create-keychain -p "$KEYCHAIN_PASS" $KEYCHAIN_PATH
+    security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+    security unlock-keychain -p "$KEYCHAIN_PASS" $KEYCHAIN_PATH
+
+    # Import certificate to keychain
+    security import $CERTIFICATE_PATH -P "$VERIFY_DEMO_CERT_PASS" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+    security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASS" $KEYCHAIN_PATH
+    security list-keychain -d user -s $KEYCHAIN_PATH
+
+    # Apply provisioning profile
+    mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+    cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
+}
+
+cleanup_signing() {
+    echo "Cleaning up keychain and provisioning profile..."
+    security delete-keychain $KEYCHAIN_PATH || true
+    rm -f ~/Library/MobileDevice/Provisioning\ Profiles/build_pp.mobileprovision || true
+}
+
+case "$COMMAND" in
+    setup)
+        setup_certificates
+        ;;
+    cleanup)
+        cleanup_signing
+        ;;
+    *)
+        echo "Usage: $0 {setup|cleanup}"
+        exit 1
+        ;;
+esac

fastlane/Fastfile

@@ -42,10 +42,7 @@ platform :ios do
     if options[:ftl_devices] == 'all'
       ftl_devices = all_ftl_devices
     end
-    # match(
-    #   type: "development",
-    #   app_identifier: ["com.twilio.verify.HostApp"]
-    # )
+
     settings_to_override = {
       :BUNDLE_IDENTIFIER => "com.twilio.verify.HostApp",
       :PROVISIONING_PROFILE_SPECIFIER => ENV["TWILIO_VERIFY_HOST_APP_PROVISIONING_PROFILE"],
@@ -105,10 +102,7 @@ platform :ios do
 
   desc "Runs app sizer"
   lane :build_app_sizer do
-    # match(
-    #   type: "development",
-    #   app_identifier: ["com.twilio.verify.AppSizer"]
-    # )
+
     settings_to_override = {
       :BUNDLE_IDENTIFIER => "com.twilio.verify.AppSizer",
       :PROVISIONING_PROFILE_SPECIFIER => ENV["TWILIO_APP_SIZER_PROVISIONING_PROFILE"],
@@ -253,11 +247,6 @@ platform :ios do
       version_number: options[:versionName]
     )
 
-    # match(
-    #   app_identifier: "com.twilio.TwilioVerifyDemo",
-    #   type: "adhoc",
-    #   readonly: true
-    # )
     settings_to_override = {
       :BUNDLE_IDENTIFIER => "com.twilio.TwilioVerifyDemo",
       :PROVISIONING_PROFILE_SPECIFIER => ENV["TWILIO_VERIFY_DEMO_PROVISIONING_PROFILE"],