Add provisioningProfileType

expo · Jan 19, 2024 · 5c710eb · 5c710eb
1 parent ef3448f
commit 5c710eb
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 17 deletions.
diff --git a/packages/eas-cli/src/credentials/credentialsJson/read.ts b/packages/eas-cli/src/credentials/credentialsJson/read.ts
@@ -72,6 +72,10 @@ async function readCredentialsForTargetAsync(
       getAbsolutePath(projectDir, targetCredentials.provisioningProfilePath),
       'base64'
     ),
+    provisioningProfileType:
+      path.extname(targetCredentials.provisioningProfilePath) === 'provisionprofile'
+        ? Ios.ProvisioningProfileType.PROVISIONPROFILE
+        : Ios.ProvisioningProfileType.MOBILEPROVISION,
     distributionCertificate: {
       dataBase64: await fs.readFile(
         getAbsolutePath(projectDir, targetCredentials.distributionCertificate.path),

diff --git a/packages/eas-cli/src/credentials/ios/appstore/Credentials.types.ts b/packages/eas-cli/src/credentials/ios/appstore/Credentials.types.ts
@@ -1,4 +1,6 @@
+import { ProfileType } from '@expo/app-store';
 import { UserRole } from '@expo/apple-utils';
+import { Ios } from '@expo/eas-build-job';
 
 export interface DistributionCertificateStoreInfo {
   id: string;
@@ -26,6 +28,30 @@ export interface ProvisioningProfile {
   provisioningProfile: string;
   teamId: string;
   teamName?: string;
+  provisioningProfileType: Ios.ProvisioningProfileType;
+}
+
+export function getProvisioningProfileTypeForDistributionMethod(
+  distributionMethod: ProfileType
+): Ios.ProvisioningProfileType {
+  switch (distributionMethod) {
+    case ProfileType.IOS_APP_DEVELOPMENT:
+    case ProfileType.IOS_APP_STORE:
+    case ProfileType.IOS_APP_ADHOC:
+    case ProfileType.IOS_APP_INHOUSE:
+    case ProfileType.TVOS_APP_DEVELOPMENT:
+    case ProfileType.TVOS_APP_STORE:
+    case ProfileType.TVOS_APP_ADHOC:
+    case ProfileType.TVOS_APP_INHOUSE:
+      return Ios.ProvisioningProfileType.MOBILEPROVISION;
+    case ProfileType.MAC_APP_DEVELOPMENT:
+    case ProfileType.MAC_APP_STORE:
+    case ProfileType.MAC_APP_DIRECT:
+    case ProfileType.MAC_CATALYST_APP_DEVELOPMENT:
+    case ProfileType.MAC_CATALYST_APP_STORE:
+    case ProfileType.MAC_CATALYST_APP_DIRECT:
+      return Ios.ProvisioningProfileType.PROVISIONPROFILE;
+  }
 }
 
 export interface ProvisioningProfileStoreInfo extends ProvisioningProfile {

diff --git a/packages/eas-cli/src/credentials/ios/appstore/provisioningProfile.ts b/packages/eas-cli/src/credentials/ios/appstore/provisioningProfile.ts
@@ -4,6 +4,7 @@ import {
   DistributionCertificate,
   ProvisioningProfile,
   ProvisioningProfileStoreInfo,
+  getProvisioningProfileTypeForDistributionMethod,
 } from './Credentials.types';
 import { getRequestContext } from './authenticate';
 import { AuthCtx } from './authenticateTypes';
@@ -71,8 +72,11 @@ async function transformProfileAsync(
     status: cert.attributes.profileState,
     expires: new Date(cert.attributes.expirationDate).getTime() / 1000,
     distributionMethod: cert.attributes.profileType,
-    // @ts-ignore -- this can be null when the profile has expired.
-    provisioningProfile: cert.attributes.profileContent,
+    provisioningProfileType: getProvisioningProfileTypeForDistributionMethod(
+      cert.attributes.profileType
+    ),
+    // this can be null when the profile has expired.
+    provisioningProfile: cert.attributes.profileContent as string,
     certificates: (await cert.getCertificatesAsync()).map(transformCertificate),
     teamId: authCtx.team.id,
     teamName: authCtx.team.name,
@@ -147,17 +151,13 @@ export async function useExistingProvisioningProfileAsync(
         `Provisioning profile "${profile.attributes.name}" (${profile.id}) is expired!`
       );
     }
-    const result = {
-      provisioningProfileId: profile.id,
-      provisioningProfile: content,
-      teamId: authCtx.team.id,
-      teamName: authCtx.team.name,
-    };
     spinner.succeed(
       `Updated provisioning profile (${profile.id}) with distribution certificate${certIdTag}`
     );
     return {
-      ...result,
+      provisioningProfileId: profile.id,
+      provisioningProfile: content,
+      provisioningProfileType: provisioningProfile.provisioningProfileType,
       teamId: authCtx.team.id,
       teamName: authCtx.team.name,
     };

diff --git a/packages/eas-cli/src/credentials/ios/appstore/provisioningProfileAdhoc.ts b/packages/eas-cli/src/credentials/ios/appstore/provisioningProfileAdhoc.ts
@@ -1,6 +1,9 @@
 import { Device, Profile, ProfileState, ProfileType, RequestContext } from '@expo/apple-utils';
 
-import { ProvisioningProfile } from './Credentials.types';
+import {
+  ProvisioningProfile,
+  getProvisioningProfileTypeForDistributionMethod,
+} from './Credentials.types';
 import { getRequestContext } from './authenticate';
 import { AuthCtx } from './authenticateTypes';
 import { getBundleIdForIdentifierAsync, getProfilesForBundleIdAsync } from './bundleId';
@@ -14,6 +17,7 @@ interface ProfileResults {
   profileName?: string;
   provisioningProfileId: string;
   provisioningProfile: any;
+  provisioningProfileType: ProfileType;
 }
 
 function uniqueItems<T = any>(items: T[]): T[] {
@@ -177,6 +181,7 @@ async function manageAdHocProfilesAsync(
         profileName: existingProfile?.attributes?.name,
         provisioningProfileId: existingProfile?.id,
         provisioningProfile: existingProfile?.attributes.profileContent,
+        provisioningProfileType: existingProfile?.attributes.profileType,
       };
       if (didUpdate) {
         result.didUpdate = true;
@@ -208,6 +213,7 @@ async function manageAdHocProfilesAsync(
       profileName: updatedProfile.attributes.name,
       provisioningProfileId: updatedProfile.id,
       provisioningProfile: updatedProfile.attributes.profileContent,
+      provisioningProfileType: updatedProfile.attributes.profileType,
     };
   }
 
@@ -239,6 +245,7 @@ async function manageAdHocProfilesAsync(
     profileName: newProfile.attributes.name,
     provisioningProfileId: newProfile.id,
     provisioningProfile: newProfile.attributes.profileContent,
+    provisioningProfileType: newProfile.attributes.profileType,
   };
 }
 
@@ -252,13 +259,18 @@ export async function createOrReuseAdhocProvisioningProfileAsync(
   const spinner = ora(`Handling Apple ad hoc provisioning profiles`).start();
   try {
     const context = getRequestContext(authCtx);
-    const { didUpdate, didCreate, profileName, ...adhocProvisioningProfile } =
-      await manageAdHocProfilesAsync(context, {
-        udids,
-        bundleId: bundleIdentifier,
-        certSerialNumber: distCertSerialNumber,
-        profileType,
-      });
+    const {
+      didUpdate,
+      didCreate,
+      profileName,
+      provisioningProfileType,
+      ...adhocProvisioningProfile
+    } = await manageAdHocProfilesAsync(context, {
+      udids,
+      bundleId: bundleIdentifier,
+      certSerialNumber: distCertSerialNumber,
+      profileType,
+    });
 
     if (didCreate) {
       spinner.succeed(`Created new profile: ${profileName}`);
@@ -270,6 +282,8 @@ export async function createOrReuseAdhocProvisioningProfileAsync(
 
     return {
       ...adhocProvisioningProfile,
+      provisioningProfileType:
+        getProvisioningProfileTypeForDistributionMethod(provisioningProfileType),
       teamId: authCtx.team.id,
       teamName: authCtx.team.name,
     };