Merge pull request #142 from WalletConnect/chores/one_click_auth_siwe…

…_fixes One-Click Auth + SIWE enhancements
WalletConnect · Jul 4, 2024 · 50284b7 · 50284b7
2 parents 512ed94 + 47548d7
commit 50284b7
Show file tree

Hide file tree

Showing 43 changed files with 431 additions and 1,636 deletions.
diff --git a/.github/workflows/build-android-debug.yml b/.github/workflows/build-android-debug.yml
@@ -65,6 +65,9 @@ jobs:
       working-directory: example
       env:
         PROJECT_ID: ${{ secrets.PROJECT_ID }}
+        APPKIT_AUTH: ${{ secrets.APPKIT_AUTH }}
+        APPKIT_PROJECT_ID: ${{ secrets.APPKIT_PROJECT_ID }}
+        AUTH_SERVICE_URL: ${{ secrets.AUTH_SERVICE_URL }}
       run: |
         # Get app version from file
         GRADLE_FILE=android/gradle.properties
@@ -86,7 +89,7 @@ jobs:
         NEXT_BUILD=$(grep 'versionCode' $GRADLE_FILE | cut -d'=' -f2)
 
         # Build Android app with flutter
-        flutter build apk --build-name $VERSION --build-number $NEXT_BUILD --dart-define="PROJECT_ID=$PROJECT_ID" --flavor alpha --release
+        flutter build apk --build-name $VERSION --build-number $NEXT_BUILD --dart-define="PROJECT_ID=$PROJECT_ID" --dart-define="APPKIT_AUTH=$APPKIT_AUTH" --dart-define="APPKIT_PROJECT_ID=$APPKIT_PROJECT_ID" --dart-define="AUTH_SERVICE_URL=$AUTH_SERVICE_URL" --flavor alpha --release
         
     # Setup Node
     - name: Setup Node

diff --git a/.github/workflows/build-android-internal.yml b/.github/workflows/build-android-internal.yml
@@ -65,6 +65,9 @@ jobs:
       working-directory: example
       env:
         PROJECT_ID: ${{ secrets.PROJECT_ID }}
+        APPKIT_AUTH: ${{ secrets.APPKIT_AUTH }}
+        APPKIT_PROJECT_ID: ${{ secrets.APPKIT_PROJECT_ID }}
+        AUTH_SERVICE_URL: ${{ secrets.AUTH_SERVICE_URL }}
       run: |
         # Get app version from file
         GRADLE_FILE=android/gradle.properties
@@ -82,7 +85,7 @@ jobs:
         NEXT_BUILD=$(grep 'versionCode' $GRADLE_FILE | cut -d'=' -f2)
 
         # Build Android app with flutter
-        flutter build apk --build-name $VERSION --build-number $NEXT_BUILD --dart-define="PROJECT_ID=$PROJECT_ID" --release --flavor beta
+        flutter build apk --build-name $VERSION --build-number $NEXT_BUILD --dart-define="PROJECT_ID=$PROJECT_ID" --dart-define="APPKIT_AUTH=$APPKIT_AUTH" --dart-define="APPKIT_PROJECT_ID=$APPKIT_PROJECT_ID" --dart-define="AUTH_SERVICE_URL=$AUTH_SERVICE_URL" --release --flavor beta
 
     # Setup Node
     - name: Setup Node

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -65,6 +65,9 @@ jobs:
       working-directory: example
       env:
         PROJECT_ID: ${{ secrets.PROJECT_ID }}
+        APPKIT_AUTH: ${{ secrets.APPKIT_AUTH }}
+        APPKIT_PROJECT_ID: ${{ secrets.APPKIT_PROJECT_ID }}
+        AUTH_SERVICE_URL: ${{ secrets.AUTH_SERVICE_URL }}
       run: |
         # Get app version from file
         GRADLE_FILE=android/gradle.properties
@@ -82,7 +85,7 @@ jobs:
         NEXT_BUILD=$(grep 'versionCode' $GRADLE_FILE | cut -d'=' -f2)
 
         # Build Android app with flutter
-        flutter build apk --build-name $VERSION --build-number $NEXT_BUILD --dart-define="PROJECT_ID=$PROJECT_ID" --release --flavor stable
+        flutter build apk --build-name $VERSION --build-number $NEXT_BUILD --dart-define="PROJECT_ID=$PROJECT_ID" --dart-define="APPKIT_AUTH=$APPKIT_AUTH" --dart-define="APPKIT_PROJECT_ID=$APPKIT_PROJECT_ID" --dart-define="AUTH_SERVICE_URL=$AUTH_SERVICE_URL" --release --flavor stable
         
     # Setup Node
     - name: Setup Node

diff --git a/.github/workflows/build-ios-debug.yml b/.github/workflows/build-ios-debug.yml
@@ -83,6 +83,9 @@ jobs:
         PROJECT_ID: ${{ secrets.PROJECT_ID }}
         APP_STORE_KEY_ID: ${{ secrets.APP_STORE_KEY_ID }}
         APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
+        APPKIT_AUTH: ${{ secrets.APPKIT_AUTH }}
+        APPKIT_PROJECT_ID: ${{ secrets.APPKIT_PROJECT_ID }}
+        AUTH_SERVICE_URL: ${{ secrets.AUTH_SERVICE_URL }}
       run: |
         # Get app version from file
         FILE_VALUE=$(echo | grep "^version: " pubspec.yaml)
@@ -98,7 +101,7 @@ jobs:
         sed -i '' 's/FlutterAppStoreProfileWithPush/FlutterAppStoreProfileDebug/g' ios/Runner.xcodeproj/project.pbxproj
 
         # Build ios app with flutter
-        flutter build ios --build-name $VERSION_NUMBER --dart-define="PROJECT_ID=$PROJECT_ID" --config-only --release
+        flutter build ios --build-name $VERSION_NUMBER --dart-define="PROJECT_ID=$PROJECT_ID" --dart-define="APPKIT_AUTH=$APPKIT_AUTH" --dart-define="APPKIT_PROJECT_ID=$APPKIT_PROJECT_ID" --dart-define="AUTH_SERVICE_URL=$AUTH_SERVICE_URL" --config-only --release
         
         cd ios
         agvtool new-marketing-version $VERSION_NUMBER

diff --git a/.github/workflows/build-ios-internal.yml b/.github/workflows/build-ios-internal.yml
@@ -82,6 +82,9 @@ jobs:
         PROJECT_ID: ${{ secrets.PROJECT_ID }}
         APP_STORE_KEY_ID: ${{ secrets.APP_STORE_KEY_ID }}
         APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
+        APPKIT_AUTH: ${{ secrets.APPKIT_AUTH }}
+        APPKIT_PROJECT_ID: ${{ secrets.APPKIT_PROJECT_ID }}
+        AUTH_SERVICE_URL: ${{ secrets.AUTH_SERVICE_URL }}
       run: |
         # Get app version from file
         FILE_VALUE=$(echo | grep "^version: " pubspec.yaml)
@@ -97,7 +100,7 @@ jobs:
         sed -i '' 's/FlutterAppStoreProfileWithPush/FlutterAppStoreProfileInternal/g' ios/Runner.xcodeproj/project.pbxproj
 
         # Build ios app with flutter
-        flutter build ios --build-name $VERSION_NUMBER --dart-define="PROJECT_ID=$PROJECT_ID" --config-only --release
+        flutter build ios --build-name $VERSION_NUMBER --dart-define="PROJECT_ID=$PROJECT_ID" --dart-define="APPKIT_AUTH=$APPKIT_AUTH" --dart-define="APPKIT_PROJECT_ID=$APPKIT_PROJECT_ID" --dart-define="AUTH_SERVICE_URL=$AUTH_SERVICE_URL" --config-only --release
         
         cd ios
         agvtool new-marketing-version $VERSION_NUMBER

diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
@@ -82,6 +82,9 @@ jobs:
         PROJECT_ID: ${{ secrets.PROJECT_ID }}
         APP_STORE_KEY_ID: ${{ secrets.APP_STORE_KEY_ID }}
         APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
+        APPKIT_AUTH: ${{ secrets.APPKIT_AUTH }}
+        APPKIT_PROJECT_ID: ${{ secrets.APPKIT_PROJECT_ID }}
+        AUTH_SERVICE_URL: ${{ secrets.AUTH_SERVICE_URL }}
       run: |
         # Get app version from file
         FILE_VALUE=$(echo | grep "^version: " pubspec.yaml)
@@ -90,8 +93,7 @@ jobs:
         VERSION_NUMBER=(${FULL_VERSION//-/ })
 
         # Build ios app with flutter
-        # echo "flutter build ios --build-name $VERSION_NUMBER --dart-define=\"PROJECT_ID=$PROJECT_ID\" --config-only --release"
-        flutter build ios --build-name $VERSION_NUMBER --dart-define="PROJECT_ID=$PROJECT_ID" --config-only --release
+        flutter build ios --build-name $VERSION_NUMBER --dart-define="PROJECT_ID=$PROJECT_ID" --dart-define="APPKIT_AUTH=$APPKIT_AUTH" --dart-define="APPKIT_PROJECT_ID=$APPKIT_PROJECT_ID" --dart-define="AUTH_SERVICE_URL=$AUTH_SERVICE_URL" --config-only --release
         
         cd ios
         agvtool new-marketing-version $VERSION_NUMBER

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 3.3.0-beta01
+## 3.3.0-beta02
 
 - One-Click Auth + SIWE implementation
 - Coinbase Wallet dependency update

diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 versionName=3.3.0
-versionCode=62
+versionCode=63
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -8,8 +8,6 @@ PODS:
   - CoinbaseWalletSDK/CrossPlatform (1.0.4):
     - CoinbaseWalletSDK/Client
   - Flutter (1.0.0)
-  - flutter_timezone (0.0.1):
-    - Flutter
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
@@ -33,7 +31,6 @@ DEPENDENCIES:
   - appcheck (from `.symlinks/plugins/appcheck/ios`)
   - coinbase_wallet_sdk (from `.symlinks/plugins/coinbase_wallet_sdk/ios`)
   - Flutter (from `Flutter`)
-  - flutter_timezone (from `.symlinks/plugins/flutter_timezone/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -53,8 +50,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/coinbase_wallet_sdk/ios"
   Flutter:
     :path: Flutter
-  flutter_timezone:
-    :path: ".symlinks/plugins/flutter_timezone/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
@@ -73,7 +68,6 @@ SPEC CHECKSUMS:
   coinbase_wallet_sdk: 7ccd4e1a7940deba6ba9bd81beece999a2268c15
   CoinbaseWalletSDK: ea1f37512bbc69ebe07416e3b29bf840f5cc3152
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_timezone: ffb07bdad3c6276af8dada0f11978d8a1f8a20bb
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943

diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -470,7 +470,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 62;
+				CURRENT_PROJECT_VERSION = 63;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
 				ENABLE_BITCODE = NO;
@@ -496,7 +496,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 62;
+				CURRENT_PROJECT_VERSION = 63;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.web3modal.flutterExample.RunnerTests;
@@ -514,7 +514,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 62;
+				CURRENT_PROJECT_VERSION = 63;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.web3modal.flutterExample.RunnerTests;
@@ -530,7 +530,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 62;
+				CURRENT_PROJECT_VERSION = 63;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.web3modal.flutterExample.RunnerTests;
@@ -655,7 +655,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 62;
+				CURRENT_PROJECT_VERSION = 63;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
 				ENABLE_BITCODE = NO;
@@ -686,7 +686,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 62;
+				CURRENT_PROJECT_VERSION = 63;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
 				ENABLE_BITCODE = NO;

diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>62</string>
+	<string>63</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>