Provide crendetial

Author: onmyway133

Sources/Swiftlane/Actions/iOS/UploadASC.swift

@@ -7,28 +7,17 @@
 
 import Foundation
 
-public final class UploadASC {
+public final class UploadASC: UseALTool {
     public var args = Args()
 
-    public struct Credential {
-        let apiIssuer: String
-        let apiKey: String
+    public init() {}
 
-        public init(
-            apiIssuer: String,
-            apiKey: String
-        ) {
-            self.apiKey = apiKey
-            self.apiIssuer = apiIssuer
-        }
-    }
-
-    let credential: Credential
-
-    public init(
-        credential: Credential
+    public func credential(
+        apiKey: String,
+        apiIssuer: String
     ) {
-        self.credential = credential
+        args["--apiKey"] = apiKey
+        args["--apiIssuer"] = apiIssuer
     }
 }
 
@@ -38,8 +27,7 @@ public extension UploadASC {
     ) async throws {
         args.flag("altool")
         args.flag("--upload-app")
-        args["--apiKey"] = credential.apiKey
-        args["--apiIssuer"] = credential.apiIssuer
+
         args["--file"] = ipaFile.path
 
         _ = try Settings.default.cli.run(

Sources/Swiftlane/Actions/macOS/Notarize.swift

@@ -8,24 +8,17 @@
 import Foundation
 import SWXMLHash
 
-public struct Notarize {
-    public struct Credential {
-        let username: String
-        let password: String
-
-        public init(
-            username: String,
-            password: String
-        ) {
-            self.username = username
-            self.password = password
-        }
-    }
+public final class Notarize: UseALTool {
+    public var args = Args()
 
-    let credential: Credential
+    public init() {}
 
-    public init(credential: Credential) {
-        self.credential = credential
+    public func credential(
+        username: String,
+        password: String
+    ) {
+        args["--username"] = username
+        args["--password"] = password
     }
 }
 
@@ -37,13 +30,11 @@ public extension Notarize {
     ) async throws {
         Settings.default.cs.action("Notarize")
 
-        var args = Args()
+        var args = self.args
         args.flag("altool")
         args.flag("--notarize-app")
         args["-t"] = "osx"
         args["--output-format"] = "xml"
-        args["--username"] = credential.username
-        args["--password"] = credential.password
         args["--file"] = packageFile.path
         args["--primary-bundle-id"] = bundleId
 
@@ -111,11 +102,9 @@ public extension Notarize {
     }
 
     private func fetchInfo(uuid: String) async throws -> String {
-        var args = Args()
+        var args = self.args
         args.flag("altool")
         args["--notarization-info"] = uuid
-        args["--username"] = credential.username
-        args["--password"] = credential.password
         args["-output-format"] = "xml"
 
         return try Settings.default.cli.run(

Sources/Swiftlane/Library/Tools/ALTool.swift

@@ -0,0 +1,12 @@
+//
+//  ALTool.swift
+//  Swiftlane
+//
+//  Created by khoa on 13/02/2022.
+//
+
+import Foundation
+
+public protocol UseALTool: AnyObject {
+    var args: Args { get set }
+}