Merge branch 'release/0.4.2'

Blackjacx · Blackjacx · commit f0548e8c7bf3 · 2023-08-29T00:13:43.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [0.4.2] - 2023-08-28Z
+* [#63](https://github.com/blackjacx/assist/pull/63): Add token subcommand to keys - [@Blackjacx](https://github.com/blackjacx).
+* [#61](https://github.com/blackjacx/assist/pull/61): Switch to Swift 5.9 - [@Blackjacx](https://github.com/blackjacx).
+
 ## [0.4.1] - 2023-08-24Z
 * Add log to show which tester is processed - [@Blackjacx](https://github.com/blackjacx).
 
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(
@@ -17,7 +17,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/blackjacx/Engine", from: "0.0.3"),
-        .package(url: "https://github.com/blackjacx/ASCKit", from: "0.2.1"),
+        .package(url: "https://github.com/blackjacx/ASCKit", from: "0.2.2"),
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.2"),
         .package(url: "https://github.com/vapor/jwt-kit.git", from: "4.1.0"),
         .package(url: "https://github.com/kareman/SwiftShell", from: "5.1.0")
diff --git a/Sources/ASC/commands/sub/Keys.swift b/Sources/ASC/commands/sub/Keys.swift
@@ -17,7 +17,7 @@ extension ASC {
 
         static var configuration = CommandConfiguration(
             abstract: "Lists, registers and deletes App Store Connect API keys on your Mac.",
-            subcommands: [List.self, Activate.self, Register.self, Delete.self],
+            subcommands: [List.self, Activate.self, Register.self, Delete.self, Token.self],
             defaultSubcommand: List.self)
     }
 }
@@ -28,8 +28,6 @@ extension ASC.Keys {
     struct List: ParsableCommand {
         static var configuration = CommandConfiguration(abstract: "List locally stored App Store Connect API keys.")
 
-        // The `@OptionGroup` attribute includes the flags, options, and arguments defined by another
-        // `ParsableArguments` type.
         @OptionGroup()
         var options: Options
 
@@ -42,16 +40,14 @@ extension ASC.Keys {
     struct Activate: ParsableCommand {
         static var configuration = CommandConfiguration(abstract: "Makes a registered API key the default one.")
 
-        // The `@OptionGroup` attribute includes the flags, options, and arguments defined by another
-        // `ParsableArguments` type.
         @OptionGroup()
         var options: Options
 
         @Option(name: .shortAndLong, help: "The key's id.")
-        var id: String
+        var keyId: String
 
         func run() throws {
-            let activatedKey = try ASCService.activateApiKey(id: id)
+            let activatedKey = try ASCService.activateApiKey(id: keyId)
             print(activatedKey)
         }
     }
@@ -60,13 +56,11 @@ extension ASC.Keys {
     struct Register: ParsableCommand {
         static var configuration = CommandConfiguration(abstract: "Registers App Store Connect API keys locally.")
 
-        // The `@OptionGroup` attribute includes the flags, options, and arguments defined by another
-        // `ParsableArguments` type.
         @OptionGroup()
         var options: Options
 
         @Option(name: .shortAndLong, help: "The key's id.")
-        var id: String
+        var keyId: String
 
         @Option(name: .shortAndLong, help: "The key's name you. You can choose freely.")
         var name: String
@@ -78,7 +72,7 @@ extension ASC.Keys {
         var issuerId: String
 
         func run() throws {
-            let key = ApiKey(id: id, name: name, source: .localFilePath(path: path), issuerId: issuerId)
+            let key = ApiKey(id: keyId, name: name, source: .localFilePath(path: path), issuerId: issuerId)
             let registeredKey = try ASCService.registerApiKey(key: key)
             print(registeredKey)
         }
@@ -88,17 +82,28 @@ extension ASC.Keys {
     struct Delete: ParsableCommand {
         static var configuration = CommandConfiguration(abstract: "Delete locally stored App Store Connect API keys.")
 
-        // The `@OptionGroup` attribute includes the flags, options, and arguments defined by another
-        // `ParsableArguments` type.
         @OptionGroup()
         var options: Options
 
         @Option(name: .shortAndLong, help: "The key's id.")
-        var id: String
+        var keyId: String
 
         func run() throws {
-            let deletedKey = try ASCService.deleteApiKey(id: id)
+            let deletedKey = try ASCService.deleteApiKey(id: keyId)
             print(deletedKey)
         }
     }
+
+    /// Generate a token from a locally stored App Store Connect API keys.
+    struct Token: ParsableCommand {
+        static var configuration = CommandConfiguration(abstract: "Generate a token from a locally stored App Store Connect API keys.")
+
+        @OptionGroup()
+        var options: ApiKeyOptions
+
+        func run() throws {
+            let token = try ASCService.createAccessToken(keyId: options.keyId)
+            print(token)
+        }
+    }
 }
diff --git a/Sources/Core/Core.swift b/Sources/Core/Core.swift
@@ -8,5 +8,5 @@
 import Foundation
 
 public struct Constants {
-    public static let version = "0.4.1"
+    public static let version = "0.4.2"
 }
diff --git a/Sources/Core/Logger.swift b/Sources/Core/Logger.swift
@@ -63,17 +63,17 @@ public extension Logger {
 
         var name: String {
             switch self {
-            case .warn: return "Warn"
-            case .info: return "Info"
-            case .error: return "Error"
+            case .warn: "Warn"
+            case .info: "Info"
+            case .error: "Error"
             }
         }
 
         var emoji: String {
             switch self {
-            case .warn: return "🟡"
-            case .info: return "🟢"
-            case .error: return "🔴"
+            case .warn: "🟡"
+            case .info: "🟢"
+            case .error: "🔴"
             }
         }
     }
diff --git a/Sources/Core/Networking/JSONWebToken.swift b/Sources/Core/Networking/JSONWebToken.swift
@@ -32,10 +32,9 @@ public struct JSONWebToken {
     }
 
     public static func token(for service: Service) async throws -> String {
-
         switch service {
-        case .apns(let credentials): return try token(credentials: credentials)
-        case .fcm(let credentials): return try await token(credentials: credentials)
+        case .apns(let credentials): try token(credentials: credentials)
+        case .fcm(let credentials): try await token(credentials: credentials)
         }
     }
 
diff --git a/Sources/Core/Shell/Xcodebuild.swift b/Sources/Core/Shell/Xcodebuild.swift
@@ -46,8 +46,8 @@ public struct Xcodebuild {
 
         var name: String {
             switch self {
-            case .buildForTesting: return "build-for-testing"
-            case .testWithoutBuilding: return "test-without-building"
+            case .buildForTesting: "build-for-testing"
+            case .testWithoutBuilding: "test-without-building"
             }
         }
     }
diff --git a/Sources/Push/PushEndpoint.swift b/Sources/Push/PushEndpoint.swift
@@ -22,36 +22,35 @@ extension PushEndpoint: Endpoint {
     
     var host: String {
         switch self {
-        case .pushViaApns(_, let endpoint, _, _, _): return endpoint.host
-        case .pushViaFcm: return "fcm.googleapis.com"
+        case .pushViaApns(_, let endpoint, _, _, _): endpoint.host
+        case .pushViaFcm: "fcm.googleapis.com"
         }
     }
     
     var port: Int? {
         switch self {
-        case .pushViaApns: return 443
-        case .pushViaFcm: return nil
+        case .pushViaApns: 443
+        case .pushViaFcm: nil
         }
     }
 
     var path: String {
         switch self {
-        case let .pushViaApns(_, _, deviceToken, _, _): return "/3/device/\(deviceToken)"
-        case let .pushViaFcm(_, _, credentials): return "/v1/projects/\(credentials.projectId)/messages:send"
+        case let .pushViaApns(_, _, deviceToken, _, _): "/3/device/\(deviceToken)"
+        case let .pushViaFcm(_, _, credentials):  "/v1/projects/\(credentials.projectId)/messages:send"
         }
     }
 
     var queryItems: [URLQueryItem] {
         switch self {
-        case .pushViaApns: return []
-        case .pushViaFcm: return []
+        case .pushViaApns: []
+        case .pushViaFcm: []
         }
     }
 
     var method: HTTPMethod {
         switch self {
-        case .pushViaApns, .pushViaFcm:
-            return .post
+        case .pushViaApns, .pushViaFcm: .post
         }
     }
 
@@ -100,16 +99,20 @@ extension PushEndpoint: Endpoint {
     var parameters: [String : Any]? {
         switch self {
         case let .pushViaApns(_, _, _, _, message):
-            return ["aps": ["alert": message]]
+            [
+                "aps": [
+                        "alert": message
+                ]
+            ]
         case let .pushViaFcm(deviceToken, message, _):
-            return [
+            [
                 "message": [
                     "notification": [
                         "title": "Hello FCM",
                         "body": message
                     ],
                     "token": deviceToken
-                ] as [String: Any]
+                ]
             ]
         }
     }
diff --git a/Sources/Push/commands/sub/Apns.swift b/Sources/Push/commands/sub/Apns.swift
@@ -19,8 +19,8 @@ extension Push {
             
             var host: String {
                 switch self {
-                case .sandbox: return "api.sandbox.push.apple.com"
-                case .production: return "api.push.apple.com"
+                case .sandbox: "api.sandbox.push.apple.com"
+                case .production: "api.push.apple.com"
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@`
`8`	`8`	`import Foundation`
`9`	`9`
`10`	`10`	`public struct Constants {`
`11`		`- public static let version = "0.4.1"`
	`11`	`+ public static let version = "0.4.2"`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,17 +63,17 @@ public extension Logger {`
`63`	`63`
`64`	`64`	`var name: String {`
`65`	`65`	`switch self {`
`66`		`- case .warn: return "Warn"`
`67`		`- case .info: return "Info"`
`68`		`- case .error: return "Error"`
	`66`	`+ case .warn: "Warn"`
	`67`	`+ case .info: "Info"`
	`68`	`+ case .error: "Error"`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`var emoji: String {`
`73`	`73`	`switch self {`
`74`		`- case .warn: return "🟡"`
`75`		`- case .info: return "🟢"`
`76`		`- case .error: return "🔴"`
	`74`	`+ case .warn: "🟡"`
	`75`	`+ case .info: "🟢"`
	`76`	`+ case .error: "🔴"`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,9 @@ public struct JSONWebToken {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public static func token(for service: Service) async throws -> String {`
`35`		`-`
`36`	`35`	`switch service {`
`37`		`- case .apns(let credentials): return try token(credentials: credentials)`
`38`		`- case .fcm(let credentials): return try await token(credentials: credentials)`
	`36`	`+ case .apns(let credentials): try token(credentials: credentials)`
	`37`	`+ case .fcm(let credentials): try await token(credentials: credentials)`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ public struct Xcodebuild {`
`46`	`46`
`47`	`47`	`var name: String {`
`48`	`48`	`switch self {`
`49`		`- case .buildForTesting: return "build-for-testing"`
`50`		`- case .testWithoutBuilding: return "test-without-building"`
	`49`	`+ case .buildForTesting: "build-for-testing"`
	`50`	`+ case .testWithoutBuilding: "test-without-building"`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,36 +22,35 @@ extension PushEndpoint: Endpoint {`
`22`	`22`
`23`	`23`	`var host: String {`
`24`	`24`	`switch self {`
`25`		`- case .pushViaApns(_, let endpoint, _, _, _): return endpoint.host`
`26`		`- case .pushViaFcm: return "fcm.googleapis.com"`
	`25`	`+ case .pushViaApns(_, let endpoint, _, _, _): endpoint.host`
	`26`	`+ case .pushViaFcm: "fcm.googleapis.com"`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`var port: Int? {`
`31`	`31`	`switch self {`
`32`		`- case .pushViaApns: return 443`
`33`		`- case .pushViaFcm: return nil`
	`32`	`+ case .pushViaApns: 443`
	`33`	`+ case .pushViaFcm: nil`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`var path: String {`
`38`	`38`	`switch self {`
`39`		`- case let .pushViaApns(_, _, deviceToken, _, _): return "/3/device/\(deviceToken)"`
`40`		`- case let .pushViaFcm(_, _, credentials): return "/v1/projects/\(credentials.projectId)/messages:send"`
	`39`	`+ case let .pushViaApns(_, _, deviceToken, _, _): "/3/device/\(deviceToken)"`
	`40`	`+ case let .pushViaFcm(_, _, credentials): "/v1/projects/\(credentials.projectId)/messages:send"`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`var queryItems: [URLQueryItem] {`
`45`	`45`	`switch self {`
`46`		`- case .pushViaApns: return []`
`47`		`- case .pushViaFcm: return []`
	`46`	`+ case .pushViaApns: []`
	`47`	`+ case .pushViaFcm: []`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`var method: HTTPMethod {`
`52`	`52`	`switch self {`
`53`		`- case .pushViaApns, .pushViaFcm:`
`54`		`- return .post`
	`53`	`+ case .pushViaApns, .pushViaFcm: .post`
`55`	`54`	`}`
`56`	`55`	`}`
`57`	`56`
`@@ -100,16 +99,20 @@ extension PushEndpoint: Endpoint {`
`100`	`99`	`var parameters: [String : Any]? {`
`101`	`100`	`switch self {`
`102`	`101`	`case let .pushViaApns(_, _, _, _, message):`
`103`		`- return ["aps": ["alert": message]]`
	`102`	`+ [`
	`103`	`+ "aps": [`
	`104`	`+ "alert": message`
	`105`	`+ ]`
	`106`	`+ ]`
`104`	`107`	`case let .pushViaFcm(deviceToken, message, _):`
`105`		`- return [`
	`108`	`+ [`
`106`	`109`	`"message": [`
`107`	`110`	`"notification": [`
`108`	`111`	`"title": "Hello FCM",`
`109`	`112`	`"body": message`
`110`	`113`	`],`
`111`	`114`	`"token": deviceToken`
`112`		`- ] as [String: Any]`
	`115`	`+ ]`
`113`	`116`	`]`
`114`	`117`	`}`
`115`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ extension Push {`
`19`	`19`
`20`	`20`	`var host: String {`
`21`	`21`	`switch self {`
`22`		`- case .sandbox: return "api.sandbox.push.apple.com"`
`23`		`- case .production: return "api.push.apple.com"`
	`22`	`+ case .sandbox: "api.sandbox.push.apple.com"`
	`23`	`+ case .production: "api.push.apple.com"`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`