Merge pull request #459 from nimblehq/310-multiple-apple-accounts

[#310] Support multiple apple portal accounts
nimblehq · Apr 28, 2023 · 2b433c4 · 2b433c4
2 parents ebcb4cc + 68aef48
commit 2b433c4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/fastlane/Constants/Constant.swift b/fastlane/Constants/Constant.swift
@@ -22,8 +22,10 @@ enum Constant {
 
     // MARK: - Match
 
-    static let userName = "<#userName#>"
-    static let teamId = "<#teamId#>"
+    static let appleStagingUserName = "<#userName#>"
+    static let appleStagingTeamId = "<#teamId#>"
+    static let appleProductionUserName = "<#userName#>"
+    static let appleProductionTeamId = "<#teamId#>"
     static let keychainName = "github_action_keychain"
     static let matchURL = "[email protected]:{organization}/{repo}.git"
 
@@ -86,7 +88,7 @@ extension Constant {
         var scheme: String {
             switch self {
             case .staging: return "\(Constant.projectName) \(rawValue)".trimmed
-            case .production: return Constant.projectName
+            case .production: return Constant.projectName.trimmed
             }
         }
 
@@ -117,6 +119,20 @@ extension Constant {
             let outputDirectoryURL = URL(fileURLWithPath: Constant.outputPath)
             return outputDirectoryURL.appendingPathComponent(productName + ".app" + Constant.dSYMSuffix).relativePath
         }
+
+        var appleUsername: String {
+            switch self {
+            case .staging: return Constant.appleStagingUserName
+            case .production: return Constant.appleProductionUserName
+            }
+        }
+
+        var appleTeamId: String {
+            switch self {
+            case .staging: return Constant.appleStagingTeamId
+            case .production: return Constant.appleProductionTeamId
+            }
+        }
     }
 
     enum BuildType: String {

diff --git a/fastlane/Fastfile.swift b/fastlane/Fastfile.swift
@@ -167,7 +167,7 @@ class Fastfile: LaneFile {
         registerDevice(
             name: deviceName,
             udid: deviceUDID,
-            teamId: .userDefined(Constant.teamId)
+            teamId: .userDefined(Constant.appleStagingTeamId)
         )
 
         Match.syncCodeSigning(type: .development, environment: .staging, isForce: true)

diff --git a/fastlane/Helpers/Match.swift b/fastlane/Helpers/Match.swift
@@ -15,8 +15,8 @@ enum Match {
                 type: type.match,
                 readonly: .userDefined(!isForce),
                 appIdentifier: [environment.bundleId],
-                username: .userDefined(Constant.userName),
-                teamId: .userDefined(Constant.teamId),
+                username: .userDefined(environment.appleUsername),
+                teamId: .userDefined(environment.appleTeamId),
                 gitUrl: Constant.matchURL,
                 keychainName: Constant.keychainName,
                 keychainPassword: .userDefined(Secret.keychainPassword),
@@ -27,8 +27,8 @@ enum Match {
                 type: type.match,
                 readonly: .userDefined(!isForce),
                 appIdentifier: [environment.bundleId],
-                username: .userDefined(Constant.userName),
-                teamId: .userDefined(Constant.teamId),
+                username: .userDefined(environment.appleUsername),
+                teamId: .userDefined(environment.appleTeamId),
                 gitUrl: Constant.matchURL,
                 force: .userDefined(isForce)
             )
@@ -41,7 +41,7 @@ enum Match {
         updateCodeSigningSettings(
             path: Constant.projectPath,
             useAutomaticSigning: .userDefined(false),
-            teamId: .userDefined(Constant.teamId),
+            teamId: .userDefined(environment.appleTeamId),
             targets: .userDefined([Constant.projectName]),
             buildConfigurations: .userDefined([Self.createBuildConfiguration(type: type, environment: environment)]),
             codeSignIdentity: .userDefined(type.codeSignIdentity),