From 836fbc1941b459e69f0522aec3c803d72f74e48a Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Mon, 24 Nov 2025 15:24:34 +0100
Subject: [PATCH] Fix build-and-submit.sh for Safari browser extension

---
 .../AliasVault.xcodeproj/project.pbxproj      |  1 +
 .../AliasVault/build-and-submit.sh            | 31 +++++++++++++------
 .../AliasVault/exportOptions.plist            |  2 +-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/apps/browser-extension/safari-xcode/AliasVault/AliasVault.xcodeproj/project.pbxproj b/apps/browser-extension/safari-xcode/AliasVault/AliasVault.xcodeproj/project.pbxproj
index 1597b77df..367e0658c 100644
--- a/apps/browser-extension/safari-xcode/AliasVault/AliasVault.xcodeproj/project.pbxproj
+++ b/apps/browser-extension/safari-xcode/AliasVault/AliasVault.xcodeproj/project.pbxproj
@@ -529,6 +529,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = AliasVault/AliasVault.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 2500900;
diff --git a/apps/browser-extension/safari-xcode/AliasVault/build-and-submit.sh b/apps/browser-extension/safari-xcode/AliasVault/build-and-submit.sh
index 01aafbd52..277963984 100755
--- a/apps/browser-extension/safari-xcode/AliasVault/build-and-submit.sh
+++ b/apps/browser-extension/safari-xcode/AliasVault/build-and-submit.sh
@@ -106,13 +106,23 @@ if [[ $CHOICE == "1" || $CHOICE == "2" ]]; then
 
   # Export .pkg
   rm -rf "$EXPORT_DIR"
-  xcodebuild -exportArchive \
+  if ! xcodebuild -exportArchive \
     -archivePath "$ARCHIVE_PATH" \
     -exportOptionsPlist "$EXPORT_PLIST" \
     -exportPath "$EXPORT_DIR" \
-    -allowProvisioningUpdates
+    -allowProvisioningUpdates; then
+    echo "❌ Failed to export archive to PKG"
+    exit 1
+  fi
 
-  PKG_PATH=$(ls "$EXPORT_DIR"/*.pkg)
+  PKG_PATH=$(ls "$EXPORT_DIR"/*.pkg 2>/dev/null)
+
+  if [ -z "$PKG_PATH" ]; then
+    echo "❌ No PKG file found in $EXPORT_DIR after export"
+    echo "Contents of export directory:"
+    ls -la "$EXPORT_DIR"
+    exit 1
+  fi
 
   # Extract version info from newly built PKG
   extract_version_info "$PKG_PATH"
@@ -157,10 +167,18 @@ fi
 echo ""
 echo "================================================"
 echo "Submitting to App Store:"
+echo "  PKG Path: $PKG_PATH"
 echo "  Version: $VERSION"
 echo "  Build:   $BUILD"
 echo "================================================"
 echo ""
+
+# Validate PKG_PATH is set and file exists
+if [ -z "$PKG_PATH" ] || [ ! -f "$PKG_PATH" ]; then
+    echo "❌ Error: PKG file not found at: $PKG_PATH"
+    exit 1
+fi
+
 read -p "Are you sure you want to push this to App Store? (y/n): " -r
 echo ""
 
@@ -171,9 +189,4 @@ fi
 
 echo "✅ Proceeding with upload..."
 
-fastlane deliver \
-  --pkg "$PKG_PATH" \
-  --skip_screenshots \
-  --skip_metadata \
-  --api_key_path "$API_KEY_PATH" \
-  --run_precheck_before_submit=false
+fastlane deliver --pkg "$PKG_PATH" --skip_screenshots --skip_metadata --api_key_path "$API_KEY_PATH" --run_precheck_before_submit false
diff --git a/apps/browser-extension/safari-xcode/AliasVault/exportOptions.plist b/apps/browser-extension/safari-xcode/AliasVault/exportOptions.plist
index 0e634295d..91d39053e 100644
--- a/apps/browser-extension/safari-xcode/AliasVault/exportOptions.plist
+++ b/apps/browser-extension/safari-xcode/AliasVault/exportOptions.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>method</key>
-  <string>app-store</string>
+  <string>app-store-connect</string>
   <key>signingStyle</key>
   <string>automatic</string>
   <key>destination</key>