expo-application 5.7.0 → 5.8.0

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 5.8.0 — 2023-12-12
+
+### 🐛 Bug fixes
+
+- On iOS, fixed a regression that prevented expo go from determining the release type. ([#25834](https://github.com/expo/expo/pull/25834) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 5.7.0 — 2023-11-14
 
 ### 🛠 Breaking changes

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '5.7.0'
+version = '5.8.0'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -94,7 +94,7 @@ android {
   namespace "expo.modules.application"
   defaultConfig {
     versionCode 12
-    versionName '5.7.0'
+    versionName '5.8.0'
   }
 }
 

package/ios/ApplicationModule.swift

@@ -36,12 +36,12 @@ public class ApplicationModule: Module {
     }
 
     AsyncFunction("getApplicationReleaseTypeAsync") { () -> Int in
-      let mainProvisioningProfile = ApplicationModuleProvisioningProfile.mainProvisioningProfile
+      let mainProvisioningProfile = EXProvisioningProfile.main()
       return mainProvisioningProfile.appReleaseType().rawValue
     }
 
     AsyncFunction("getPushNotificationServiceEnvironmentAsync") { () -> String? in
-      let mainProvisioningProfile = ApplicationModuleProvisioningProfile.mainProvisioningProfile
+      let mainProvisioningProfile = EXProvisioningProfile.main()
       return mainProvisioningProfile.notificationServiceEnvironment()
     }
   }

package/ios/EXApplication/EXProvisioningProfile.h

@@ -0,0 +1,22 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+#import <Foundation/Foundation.h>
+
+// Keep in sync with ApplicationReleaseType in JS
+typedef NS_ENUM(NSInteger, EXAppReleaseType) {
+  EXAppReleaseTypeUnknown,
+  EXAppReleaseSimulator,
+  EXAppReleaseEnterprise,
+  EXAppReleaseDev,
+  EXAppReleaseAdHoc,
+  EXAppReleaseAppStore
+};
+
+@interface EXProvisioningProfile : NSObject
+
++ (nonnull instancetype)mainProvisioningProfile;
+
+- (EXAppReleaseType)appReleaseType;
+- (nullable NSString *)notificationServiceEnvironment;
+
+@end

package/ios/EXApplication/EXProvisioningProfile.m

@@ -0,0 +1,134 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+#import "EXProvisioningProfile.h"
+
+@implementation EXProvisioningProfile {
+  NSDictionary *_plist;
+}
+
++ (nonnull instancetype)mainProvisioningProfile
+{
+  static EXProvisioningProfile *profile;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    NSDictionary *plist = [self _readProvisioningProfilePlist];
+    profile = [[self alloc] initWithPlist:plist];
+  });
+  return profile;
+}
+
+- (instancetype)initWithPlist:(NSDictionary *)plist
+{
+  if (self = [super init]) {
+    _plist = plist;
+  }
+  return self;
+}
+
+- (nullable NSString *)notificationServiceEnvironment
+{
+  if (!_plist) {
+    return nil;
+  }
+
+  NSDictionary *entitlements = _plist[@"Entitlements"];
+  NSString *apsEnvironment = entitlements[@"aps-environment"];
+  return apsEnvironment;
+}
+
+- (EXAppReleaseType)appReleaseType {
+  NSString *provisioningPath = [[NSBundle mainBundle] pathForResource:@"embedded" ofType:@"mobileprovision"];
+  if (!provisioningPath) {
+    // provisioning profile does not exist
+#if TARGET_IPHONE_SIMULATOR
+    return EXAppReleaseSimulator;
+#else
+    return EXAppReleaseAppStore;
+#endif
+  }
+
+  NSDictionary *mobileProvision = _plist;
+  if (!mobileProvision) {
+    // failure to read other than it simply not existing
+    return EXAppReleaseTypeUnknown;
+  } else if ([[mobileProvision objectForKey:@"ProvisionsAllDevices"] boolValue]) {
+    // enterprise distribution contains ProvisionsAllDevices - true
+    return EXAppReleaseEnterprise;
+  } else if ([mobileProvision objectForKey:@"ProvisionedDevices"] && [[mobileProvision objectForKey:@"ProvisionedDevices"] count] > 0) {
+    // development contains UDIDs and get-task-allow is true
+    // ad hoc contains UDIDs and get-task-allow is false
+    NSDictionary *entitlements = [mobileProvision objectForKey:@"Entitlements"];
+    if ([[entitlements objectForKey:@"get-task-allow"] boolValue]) {
+      return EXAppReleaseDev;
+    } else {
+      return EXAppReleaseAdHoc;
+    }
+  } else {
+    // app store contains no UDIDs (if the file exists at all?)
+    return EXAppReleaseAppStore;
+  }
+}
+
+/** embedded.mobileprovision plist format:
+
+ AppIDName, // string — TextDetective
+ ApplicationIdentifierPrefix[],  // [ string - 66PK3K3KEV ]
+ CreationData, // date — 2013-01-17T14:18:05Z
+ DeveloperCertificates[], // [ data ]
+ Entitlements {
+ application-identifier // string - 66PK3K3KEV.com.blindsight.textdetective
+ get-task-allow // true or false
+ keychain-access-groups[] // [ string - 66PK3K3KEV.* ]
+ },
+ ExpirationDate, // date — 2014-01-17T14:18:05Z
+ Name, // string — Barrierefreikommunizieren (name assigned to the provisioning profile used)
+ ProvisionedDevices[], // [ string.... ]
+ TeamIdentifier[], // [string — HHBT96X2EX ]
+ TeamName, // string — The Blindsight Corporation
+ TimeToLive, // integer - 365
+ UUID, // string — 79F37E8E-CC8D-4819-8C13-A678479211CE
+ Version, // integer — 1
+ ProvisionsAllDevices // true or false  ***NB: not sure if this is where this is
+
+ */
++ (NSDictionary *)_readProvisioningProfilePlist
+{
+  NSString *profilePath = [[NSBundle mainBundle] pathForResource:@"embedded" ofType:@"mobileprovision"];
+  if (!profilePath) {
+    return nil;
+  }
+
+  NSError *error;
+  NSString *profileString = [NSString stringWithContentsOfFile:profilePath encoding:NSASCIIStringEncoding error:&error];
+  if (!profileString) {
+    NSLog(@"Error reading provisioning profile: %@", error.localizedDescription);
+    return nil;
+  }
+
+  NSScanner *scanner = [NSScanner scannerWithString:profileString];
+  BOOL readPrelude = [scanner scanUpToString:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" intoString:nil];
+  if (!readPrelude) {
+    return nil;
+  }
+
+  NSString *plistString;
+  BOOL readPlist = [scanner scanUpToString:@"</plist>" intoString:&plistString];
+  if (!readPlist) {
+    return nil;
+  }
+  plistString = [plistString stringByAppendingString:@"</plist>"];
+
+  NSData *plistData = [plistString dataUsingEncoding:NSUTF8StringEncoding];
+  NSDictionary *plistDictionary = [NSPropertyListSerialization propertyListWithData:plistData
+                                                                            options:NSPropertyListImmutable
+                                                                             format:NULL
+                                                                              error:&error];
+  if (!plistDictionary) {
+    NSLog(@"Error unserializing provisioning profile plist: %@", error.localizedDescription);
+    return nil;
+  }
+
+  return plistDictionary;
+}
+
+@end

package/ios/{ExpoApplication.podspec → EXApplication.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name           = 'ExpoApplication'
+  s.name           = 'EXApplication'
   s.version        = package['version']
   s.summary        = package['description']
   s.description    = package['description']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-application",
-  "version": "5.7.0",
+  "version": "5.8.0",
   "description": "A universal module that gets native application information such as its ID, app name, and build version at runtime",
   "main": "build/Application.js",
   "types": "build/Application.d.ts",
@@ -36,5 +36,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "3142a086578deffd8704a8f1b6f0f661527d836c"
+  "gitHead": "6aca7ce098ddc667776a3d7cf612adbb985e264a"
 }

package/ios/ApplicationModuleProvisioningProfile.swift

@@ -1,75 +0,0 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
-import ExpoModulesCore
-
-class ApplicationModuleProvisioningProfile {
-  private let plist = readProvisioningProfilePlist()
-  static let mainProvisioningProfile = ApplicationModuleProvisioningProfile()
-
-  func notificationServiceEnvironment() -> String? {
-    guard let plist = plist else {
-      return nil
-    }
-
-    let entitlements = plist["Entitlements"] as? [String: Any]
-    return entitlements?["aps-environment"] as? String
-  }
-
-  func appReleaseType() -> AppReleaseType {
-    guard let provisioningPath = Bundle.main.path(forResource: "embedded", ofType: "mobileprovision") else {
-      #if targetEnvironment(simulator)
-      return .simulator
-      #else
-      return .appStore
-      #endif
-    }
-
-    guard let mobileProvision = plist else {
-      return .unknown
-    }
-
-    if let provisionsAllDevices = mobileProvision["ProvisionsAllDevices"] as? Bool, provisionsAllDevices {
-      return .enterprise
-    }
-    if let provisionedDevices = mobileProvision["ProvisionedDevices"] as? [String], !provisionedDevices.isEmpty {
-      let entitlements = mobileProvision["Entitlements"] as? [String: Any]
-      if let getTaskAllow = entitlements?["get-task-allow"] as? Bool, getTaskAllow {
-        return .dev
-      }
-      return .adHoc
-    }
-    return .appStore
-  }
-
-  private static func readProvisioningProfilePlist() -> [String: Any]? {
-    guard let profilePath = Bundle.main.path(forResource: "embedded", ofType: "mobileprovision") else {
-      return nil
-    }
-
-    do {
-      let profileString = try String(contentsOfFile: profilePath, encoding: .ascii)
-      guard let plistStart = profileString.range(of: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"),
-        let plistEnd = profileString.range(of: "</plist>") else {
-        return nil
-      }
-
-      let plistString = String(profileString[plistStart.lowerBound..<plistEnd.upperBound])
-      if let plistData = plistString.data(using: .utf8) {
-        return try PropertyListSerialization.propertyList(from: plistData, options: [], format: nil) as? [String: Any]
-      }
-      log.error("Failed to convert plistString to UTF-8 encoded data object.")
-      return nil
-    } catch {
-      log.error("Error reading provisioning profile: \(error.localizedDescription)")
-      return nil
-    }
-  }
-}
-
-enum AppReleaseType: Int, Enumerable {
-  case unknown = 0
-  case simulator = 1
-  case enterprise = 2
-  case dev = 3
-  case adHoc = 4
-  case appStore = 5
-}