From d8e8060a89827a35eaf280da43a02a7ad8e58f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= <sjchmiela@gmail.com>
Date: Fri, 19 Jan 2024 20:56:38 +0100
Subject: [PATCH] Use credentials types from eas-build-job where possible

---
 .../credentialsJson/__tests__/read-test.ts     | 18 +++++++++---------
 .../credentials/ios/IosCredentialsProvider.ts  |  5 ++++-
 .../__tests__/IosCredentialsProvider-test.ts   |  6 +++---
 ...BuildCredentialsFromCredentialsJson-test.ts |  1 +
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/packages/eas-cli/src/credentials/credentialsJson/__tests__/read-test.ts b/packages/eas-cli/src/credentials/credentialsJson/__tests__/read-test.ts
index 1b5c3d773b..9d112368b8 100644
--- a/packages/eas-cli/src/credentials/credentialsJson/__tests__/read-test.ts
+++ b/packages/eas-cli/src/credentials/credentialsJson/__tests__/read-test.ts
@@ -109,10 +109,10 @@ describe('credentialsJson', () => {
         const result = await credentialsJsonReader.readIosCredentialsAsync('.', applicationTarget);
         expect(result).toEqual({
           [applicationTarget.targetName]: {
-            provisioningProfile: 'c29tZWJpbmFyeWNvbnRlbnQ=',
+            provisioningProfileBase64: 'c29tZWJpbmFyeWNvbnRlbnQ=',
             distributionCertificate: {
-              certificateP12: 'c29tZWJpbmFyeWNvbnRlbnQy',
-              certificatePassword: 'certPass',
+              dataBase64: 'c29tZWJpbmFyeWNvbnRlbnQy',
+              password: 'certPass',
             },
           },
         });
@@ -230,17 +230,17 @@ describe('credentialsJson', () => {
         );
         expect(result).toEqual({
           target1: {
-            provisioningProfile: 'cHByb2ZpbGUtMS1zb21lYmluYXJ5Y29udGVudA==',
+            provisioningProfileBase64: 'cHByb2ZpbGUtMS1zb21lYmluYXJ5Y29udGVudA==',
             distributionCertificate: {
-              certificateP12: 'Y2VydC0xLXNvbWViaW5hcnljb250ZW50',
-              certificatePassword: 'cert-pass-1',
+              dataBase64: 'Y2VydC0xLXNvbWViaW5hcnljb250ZW50',
+              password: 'cert-pass-1',
             },
           },
           target2: {
-            provisioningProfile: 'cHByb2ZpbGUtMi1zb21lYmluYXJ5Y29udGVudA==',
+            provisioningProfileBase64: 'cHByb2ZpbGUtMi1zb21lYmluYXJ5Y29udGVudA==',
             distributionCertificate: {
-              certificateP12: 'Y2VydC0yLXNvbWViaW5hcnljb250ZW50',
-              certificatePassword: 'cert-pass-2',
+              dataBase64: 'Y2VydC0yLXNvbWViaW5hcnljb250ZW50',
+              password: 'cert-pass-2',
             },
           },
         });
diff --git a/packages/eas-cli/src/credentials/ios/IosCredentialsProvider.ts b/packages/eas-cli/src/credentials/ios/IosCredentialsProvider.ts
index 2e607e968f..15b779c483 100644
--- a/packages/eas-cli/src/credentials/ios/IosCredentialsProvider.ts
+++ b/packages/eas-cli/src/credentials/ios/IosCredentialsProvider.ts
@@ -35,7 +35,10 @@ enum PushNotificationSetupOption {
 export default class IosCredentialsProvider {
   public readonly platform = Platform.IOS;
 
-  constructor(private ctx: CredentialsContext, private options: Options) {}
+  constructor(
+    private ctx: CredentialsContext,
+    private options: Options
+  ) {}
 
   public async getCredentialsAsync(
     src: CredentialsSource.LOCAL | CredentialsSource.REMOTE
diff --git a/packages/eas-cli/src/credentials/ios/__tests__/IosCredentialsProvider-test.ts b/packages/eas-cli/src/credentials/ios/__tests__/IosCredentialsProvider-test.ts
index 9965a1de74..01b88fdd74 100644
--- a/packages/eas-cli/src/credentials/ios/__tests__/IosCredentialsProvider-test.ts
+++ b/packages/eas-cli/src/credentials/ios/__tests__/IosCredentialsProvider-test.ts
@@ -125,10 +125,10 @@ describe(IosCredentialsProvider, () => {
           {
             testapp: {
               distributionCertificate: {
-                certificateP12: buildCredentials.distributionCertificate?.certificateP12,
-                certificatePassword: buildCredentials.distributionCertificate?.certificatePassword,
+                dataBase64: buildCredentials.distributionCertificate?.certificateP12,
+                password: buildCredentials.distributionCertificate?.certificatePassword,
               },
-              provisioningProfile: buildCredentials.provisioningProfile?.provisioningProfile,
+              provisioningProfileBase64: buildCredentials.provisioningProfile?.provisioningProfile,
             },
           }
         );
diff --git a/packages/eas-cli/src/credentials/ios/actions/__tests__/SetUpTargetBuildCredentialsFromCredentialsJson-test.ts b/packages/eas-cli/src/credentials/ios/actions/__tests__/SetUpTargetBuildCredentialsFromCredentialsJson-test.ts
index b6a43e2789..95e818cad0 100644
--- a/packages/eas-cli/src/credentials/ios/actions/__tests__/SetUpTargetBuildCredentialsFromCredentialsJson-test.ts
+++ b/packages/eas-cli/src/credentials/ios/actions/__tests__/SetUpTargetBuildCredentialsFromCredentialsJson-test.ts
@@ -1,4 +1,5 @@
 import { Ios } from '@expo/eas-build-job';
+
 import { IosDistributionType } from '../../../../graphql/generated';
 import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';