Fix up Android authorization and signing

eternagame · Sep 6, 2024 · cfb814b · cfb814b
1 parent 7bd84ec
commit cfb814b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -152,7 +152,7 @@ jobs:
         if: ${{ matrix.target == 'android' }}
         run: |
           npx cordova build ${{ matrix.target }} --${{ env.BUILD_TYPE == 'prod' && 'release' || 'debug' }} --device \
-            --keystore="$RUNNER_TEMP/keystore.jks" --storePassword=${{ secrets.GOOGLE_PLAY_KEYSTORE_PASSWORD }} --alias=upload --password=${{ secrets.GOOGLE_PLAY_UPLOAD_KEY_PASSWORD }}
+            -- --keystore="$RUNNER_TEMP/keystore.jks" --storePassword=${{ secrets.GOOGLE_PLAY_KEYSTORE_PASSWORD }} --alias=upload --password=${{ secrets.GOOGLE_PLAY_UPLOAD_KEY_PASSWORD }}
         env:
           PARALLEL_BUILD: true
 
@@ -187,7 +187,7 @@ jobs:
         if: ${{ matrix.target == 'ios' }}
         run: |
           npx cordova build ${{ matrix.target }} --${{ env.BUILD_TYPE == 'prod' && 'release' || 'debug' }} --device \
-            --automaticProvisioning --authenticationKeyPath="$RUNNER_TEMP/app_store_connect.p8" \
+            -- --automaticProvisioning --authenticationKeyPath="$RUNNER_TEMP/app_store_connect.p8" \
             --authenticationKeyID=${{ secrets.APP_STORE_CONNECT_API_KEY_ID }} --authenticationKeyIssuerID="${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}" \
             --developmentTeam="${{ secrets.APP_STORE_CONNECT_TEAM_ID }}" --codeSignIdentity="Apple Development" \
             --packageType="${{ matrix.packageType }}"

diff --git a/.github/workflows/google-play/src/index.js b/.github/workflows/google-play/src/index.js
@@ -7,6 +7,7 @@ const PACKAGE_NAME = 'org.eternagame.mob';
 const args = parseArgs();
 const playStoreApi = await PlayStoreApi.create(args.apiKey);
 if (args.mode === 'upload') {
+    console.log('Starting Upload')
     const editId = await playStoreApi.insertEdit(PACKAGE_NAME);
     await playStoreApi.uploadBundle(PACKAGE_NAME, editId, args.bundlePath);
     await playStoreApi.commitEdit(PACKAGE_NAME, editId);

diff --git a/.github/workflows/google-play/src/play-store-api.js b/.github/workflows/google-play/src/play-store-api.js
@@ -41,8 +41,12 @@ export class PlayStoreApi {
         body: new URLSearchParams({
           grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
           assertion: authToken
-        }).toString()
+        }).toString(),
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded'
+        }
       });
+      console.log('Access token:', res.status, res.statusText);
       const parsed = await res.json();
       return new PlayStoreApi(parsed['access_token']);
     }
@@ -58,6 +62,7 @@ export class PlayStoreApi {
           Authorization: `Bearer ${this.accessToken}`
         }
       });
+      console.log('Edit insert:', res.status, res.statusText);
       const parsed = await res.json();
       return parsed['id'];
     }
@@ -69,7 +74,7 @@ export class PlayStoreApi {
      */
     async uploadBundle(packageName, editId, bundlePath) {
       const bundle = await readFile(bundlePath);
-      await fetch(`https://androidpublisher.googleapis.com/upload/androidpublisher/v3/applications/${packageName}/edits/${editId}/bundles?uploadType=media`, {
+      const res = await fetch(`https://androidpublisher.googleapis.com/upload/androidpublisher/v3/applications/${packageName}/edits/${editId}/bundles?uploadType=media`, {
         method: 'POST',
         headers: {
           Authorization: `Bearer ${this.accessToken}`,
@@ -78,14 +83,17 @@ export class PlayStoreApi {
         },
         body: bundle
       });
+      if (res.status === 403) console.log(await res.json())
+      console.log('Edit upload bundle:', res.status, res.statusText);
     }
 
     async commitEdit(packageName, editId) {
-      await fetch(`https://androidpublisher.googleapis.com/androidpublisher/v3/applications/${packageName}/edits/${editId}:commit`, {
+      const res = await fetch(`https://androidpublisher.googleapis.com/androidpublisher/v3/applications/${packageName}/edits/${editId}:commit`, {
         method: 'POST',
         headers: {
           Authorization: `Bearer ${this.accessToken}`,
         },
       });
+      console.log('Edit commit:', res.status, res.statusText);
     }
 }