Fix macos profiles extension (#89)

* macos related profiles should be exported with .provisionprofile extension, not .mobileprovision * refactor * refactor * Update CHANGELOG.md Co-authored-by: Priit Lätt <[email protected]> Co-authored-by: Priit Lätt <[email protected]>
codemagic-ci-cd · Apr 12, 2021 · c7d77e0 · c7d77e0
1 parent 76e06f2
commit c7d77e0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Version 0.5.5
+-------------
+
+**Improvements**
+
+- Bugfix: export MacOS application's provisioning profiles with `.provisionprofile` extension instead of `.mobileprovision`.
+
 Version 0.5.4
 -------------
 

diff --git a/src/codemagic/__version__.py b/src/codemagic/__version__.py
@@ -1,5 +1,5 @@
 __title__ = 'codemagic-cli-tools'
 __description__ = 'CLI tools used in Codemagic builds'
-__version__ = '0.5.4'
+__version__ = '0.5.5'
 __url__ = 'https://github.com/codemagic-ci-cd/cli-tools'
 __licence__ = 'GNU General Public License v3.0'
diff --git a/src/codemagic/apple/resources/enums.py b/src/codemagic/apple/resources/enums.py
@@ -171,6 +171,10 @@ def is_ad_hoc_type(self) -> bool:
     def is_development_type(self) -> bool:
         return self.value.endswith('_DEVELOPMENT')
 
+    @property
+    def is_macos_profile(self) -> bool:
+        return self.value.startswith('MAC_')
+
     def devices_not_allowed(self) -> bool:
         return not self.devices_allowed()
 

diff --git a/src/codemagic/apple/resources/profile.py b/src/codemagic/apple/resources/profile.py
@@ -50,6 +50,12 @@ class Relationships(Resource.Relationships):
     def get_display_info(self) -> str:
         return f'{self.attributes.profileType} profile {self.attributes.uuid}'
 
+    @property
+    def profile_extension(self) -> str:
+        if self.attributes.profileType.is_macos_profile:
+            return '.provisionprofile'
+        return '.mobileprovision'
+
     @property
     def profile_content(self) -> bytes:
         return b64decode(self.attributes.profileContent)
diff --git a/src/codemagic/tools/app_store_connect.py b/src/codemagic/tools/app_store_connect.py
@@ -750,7 +750,8 @@ def _get_unique_path(cls, file_name: str, destination: pathlib.Path) -> pathlib.
         return pathlib.Path(tf.name)
 
     def _save_profile(self, profile: Profile) -> pathlib.Path:
-        profile_path = self._get_unique_path(f'{profile.get_display_info()}.mobileprovision', self.profiles_directory)
+        profile_path = self._get_unique_path(
+            f'{profile.get_display_info()}{profile.profile_extension}', self.profiles_directory)
         profile_path.write_bytes(profile.profile_content)
         self.printer.log_saved(profile, profile_path)
         return profile_path