Merge pull request #5 from Tinder/revert-3-mac_os_support

Revert "Add injectable platform support for macOS"
Tinder · Jun 23, 2023 · 0037551 · 0037551
2 parents 9c80e39 + 309c946
commit 0037551
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 59 deletions.
diff --git a/Sources/SignHereLibrary/Commands/CreateProvisioningProfileCommand.swift b/Sources/SignHereLibrary/Commands/CreateProvisioningProfileCommand.swift
@@ -120,7 +120,6 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
         case opensslPath = "opensslPath"
         case intermediaryAppleCertificates = "intermediaryAppleCertificates"
         case certificateSigningRequestSubject = "certificateSigningRequestSubject"
-        case platform = "platform"
     }
 
     @Option(help: "The key identifier of the private key (https://developer.apple.com/documentation/appstoreconnectapi/generating_tokens_for_api_requests)")
@@ -147,9 +146,6 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
     @Option(help: "The bundle identifier name for the desired bundle identifier, this is optional but if it is not set the logic will select the first bundle id it finds that matches `--bundle-identifier`")
     internal var bundleIdentifierName: String?
 
-    @Option(help: "The platform to filter bundle identifiers for")
-    internal var platform: Platform
-
     @Option(help: "The profile type which you wish to create (https://developer.apple.com/documentation/appstoreconnectapi/profilecreaterequest/data/attributes)")
     internal var profileType: String
 
@@ -222,8 +218,7 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
         opensslPath: String,
         intermediaryAppleCertificates: [String],
         certificateSigningRequestSubject: String,
-        bundleIdentifierName: String?,
-        platform: Platform
+        bundleIdentifierName: String?
     ) {
         self.files = files
         self.log = log
@@ -245,7 +240,6 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
         self.intermediaryAppleCertificates = intermediaryAppleCertificates
         self.certificateSigningRequestSubject = certificateSigningRequestSubject
         self.bundleIdentifierName = bundleIdentifierName
-        self.platform = platform
     }
 
     internal init(from decoder: Decoder) throws {
@@ -278,8 +272,7 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
             opensslPath: try container.decode(String.self, forKey: .opensslPath),
             intermediaryAppleCertificates: try container.decodeIfPresent([String].self, forKey: .intermediaryAppleCertificates) ?? [],
             certificateSigningRequestSubject: try container.decode(String.self, forKey: .certificateSigningRequestSubject),
-            bundleIdentifierName: try container.decodeIfPresent(String.self, forKey: .bundleIdentifierName),
-            platform: try container.decode(Platform.self, forKey: .platform)
+            bundleIdentifierName: try container.decodeIfPresent(String.self, forKey: .bundleIdentifierName)
         )
     }
 
@@ -310,8 +303,7 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
             bundleId: try iTunesConnectService.determineBundleIdITCId(
                 jsonWebToken: jsonWebToken,
                 bundleIdentifier: bundleIdentifier,
-                bundleIdentifierName: bundleIdentifierName,
-                platform: platform
+                bundleIdentifierName: bundleIdentifierName
             ),
             certificateId: certificateId,
             deviceIDs: deviceIDs,

diff --git a/Sources/SignHereLibrary/Models/Platform.swift b/Sources/SignHereLibrary/Models/Platform.swift
diff --git a/Sources/SignHereLibrary/Services/iTunesConnectService.swift b/Sources/SignHereLibrary/Services/iTunesConnectService.swift
@@ -26,8 +26,7 @@ internal protocol iTunesConnectService {
     func determineBundleIdITCId(
         jsonWebToken: String,
         bundleIdentifier: String,
-        bundleIdentifierName: String?,
-        platform: Platform
+        bundleIdentifierName: String?
     ) throws -> String
     func fetchITCDeviceIDs(jsonWebToken: String) throws -> Set<String>
     func createProfile(
@@ -227,16 +226,15 @@ internal class iTunesConnectServiceImp: iTunesConnectService {
     func determineBundleIdITCId(
         jsonWebToken: String,
         bundleIdentifier: String,
-        bundleIdentifierName: String?,
-        platform: Platform
+        bundleIdentifierName: String?
     ) throws -> String {
         var urlComponents: URLComponents = .init()
         urlComponents.scheme = Constants.httpsScheme
         urlComponents.host = Constants.itcHost
         urlComponents.path = "/v1/bundleIds"
         urlComponents.queryItems = [
             .init(name: "filter[identifier]", value: bundleIdentifier),
-            .init(name: "filter[platform]", value: platform.rawValue),
+            .init(name: "filter[platform]", value: "IOS"),
             .init(name: "limit", value: "200")
         ]
         guard let url: URL = urlComponents.url

diff --git a/Tests/SignHereLibraryTests/CreateProvisioningProfileCommandTests.swift b/Tests/SignHereLibraryTests/CreateProvisioningProfileCommandTests.swift
@@ -55,8 +55,7 @@ final class CreateProvisioningProfileCommandTests: XCTestCase {
             opensslPath: "/opensslPath",
             intermediaryAppleCertificates: ["/intermediaryAppleCertificate"],
             certificateSigningRequestSubject: "certificateSigningRequestSubject",
-            bundleIdentifierName: "bundleIdentifierName",
-            platform: .iOS
+            bundleIdentifierName: "bundleIdentifierName"
         )
     }
 
@@ -158,8 +157,7 @@ final class CreateProvisioningProfileCommandTests: XCTestCase {
             "outputPath": "/outputPath",
             "opensslPath": "/opensslPath",
             "certificateSigningRequestSubject": "certificateSigningRequestSubject",
-            "bundleIdentifierName": "bundleIdentifierName",
-            "platform": "IOS"
+            "bundleIdentifierName": "bundleIdentifierName"
         }
         """.utf8)
 
@@ -178,7 +176,6 @@ final class CreateProvisioningProfileCommandTests: XCTestCase {
         XCTAssertEqual(subject.certificateType, "certificateType")
         XCTAssertEqual(subject.outputPath, "/outputPath")
         XCTAssertEqual(subject.bundleIdentifierName, "bundleIdentifierName")
-        XCTAssertEqual(subject.platform, .iOS)
     }
 
     func test_execute_alreadyActiveCertificate() throws {

diff --git a/Tests/SignHereLibraryTests/PlatformTests.swift b/Tests/SignHereLibraryTests/PlatformTests.swift
diff --git a/Tests/SignHereLibraryTests/iTunesConnectServiceTests.swift b/Tests/SignHereLibraryTests/iTunesConnectServiceTests.swift
@@ -383,8 +383,7 @@ final class iTunesConnectServiceTests: XCTestCase {
         let value: String = try subject.determineBundleIdITCId(
             jsonWebToken: "jsonWebToken",
             bundleIdentifier: "bundleIdentifier",
-            bundleIdentifierName: nil,
-            platform: .iOS
+            bundleIdentifierName: nil
         )
 
         // THEN
@@ -408,8 +407,7 @@ final class iTunesConnectServiceTests: XCTestCase {
         let value: String = try subject.determineBundleIdITCId(
             jsonWebToken: "jsonWebToken",
             bundleIdentifier: "bundleIdentifier",
-            bundleIdentifierName: "name",
-            platform: .iOS
+            bundleIdentifierName: "name"
         )
 
         // THEN
@@ -433,8 +431,7 @@ final class iTunesConnectServiceTests: XCTestCase {
         XCTAssertThrowsError(try subject.determineBundleIdITCId(
             jsonWebToken: "jsonWebToken",
             bundleIdentifier: "bundleIdentifier",
-            bundleIdentifierName: "invalid",
-            platform: .iOS
+            bundleIdentifierName: "invalid"
         )) {
             if case iTunesConnectServiceImp.Error.unableToDetermineITCIdForBundleId = $0 {
                 return
@@ -461,8 +458,7 @@ final class iTunesConnectServiceTests: XCTestCase {
         XCTAssertThrowsError(try subject.determineBundleIdITCId(
             jsonWebToken: "jsonWebToken",
             bundleIdentifier: "bundleIdentifier",
-            bundleIdentifierName: nil,
-            platform: .iOS
+            bundleIdentifierName: nil
         )) {
             if case iTunesConnectServiceImp.Error.unableToDecodeResponse = $0 {
                 return