Skip to content

Commit d8e8060

Browse files
committed
Use credentials types from eas-build-job where possible
1 parent 29e4256 commit d8e8060

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

packages/eas-cli/src/credentials/credentialsJson/__tests__/read-test.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ describe('credentialsJson', () => {
109109
const result = await credentialsJsonReader.readIosCredentialsAsync('.', applicationTarget);
110110
expect(result).toEqual({
111111
[applicationTarget.targetName]: {
112-
provisioningProfile: 'c29tZWJpbmFyeWNvbnRlbnQ=',
112+
provisioningProfileBase64: 'c29tZWJpbmFyeWNvbnRlbnQ=',
113113
distributionCertificate: {
114-
certificateP12: 'c29tZWJpbmFyeWNvbnRlbnQy',
115-
certificatePassword: 'certPass',
114+
dataBase64: 'c29tZWJpbmFyeWNvbnRlbnQy',
115+
password: 'certPass',
116116
},
117117
},
118118
});
@@ -230,17 +230,17 @@ describe('credentialsJson', () => {
230230
);
231231
expect(result).toEqual({
232232
target1: {
233-
provisioningProfile: 'cHByb2ZpbGUtMS1zb21lYmluYXJ5Y29udGVudA==',
233+
provisioningProfileBase64: 'cHByb2ZpbGUtMS1zb21lYmluYXJ5Y29udGVudA==',
234234
distributionCertificate: {
235-
certificateP12: 'Y2VydC0xLXNvbWViaW5hcnljb250ZW50',
236-
certificatePassword: 'cert-pass-1',
235+
dataBase64: 'Y2VydC0xLXNvbWViaW5hcnljb250ZW50',
236+
password: 'cert-pass-1',
237237
},
238238
},
239239
target2: {
240-
provisioningProfile: 'cHByb2ZpbGUtMi1zb21lYmluYXJ5Y29udGVudA==',
240+
provisioningProfileBase64: 'cHByb2ZpbGUtMi1zb21lYmluYXJ5Y29udGVudA==',
241241
distributionCertificate: {
242-
certificateP12: 'Y2VydC0yLXNvbWViaW5hcnljb250ZW50',
243-
certificatePassword: 'cert-pass-2',
242+
dataBase64: 'Y2VydC0yLXNvbWViaW5hcnljb250ZW50',
243+
password: 'cert-pass-2',
244244
},
245245
},
246246
});

packages/eas-cli/src/credentials/ios/IosCredentialsProvider.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ enum PushNotificationSetupOption {
3535
export default class IosCredentialsProvider {
3636
public readonly platform = Platform.IOS;
3737

38-
constructor(private ctx: CredentialsContext, private options: Options) {}
38+
constructor(
39+
private ctx: CredentialsContext,
40+
private options: Options
41+
) {}
3942

4043
public async getCredentialsAsync(
4144
src: CredentialsSource.LOCAL | CredentialsSource.REMOTE

packages/eas-cli/src/credentials/ios/__tests__/IosCredentialsProvider-test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ describe(IosCredentialsProvider, () => {
125125
{
126126
testapp: {
127127
distributionCertificate: {
128-
certificateP12: buildCredentials.distributionCertificate?.certificateP12,
129-
certificatePassword: buildCredentials.distributionCertificate?.certificatePassword,
128+
dataBase64: buildCredentials.distributionCertificate?.certificateP12,
129+
password: buildCredentials.distributionCertificate?.certificatePassword,
130130
},
131-
provisioningProfile: buildCredentials.provisioningProfile?.provisioningProfile,
131+
provisioningProfileBase64: buildCredentials.provisioningProfile?.provisioningProfile,
132132
},
133133
}
134134
);

packages/eas-cli/src/credentials/ios/actions/__tests__/SetUpTargetBuildCredentialsFromCredentialsJson-test.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Ios } from '@expo/eas-build-job';
2+
23
import { IosDistributionType } from '../../../../graphql/generated';
34
import { AppQuery } from '../../../../graphql/queries/AppQuery';
45
import { findApplicationTarget } from '../../../../project/ios/target';

0 commit comments

Comments
 (0)