Compare commits

...

9 Commits

26 changed files with 953 additions and 223 deletions
+7 -1
View File
@@ -1,5 +1,11 @@
on:
- push
push:
branches:
- main
pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build-linux:
strategy:
+33
View File
@@ -107,3 +107,36 @@ iconPath: Resources/AppIcon.png
> Tip:
>
> Your app icon must be a png, and it should ideally have a resolution of 1024x1024px.
## Add entitlements
You may need to add special [entitlements](https://developer.apple.com/documentation/bundleresources/entitlements) to your app, for example you need the `com.apple.developer.homekit` entitlement in order to connect to HomeKit devices.
First create an `App.entitlements` file with the necessary entitlements:
```plist
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.developer.homekit</key>
<true/>
</dict>
</plist>
```
Then, tell xtool about it via `xtool.yml`:
```yaml
entitlementsPath: App.entitlements
```
> Troubleshooting:
>
> There are a number of situations in which xtool may not be able to successfully apply an entitlement to your app.
>
> - Some entitlements, such as [Network Extension](https://developer.apple.com/documentation/bundleresources/entitlements/com.apple.developer.networking.networkextension), don't work with free developer accounts. You might need to enrol in one of the Apple Developer Programs to use these.
> - Other entitlements, like [User Notifications Filtering](https://developer.apple.com/documentation/bundleresources/entitlements/com.apple.developer.usernotifications.filtering), require special permission from Apple. If you do have the appropriate permission, these may or may not work with xtool.
> - Many entitlements require specific "Capabilities" to be enabled on your app in the Developer Services portal. xtool handles this for you, but we need to add code to xtool for each Entitlement-Capability mapping. If you run into a Capability that we don't handle yet, please let us know.
>
> Entitlements are a large surface area. If you find any bugs or missing functionality, please [create a GitHub Issue](https://github.com/xtool-org/xtool/issues/new/choose).
+530 -60
View File
@@ -477,9 +477,56 @@ public enum Components {
/// - Remark: Generated from `#/components/schemas/App/attributes/subscriptionStatusUrlVersionForSandbox`.
public var subscriptionStatusUrlVersionForSandbox: Components.Schemas.SubscriptionStatusUrlVersion?
/// - Remark: Generated from `#/components/schemas/App/attributes/contentRightsDeclaration`.
@frozen public enum ContentRightsDeclarationPayload: String, Codable, Hashable, Sendable, CaseIterable {
case doesNotUseThirdPartyContent = "DOES_NOT_USE_THIRD_PARTY_CONTENT"
case usesThirdPartyContent = "USES_THIRD_PARTY_CONTENT"
public struct ContentRightsDeclarationPayload: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/App/attributes/contentRightsDeclaration/value1`.
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
case doesNotUseThirdPartyContent = "DOES_NOT_USE_THIRD_PARTY_CONTENT"
case usesThirdPartyContent = "USES_THIRD_PARTY_CONTENT"
}
/// - Remark: Generated from `#/components/schemas/App/attributes/contentRightsDeclaration/value1`.
public var value1: Components.Schemas.App.AttributesPayload.ContentRightsDeclarationPayload.Value1Payload?
/// - Remark: Generated from `#/components/schemas/App/attributes/contentRightsDeclaration/value2`.
public var value2: Swift.String?
/// Creates a new `ContentRightsDeclarationPayload`.
///
/// - Parameters:
/// - value1:
/// - value2:
public init(
value1: Components.Schemas.App.AttributesPayload.ContentRightsDeclarationPayload.Value1Payload? = nil,
value2: Swift.String? = nil
) {
self.value1 = value1
self.value2 = value2
}
public init(from decoder: any Decoder) throws {
var errors: [any Error] = []
do {
self.value1 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
do {
self.value2 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
[
self.value1,
self.value2
],
type: Self.self,
codingPath: decoder.codingPath,
errors: errors
)
}
public func encode(to encoder: any Encoder) throws {
try encoder.encodeFirstNonNilValueToSingleValueContainer([
self.value1,
self.value2
])
}
}
/// - Remark: Generated from `#/components/schemas/App/attributes/contentRightsDeclaration`.
public var contentRightsDeclaration: Components.Schemas.App.AttributesPayload.ContentRightsDeclarationPayload?
@@ -3522,9 +3569,56 @@ public enum Components {
/// - Remark: Generated from `#/components/schemas/Device/attributes/deviceClass`.
public var deviceClass: Components.Schemas.Device.AttributesPayload.DeviceClassPayload?
/// - Remark: Generated from `#/components/schemas/Device/attributes/status`.
@frozen public enum StatusPayload: String, Codable, Hashable, Sendable, CaseIterable {
case enabled = "ENABLED"
case disabled = "DISABLED"
public struct StatusPayload: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/Device/attributes/status/value1`.
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
case enabled = "ENABLED"
case disabled = "DISABLED"
}
/// - Remark: Generated from `#/components/schemas/Device/attributes/status/value1`.
public var value1: Components.Schemas.Device.AttributesPayload.StatusPayload.Value1Payload?
/// - Remark: Generated from `#/components/schemas/Device/attributes/status/value2`.
public var value2: Swift.String?
/// Creates a new `StatusPayload`.
///
/// - Parameters:
/// - value1:
/// - value2:
public init(
value1: Components.Schemas.Device.AttributesPayload.StatusPayload.Value1Payload? = nil,
value2: Swift.String? = nil
) {
self.value1 = value1
self.value2 = value2
}
public init(from decoder: any Decoder) throws {
var errors: [any Error] = []
do {
self.value1 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
do {
self.value2 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
[
self.value1,
self.value2
],
type: Self.self,
codingPath: decoder.codingPath,
errors: errors
)
}
public func encode(to encoder: any Encoder) throws {
try encoder.encodeFirstNonNilValueToSingleValueContainer([
self.value1,
self.value2
])
}
}
/// - Remark: Generated from `#/components/schemas/Device/attributes/status`.
public var status: Components.Schemas.Device.AttributesPayload.StatusPayload?
@@ -3738,9 +3832,56 @@ public enum Components {
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/name`.
public var name: Swift.String?
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/status`.
@frozen public enum StatusPayload: String, Codable, Hashable, Sendable, CaseIterable {
case enabled = "ENABLED"
case disabled = "DISABLED"
public struct StatusPayload: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/status/value1`.
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
case enabled = "ENABLED"
case disabled = "DISABLED"
}
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/status/value1`.
public var value1: Components.Schemas.DeviceUpdateRequest.DataPayload.AttributesPayload.StatusPayload.Value1Payload?
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/status/value2`.
public var value2: Swift.String?
/// Creates a new `StatusPayload`.
///
/// - Parameters:
/// - value1:
/// - value2:
public init(
value1: Components.Schemas.DeviceUpdateRequest.DataPayload.AttributesPayload.StatusPayload.Value1Payload? = nil,
value2: Swift.String? = nil
) {
self.value1 = value1
self.value2 = value2
}
public init(from decoder: any Decoder) throws {
var errors: [any Error] = []
do {
self.value1 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
do {
self.value2 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
[
self.value1,
self.value2
],
type: Self.self,
codingPath: decoder.codingPath,
errors: errors
)
}
public func encode(to encoder: any Encoder) throws {
try encoder.encodeFirstNonNilValueToSingleValueContainer([
self.value1,
self.value2
])
}
}
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/status`.
public var status: Components.Schemas.DeviceUpdateRequest.DataPayload.AttributesPayload.StatusPayload?
@@ -3814,28 +3955,122 @@ public enum Components {
/// - Remark: Generated from `#/components/schemas/Profile/attributes/platform`.
public var platform: Components.Schemas.BundleIdPlatform?
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileType`.
@frozen public enum ProfileTypePayload: String, Codable, Hashable, Sendable, CaseIterable {
case iosAppDevelopment = "IOS_APP_DEVELOPMENT"
case iosAppStore = "IOS_APP_STORE"
case iosAppAdhoc = "IOS_APP_ADHOC"
case iosAppInhouse = "IOS_APP_INHOUSE"
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
case macAppStore = "MAC_APP_STORE"
case macAppDirect = "MAC_APP_DIRECT"
case tvosAppDevelopment = "TVOS_APP_DEVELOPMENT"
case tvosAppStore = "TVOS_APP_STORE"
case tvosAppAdhoc = "TVOS_APP_ADHOC"
case tvosAppInhouse = "TVOS_APP_INHOUSE"
case macCatalystAppDevelopment = "MAC_CATALYST_APP_DEVELOPMENT"
case macCatalystAppStore = "MAC_CATALYST_APP_STORE"
case macCatalystAppDirect = "MAC_CATALYST_APP_DIRECT"
public struct ProfileTypePayload: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileType/value1`.
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
case iosAppDevelopment = "IOS_APP_DEVELOPMENT"
case iosAppStore = "IOS_APP_STORE"
case iosAppAdhoc = "IOS_APP_ADHOC"
case iosAppInhouse = "IOS_APP_INHOUSE"
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
case macAppStore = "MAC_APP_STORE"
case macAppDirect = "MAC_APP_DIRECT"
case tvosAppDevelopment = "TVOS_APP_DEVELOPMENT"
case tvosAppStore = "TVOS_APP_STORE"
case tvosAppAdhoc = "TVOS_APP_ADHOC"
case tvosAppInhouse = "TVOS_APP_INHOUSE"
case macCatalystAppDevelopment = "MAC_CATALYST_APP_DEVELOPMENT"
case macCatalystAppStore = "MAC_CATALYST_APP_STORE"
case macCatalystAppDirect = "MAC_CATALYST_APP_DIRECT"
}
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileType/value1`.
public var value1: Components.Schemas.Profile.AttributesPayload.ProfileTypePayload.Value1Payload?
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileType/value2`.
public var value2: Swift.String?
/// Creates a new `ProfileTypePayload`.
///
/// - Parameters:
/// - value1:
/// - value2:
public init(
value1: Components.Schemas.Profile.AttributesPayload.ProfileTypePayload.Value1Payload? = nil,
value2: Swift.String? = nil
) {
self.value1 = value1
self.value2 = value2
}
public init(from decoder: any Decoder) throws {
var errors: [any Error] = []
do {
self.value1 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
do {
self.value2 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
[
self.value1,
self.value2
],
type: Self.self,
codingPath: decoder.codingPath,
errors: errors
)
}
public func encode(to encoder: any Encoder) throws {
try encoder.encodeFirstNonNilValueToSingleValueContainer([
self.value1,
self.value2
])
}
}
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileType`.
public var profileType: Components.Schemas.Profile.AttributesPayload.ProfileTypePayload?
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileState`.
@frozen public enum ProfileStatePayload: String, Codable, Hashable, Sendable, CaseIterable {
case active = "ACTIVE"
case invalid = "INVALID"
public struct ProfileStatePayload: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileState/value1`.
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
case active = "ACTIVE"
case invalid = "INVALID"
}
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileState/value1`.
public var value1: Components.Schemas.Profile.AttributesPayload.ProfileStatePayload.Value1Payload?
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileState/value2`.
public var value2: Swift.String?
/// Creates a new `ProfileStatePayload`.
///
/// - Parameters:
/// - value1:
/// - value2:
public init(
value1: Components.Schemas.Profile.AttributesPayload.ProfileStatePayload.Value1Payload? = nil,
value2: Swift.String? = nil
) {
self.value1 = value1
self.value2 = value2
}
public init(from decoder: any Decoder) throws {
var errors: [any Error] = []
do {
self.value1 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
do {
self.value2 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
[
self.value1,
self.value2
],
type: Self.self,
codingPath: decoder.codingPath,
errors: errors
)
}
public func encode(to encoder: any Encoder) throws {
try encoder.encodeFirstNonNilValueToSingleValueContainer([
self.value1,
self.value2
])
}
}
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileState`.
public var profileState: Components.Schemas.Profile.AttributesPayload.ProfileStatePayload?
@@ -4291,21 +4526,68 @@ public enum Components {
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/name`.
public var name: Swift.String
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/profileType`.
@frozen public enum ProfileTypePayload: String, Codable, Hashable, Sendable, CaseIterable {
case iosAppDevelopment = "IOS_APP_DEVELOPMENT"
case iosAppStore = "IOS_APP_STORE"
case iosAppAdhoc = "IOS_APP_ADHOC"
case iosAppInhouse = "IOS_APP_INHOUSE"
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
case macAppStore = "MAC_APP_STORE"
case macAppDirect = "MAC_APP_DIRECT"
case tvosAppDevelopment = "TVOS_APP_DEVELOPMENT"
case tvosAppStore = "TVOS_APP_STORE"
case tvosAppAdhoc = "TVOS_APP_ADHOC"
case tvosAppInhouse = "TVOS_APP_INHOUSE"
case macCatalystAppDevelopment = "MAC_CATALYST_APP_DEVELOPMENT"
case macCatalystAppStore = "MAC_CATALYST_APP_STORE"
case macCatalystAppDirect = "MAC_CATALYST_APP_DIRECT"
public struct ProfileTypePayload: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/profileType/value1`.
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
case iosAppDevelopment = "IOS_APP_DEVELOPMENT"
case iosAppStore = "IOS_APP_STORE"
case iosAppAdhoc = "IOS_APP_ADHOC"
case iosAppInhouse = "IOS_APP_INHOUSE"
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
case macAppStore = "MAC_APP_STORE"
case macAppDirect = "MAC_APP_DIRECT"
case tvosAppDevelopment = "TVOS_APP_DEVELOPMENT"
case tvosAppStore = "TVOS_APP_STORE"
case tvosAppAdhoc = "TVOS_APP_ADHOC"
case tvosAppInhouse = "TVOS_APP_INHOUSE"
case macCatalystAppDevelopment = "MAC_CATALYST_APP_DEVELOPMENT"
case macCatalystAppStore = "MAC_CATALYST_APP_STORE"
case macCatalystAppDirect = "MAC_CATALYST_APP_DIRECT"
}
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/profileType/value1`.
public var value1: Components.Schemas.ProfileCreateRequest.DataPayload.AttributesPayload.ProfileTypePayload.Value1Payload?
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/profileType/value2`.
public var value2: Swift.String?
/// Creates a new `ProfileTypePayload`.
///
/// - Parameters:
/// - value1:
/// - value2:
public init(
value1: Components.Schemas.ProfileCreateRequest.DataPayload.AttributesPayload.ProfileTypePayload.Value1Payload? = nil,
value2: Swift.String? = nil
) {
self.value1 = value1
self.value2 = value2
}
public init(from decoder: any Decoder) throws {
var errors: [any Error] = []
do {
self.value1 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
do {
self.value2 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
[
self.value1,
self.value2
],
type: Self.self,
codingPath: decoder.codingPath,
errors: errors
)
}
public func encode(to encoder: any Encoder) throws {
try encoder.encodeFirstNonNilValueToSingleValueContainer([
self.value1,
self.value2
])
}
}
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/profileType`.
public var profileType: Components.Schemas.ProfileCreateRequest.DataPayload.AttributesPayload.ProfileTypePayload
@@ -5116,13 +5398,60 @@ public enum Components {
/// - Remark: Generated from `#/components/schemas/CapabilityOption`.
public struct CapabilityOption: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/CapabilityOption/key`.
@frozen public enum KeyPayload: String, Codable, Hashable, Sendable, CaseIterable {
case xcode5 = "XCODE_5"
case xcode6 = "XCODE_6"
case completeProtection = "COMPLETE_PROTECTION"
case protectedUnlessOpen = "PROTECTED_UNLESS_OPEN"
case protectedUntilFirstUserAuth = "PROTECTED_UNTIL_FIRST_USER_AUTH"
case primaryAppConsent = "PRIMARY_APP_CONSENT"
public struct KeyPayload: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/CapabilityOption/key/value1`.
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
case xcode5 = "XCODE_5"
case xcode6 = "XCODE_6"
case completeProtection = "COMPLETE_PROTECTION"
case protectedUnlessOpen = "PROTECTED_UNLESS_OPEN"
case protectedUntilFirstUserAuth = "PROTECTED_UNTIL_FIRST_USER_AUTH"
case primaryAppConsent = "PRIMARY_APP_CONSENT"
}
/// - Remark: Generated from `#/components/schemas/CapabilityOption/key/value1`.
public var value1: Components.Schemas.CapabilityOption.KeyPayload.Value1Payload?
/// - Remark: Generated from `#/components/schemas/CapabilityOption/key/value2`.
public var value2: Swift.String?
/// Creates a new `KeyPayload`.
///
/// - Parameters:
/// - value1:
/// - value2:
public init(
value1: Components.Schemas.CapabilityOption.KeyPayload.Value1Payload? = nil,
value2: Swift.String? = nil
) {
self.value1 = value1
self.value2 = value2
}
public init(from decoder: any Decoder) throws {
var errors: [any Error] = []
do {
self.value1 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
do {
self.value2 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
[
self.value1,
self.value2
],
type: Self.self,
codingPath: decoder.codingPath,
errors: errors
)
}
public func encode(to encoder: any Encoder) throws {
try encoder.encodeFirstNonNilValueToSingleValueContainer([
self.value1,
self.value2
])
}
}
/// - Remark: Generated from `#/components/schemas/CapabilityOption/key`.
public var key: Components.Schemas.CapabilityOption.KeyPayload?
@@ -5172,10 +5501,57 @@ public enum Components {
/// - Remark: Generated from `#/components/schemas/CapabilitySetting`.
public struct CapabilitySetting: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/key`.
@frozen public enum KeyPayload: String, Codable, Hashable, Sendable, CaseIterable {
case icloudVersion = "ICLOUD_VERSION"
case dataProtectionPermissionLevel = "DATA_PROTECTION_PERMISSION_LEVEL"
case appleIdAuthAppConsent = "APPLE_ID_AUTH_APP_CONSENT"
public struct KeyPayload: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/key/value1`.
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
case icloudVersion = "ICLOUD_VERSION"
case dataProtectionPermissionLevel = "DATA_PROTECTION_PERMISSION_LEVEL"
case appleIdAuthAppConsent = "APPLE_ID_AUTH_APP_CONSENT"
}
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/key/value1`.
public var value1: Components.Schemas.CapabilitySetting.KeyPayload.Value1Payload?
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/key/value2`.
public var value2: Swift.String?
/// Creates a new `KeyPayload`.
///
/// - Parameters:
/// - value1:
/// - value2:
public init(
value1: Components.Schemas.CapabilitySetting.KeyPayload.Value1Payload? = nil,
value2: Swift.String? = nil
) {
self.value1 = value1
self.value2 = value2
}
public init(from decoder: any Decoder) throws {
var errors: [any Error] = []
do {
self.value1 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
do {
self.value2 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
[
self.value1,
self.value2
],
type: Self.self,
codingPath: decoder.codingPath,
errors: errors
)
}
public func encode(to encoder: any Encoder) throws {
try encoder.encodeFirstNonNilValueToSingleValueContainer([
self.value1,
self.value2
])
}
}
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/key`.
public var key: Components.Schemas.CapabilitySetting.KeyPayload?
@@ -5188,10 +5564,57 @@ public enum Components {
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/visible`.
public var visible: Swift.Bool?
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/allowedInstances`.
@frozen public enum AllowedInstancesPayload: String, Codable, Hashable, Sendable, CaseIterable {
case entry = "ENTRY"
case single = "SINGLE"
case multiple = "MULTIPLE"
public struct AllowedInstancesPayload: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/allowedInstances/value1`.
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
case entry = "ENTRY"
case single = "SINGLE"
case multiple = "MULTIPLE"
}
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/allowedInstances/value1`.
public var value1: Components.Schemas.CapabilitySetting.AllowedInstancesPayload.Value1Payload?
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/allowedInstances/value2`.
public var value2: Swift.String?
/// Creates a new `AllowedInstancesPayload`.
///
/// - Parameters:
/// - value1:
/// - value2:
public init(
value1: Components.Schemas.CapabilitySetting.AllowedInstancesPayload.Value1Payload? = nil,
value2: Swift.String? = nil
) {
self.value1 = value1
self.value2 = value2
}
public init(from decoder: any Decoder) throws {
var errors: [any Error] = []
do {
self.value1 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
do {
self.value2 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
[
self.value1,
self.value2
],
type: Self.self,
codingPath: decoder.codingPath,
errors: errors
)
}
public func encode(to encoder: any Encoder) throws {
try encoder.encodeFirstNonNilValueToSingleValueContainer([
self.value1,
self.value2
])
}
}
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/allowedInstances`.
public var allowedInstances: Components.Schemas.CapabilitySetting.AllowedInstancesPayload?
@@ -5387,9 +5810,56 @@ public enum Components {
}
}
/// - Remark: Generated from `#/components/schemas/SubscriptionStatusUrlVersion`.
@frozen public enum SubscriptionStatusUrlVersion: String, Codable, Hashable, Sendable, CaseIterable {
case v1 = "V1"
case v2 = "V2"
public struct SubscriptionStatusUrlVersion: Codable, Hashable, Sendable {
/// - Remark: Generated from `#/components/schemas/SubscriptionStatusUrlVersion/value1`.
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
case v1 = "V1"
case v2 = "V2"
}
/// - Remark: Generated from `#/components/schemas/SubscriptionStatusUrlVersion/value1`.
public var value1: Components.Schemas.SubscriptionStatusUrlVersion.Value1Payload?
/// - Remark: Generated from `#/components/schemas/SubscriptionStatusUrlVersion/value2`.
public var value2: Swift.String?
/// Creates a new `SubscriptionStatusUrlVersion`.
///
/// - Parameters:
/// - value1:
/// - value2:
public init(
value1: Components.Schemas.SubscriptionStatusUrlVersion.Value1Payload? = nil,
value2: Swift.String? = nil
) {
self.value1 = value1
self.value2 = value2
}
public init(from decoder: any Decoder) throws {
var errors: [any Error] = []
do {
self.value1 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
do {
self.value2 = try decoder.decodeFromSingleValueContainer()
} catch {
errors.append(error)
}
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
[
self.value1,
self.value2
],
type: Self.self,
codingPath: decoder.codingPath,
errors: errors
)
}
public func encode(to encoder: any Encoder) throws {
try encoder.encodeFirstNonNilValueToSingleValueContainer([
self.value1,
self.value2
])
}
}
}
/// Types generated from the `#/components/parameters` section of the OpenAPI document.
+27 -5
View File
@@ -39,6 +39,29 @@ function makeOpen(enumSchema) {
});
}
function openAll(schema, path = []) {
if (Array.isArray(schema)) {
schema.forEach((s, i) => openAll(s, [...path, i]))
} else if (typeof schema === 'object' && schema !== null) {
const keys = new Set(Object.keys(schema))
if (keys.size === 2
&& keys.has('type')
&& keys.has('enum')
&& schema.type === 'string'
&& Array.isArray(schema.enum)) {
// several polymorphic schemas have a field literally named 'type', that always has a single case.
// skip that instance, but make all other enums open.
if (!(path[path.length - 1] === 'type' && schema.enum.length === 1)) {
makeOpen(schema);
}
} else {
for (const key in schema) {
openAll(schema[key], [...path, key]);
}
}
}
}
function patch(schema) {
const schemas = schema.components.schemas;
@@ -71,12 +94,11 @@ function patch(schema) {
schemas.App.properties.relationships.properties.inAppPurchases.deprecated = false;
// openapi-generator expects response enums to be exhaustive. Apple's ASC OpenAPI spec
// misses some cases that they do, actually, return.
// misses some cases that they do, actually, return. So we make all bona fide enums in
// schema.components.schemas open. We don't do this on the schema.paths side because
// most (all?) of the enums in there are on the request side rather than the response.
// https://swiftpackageindex.com/apple/swift-openapi-generator/1.7.2/documentation/swift-openapi-generator/useful-openapi-patterns#Open-enums-and-oneOfs
makeOpen(schemas.BundleIdPlatform);
makeOpen(schemas.CapabilityType);
makeOpen(schemas.CertificateType);
makeOpen(schemas.Device.properties.attributes.properties.deviceClass);
openAll(schemas);
return schema;
}
+3 -1
View File
@@ -153,7 +153,8 @@ public struct Planner: Sendable {
bundleID: bundleID,
infoPlist: infoPlist,
resources: resources,
iconPath: self.schema.base.iconPath
iconPath: self.schema.base.iconPath,
entitlementsPath: self.schema.base.entitlementsPath
)
}
@@ -217,6 +218,7 @@ public struct Plan: Sendable {
public var infoPlist: [String: any Sendable]
public var resources: [Resource]
public var iconPath: String?
public var entitlementsPath: String?
}
public enum Resource: Codable, Sendable {
+10 -4
View File
@@ -42,6 +42,15 @@ public struct XcodePacker {
throw StringError("Could not parse deployment target '\(plan.deploymentTarget)'")
}
var buildSettings: [String: Any] = [
"PRODUCT_BUNDLE_IDENTIFIER": plan.bundleID,
"TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
]
if let entitlementsPath = plan.entitlementsPath {
buildSettings["CODE_SIGN_ENTITLEMENTS"] = fromProjectToRoot + Path(entitlementsPath)
}
let project = Project(
name: plan.product,
targets: [
@@ -50,10 +59,7 @@ public struct XcodePacker {
type: .application,
platform: .iOS,
deploymentTarget: deploymentTarget,
settings: Settings(buildSettings: [
"PRODUCT_BUNDLE_IDENTIFIER": plan.bundleID,
"TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
]),
settings: Settings(buildSettings: buildSettings),
sources: [
TargetSource(path: (fromProjectToRoot + emptyFile).string),
],
@@ -41,14 +41,22 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
private func upsertApp(
bundleID: String,
entitlements: Entitlements,
isFreeTeam: Bool,
appIDs: [String: Components.Schemas.BundleId]
isFreeTeam: Bool
) async throws -> Components.Schemas.BundleId {
let newBundleID = ProvisioningIdentifiers.identifier(fromSanitized: bundleID, context: self.context)
let existing = try await context.developerAPIClient
.bundleIdsGetCollection(query: .init(
filter_lbrack_identifier_rbrack_: [bundleID]
))
.ok.body.json.data
// filter[identifier] is a prefix filter so we need to manually upgrade to equality
.first(where: { $0.attributes?.identifier == newBundleID })
let appID: Components.Schemas.BundleId
if let existing = appIDs[bundleID] {
if let existing {
appID = existing
} else {
let newBundleID = ProvisioningIdentifiers.identifier(fromSanitized: bundleID, context: self.context)
let name = ProvisioningIdentifiers.appName(fromSanitized: bundleID)
let createResponse = try await context.developerAPIClient.bundleIdsCreateInstance(
body: .json(
@@ -150,8 +158,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
/// that the app has).
private func addApp(
_ app: URL,
isFreeTeam: Bool,
appIDs: [String: Components.Schemas.BundleId]
isFreeTeam: Bool
) async throws -> ProvisioningInfo {
let infoURL = app.appendingPathComponent("Info.plist")
guard let data = try? Data(contentsOf: infoURL),
@@ -179,7 +186,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
entitlements = try Entitlements(entitlements: [])
}
let appID = try await upsertApp(bundleID: bundleID, entitlements: entitlements, isFreeTeam: isFreeTeam, appIDs: appIDs)
let appID = try await upsertApp(bundleID: bundleID, entitlements: entitlements, isFreeTeam: isFreeTeam)
let newBundleID = appID.attributes!.identifier!
let teamID = try signingInfo.certificate.teamID()
@@ -225,17 +232,6 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
)
}
// keyed by sanitized bundle ID
private func getCurrentAppIDs() async throws -> [String: Components.Schemas.BundleId] {
let bundleIDs = try await context.developerAPIClient.bundleIdsGetCollection().ok.body.json.data
let keyedIDs = bundleIDs
.compactMap { id -> (String, Components.Schemas.BundleId)? in
guard let bundleID = id.attributes?.identifier else { return nil }
return (ProvisioningIdentifiers.sanitize(identifier: bundleID), id)
}
return Dictionary(keyedIDs, uniquingKeysWith: { $1 })
}
/// Registers the app + its extensions, returning the profile and entitlements of each
public func perform() async throws -> [URL: ProvisioningInfo] {
var apps: [URL] = [root]
@@ -244,9 +240,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
apps += plugins.implicitContents.filter { $0.pathExtension.lowercased() == "appex" }
}
async let isFreeTeamTask = context.auth.team()?.isFree == true
async let appIDsTask = getCurrentAppIDs()
let (isFreeTeam, appIDs) = try await (isFreeTeamTask, appIDsTask)
let isFreeTeam = try await context.auth.team()?.isFree == true
return try await withThrowingTaskGroup(
of: (URL, ProvisioningInfo).self,
@@ -254,7 +248,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
) { group in
for app in apps {
group.addTask {
let info = try await addApp(app, isFreeTeam: isFreeTeam, appIDs: appIDs)
let info = try await addApp(app, isFreeTeam: isFreeTeam)
return (app, info)
}
}
@@ -39,7 +39,7 @@ extension Entitlement {
extension DataProtectionEntitlement: EntitlementWithCapability {
var capability: DeveloperServicesCapability {
let option: Components.Schemas.CapabilityOption.KeyPayload = switch self {
let option: Components.Schemas.CapabilityOption.KeyPayload.Value1Payload = switch self {
case .complete: .completeProtection
case .unlessOpen: .protectedUnlessOpen
case .untilFirstAuth: .protectedUntilFirstUserAuth
@@ -49,8 +49,8 @@ extension DataProtectionEntitlement: EntitlementWithCapability {
isFree: true,
settings: [
.init(
key: .dataProtectionPermissionLevel,
options: [.init(key: option)]
key: .init(.dataProtectionPermissionLevel),
options: [.init(key: .init(option))]
)
]
)
@@ -39,7 +39,7 @@ public struct DeveloperServicesProvisioningOperation: DeveloperServicesOperation
public func perform() async throws -> Response {
progress(0/3)
_ = try await DeveloperServicesFetchDeviceOperation(context: context).perform()
try await DeveloperServicesAddDeviceOperation(context: context).perform()
progress(1/3)
let signingInfo = try await DeveloperServicesFetchCertificateOperation(
@@ -0,0 +1,36 @@
import Foundation
import DeveloperAPI
public struct DeveloperServicesAddDeviceOperation: DeveloperServicesOperation {
public let context: SigningContext
public init(context: SigningContext) {
self.context = context
}
public func perform() async throws {
guard let targetDevice = context.targetDevice else { return }
// try to register the device
let response = try await context.developerAPIClient.devicesCreateInstance(
body: .json(.init(data: .init(
_type: .devices,
attributes: .init(
name: targetDevice.name,
platform: .init(.ios),
udid: targetDevice.udid
)
)))
)
// we get a 409 CONFLICT if the device was already registered.
// handle this by returning gracefully.
if (try? response.conflict) != nil {
return
}
// otherwise, we should get a 201 CREATED to indicate that the device
// was added. any other case is unexpected, and this will throw.
_ = try response.created
}
}
@@ -1,39 +0,0 @@
//
// DeveloperServicesFetchDeviceOperation.swift
// XKit
//
// Created by Kabir Oberai on 13/10/19.
// Copyright © 2019 Kabir Oberai. All rights reserved.
//
import Foundation
import DeveloperAPI
public struct DeveloperServicesFetchDeviceOperation: DeveloperServicesOperation {
public let context: SigningContext
public init(context: SigningContext) {
self.context = context
}
public func perform() async throws -> Components.Schemas.Device {
let devices = try await context.developerAPIClient.devicesGetCollection().ok.body.json.data
if let device = devices.first(where: { $0.attributes?.udid == self.context.udid }) {
return device
}
let response = try await context.developerAPIClient.devicesCreateInstance(
body: .json(.init(data: .init(
_type: .devices,
attributes: .init(
name: self.context.deviceName,
platform: .init(.ios),
udid: self.context.udid
)
)))
)
return try response.created.body.json.data
}
}
@@ -0,0 +1,78 @@
import DeveloperAPI
/// An `AsyncSequence` that unfolds a paginated DeveloperAPI request.
///
/// Some Developer API GET requests are paginated. Each response contains
/// a `links.next` field that points to the next page. This API allows you to
/// consume all pages as an `AsyncSequence`. For example, you can
/// enumerate all devices with
///
/// ```swift
/// let pages = DeveloperAPIPages {
/// try await client.devicesGetCollection().ok.body.json
/// } next: {
/// $0.links.next
/// }
/// for try await page in pages {
/// print(page.data)
/// }
/// ```
public struct DeveloperAPIPages<Page>: AsyncSequence {
// inspired by PagedRequest from
// https://github.com/AvdLee/appstoreconnect-swift-sdk
public var request: @Sendable () async throws -> Page
public var getNext: @Sendable (Page) -> String?
public init(
request: @escaping @Sendable () async throws -> Page,
next getNext: @escaping @Sendable (Page) -> String?
) {
self.request = request
self.getNext = getNext
}
public func makeAsyncIterator() -> AsyncIterator {
AsyncIterator(request: request, getNext: getNext)
}
public struct AsyncIterator: AsyncIteratorProtocol {
fileprivate enum State {
case initial
case hasNext(String)
case end
}
fileprivate let request: @Sendable () async throws -> Page
fileprivate let getNext: @Sendable (Page) -> String?
fileprivate var state: State = .initial
public mutating func next() async throws -> Page? {
guard !Task.isCancelled else { return nil }
let cursor: String?
switch state {
case .initial:
cursor = nil
case .hasNext(let next):
cursor = next
case .end:
return nil
}
let page = try await DeveloperAPIClient.withNextLink(cursor) {
try await request()
}
if let next = getNext(page), next != cursor {
state = .hasNext(next)
} else {
state = .end
}
return page
}
}
}
@@ -6,6 +6,8 @@ import OpenAPIURLSession
import Dependencies
extension DeveloperAPIClient {
@TaskLocal fileprivate static var cursor: [URLQueryItem] = []
public init(
auth: DeveloperAPIAuthData
) {
@@ -22,6 +24,39 @@ extension DeveloperAPIClient {
]
)
}
/// Perform a paginated request, starting at the page given by `link`.
///
/// `link` should be a URL that contains a `cursor` query parameter. The
/// cursor will be applied to any requests made inside the closure.
public static func withNextLink<T>(
_ link: String?,
isolation: isolated (any Actor)? = #isolation,
perform action: () async throws -> T
) async throws -> T {
let cursor: [URLQueryItem]
if let link {
guard let components = URLComponents(string: link),
let newOffset = components.queryItems?.first(where: { $0.name == "cursor" }),
let newLimit = components.queryItems?.first(where: { $0.name == "limit" })
else { throw Errors.badNextLink(link) }
// the next value will contain a cursor (offset) *and* a limit even if we didn't
// provide a limit in our initial request. we need to include the limit in subsequent
// requests, otherwise the cursor isn't respected.
cursor = [newOffset, newLimit]
} else {
cursor = []
}
return try await $cursor.withValue(cursor) {
try await action()
}
}
public enum Errors: Error {
case badNextLink(String)
}
}
public enum DeveloperAPIAuthData: Sendable {
@@ -126,9 +161,13 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
let path = request.path ?? "/"
var components = URLComponents(string: path) ?? .init()
components.queryItems = (components.queryItems ?? []) + [
var items = components.queryItems ?? []
items.upsertQueryItems(DeveloperAPIClient.cursor + [
URLQueryItem(name: "teamId", value: authData.teamID.rawValue)
]
])
components.queryItems = items
let query = components.percentEncodedQuery ?? ""
components.query = nil
@@ -214,69 +253,28 @@ public struct DeveloperAPIASCAuthMiddleware: ClientMiddleware {
_ baseURL: URL
) async throws -> (HTTPResponse, HTTPBody?)
) async throws -> (HTTPResponse, HTTPBody?) {
let jwt = try await generator.generate()
var request = request
let jwt = try await generator.generate()
request.headerFields[.authorization] = "Bearer \(jwt)"
let cursor = DeveloperAPIClient.cursor
if !cursor.isEmpty {
var components = URLComponents(string: request.path ?? "") ?? .init()
var items = components.queryItems ?? []
items.upsertQueryItems(cursor)
components.queryItems = items
request.path = components.string
}
return try await next(request, body, baseURL)
}
}
struct LoggingMiddleware: ClientMiddleware {
static let regex: NSRegularExpression? = {
guard let pat = ProcessInfo.processInfo.environment["XTL_DEV_LOG"] else { return nil }
return try? NSRegularExpression(pattern: pat)
}()
func intercept(
_ request: HTTPRequest,
body: HTTPBody?,
baseURL: URL,
operationID: String,
next: (HTTPRequest, HTTPBody?, URL) async throws -> (HTTPResponse, HTTPBody?)
) async throws -> (HTTPResponse, HTTPBody?) {
var (response, body) = try await next(request, body, baseURL)
guard Self.regex?.firstMatch(
in: operationID,
range: NSRange(operationID.startIndex..., in: operationID)
) != nil
else { return (response, body) }
print("\n\(operationID) response status -> \(response.status)")
if let unwrapped = body {
let data = try await Data(collecting: unwrapped, upTo: .max)
// body may only be consumable once, replace it with the collected data
body = .init(data)
let text = String(decoding: data, as: UTF8.self)
print("\(operationID) response body -> \(text)")
}
return (response, body)
extension [URLQueryItem] {
fileprivate mutating func upsertQueryItems(_ items: [URLQueryItem]) {
let newNames = Set(items.map(\.name))
removeAll { newNames.contains($0.name) }
append(contentsOf: items)
}
}
// syntactic sugar to make it nicer to work with `anyOf:` types
public protocol OpenAPIExtensibleEnum {
associatedtype Value1Payload: RawRepresentable<String>, Codable, Hashable, Sendable, CaseIterable
var value1: Value1Payload? { get set }
var value2: String? { get set }
init(value1: Value1Payload?, value2: String?)
}
extension OpenAPIExtensibleEnum {
public var rawValue: String {
value2!
}
public init(_ value: Value1Payload) {
self.init(value1: value, value2: nil)
}
}
extension Components.Schemas.BundleIdPlatform: OpenAPIExtensibleEnum {}
extension Components.Schemas.CapabilityType: OpenAPIExtensibleEnum {}
extension Components.Schemas.CertificateType: OpenAPIExtensibleEnum {}
extension Components.Schemas.Device.AttributesPayload.DeviceClassPayload: OpenAPIExtensibleEnum {}
@@ -0,0 +1,39 @@
import Foundation
import OpenAPIRuntime
import HTTPTypes
struct LoggingMiddleware: ClientMiddleware {
static let regex: NSRegularExpression? = {
guard let pat = ProcessInfo.processInfo.environment["XTL_DEV_LOG"] else { return nil }
return try? NSRegularExpression(pattern: pat)
}()
func intercept(
_ request: HTTPRequest,
body: HTTPBody?,
baseURL: URL,
operationID: String,
next: (HTTPRequest, HTTPBody?, URL) async throws -> (HTTPResponse, HTTPBody?)
) async throws -> (HTTPResponse, HTTPBody?) {
var (response, body) = try await next(request, body, baseURL)
guard Self.regex?.firstMatch(
in: operationID,
range: NSRange(operationID.startIndex..., in: operationID)
) != nil
else { return (response, body) }
print("\n\(operationID) response status -> \(response.status)")
if let unwrapped = body {
let data = try await Data(collecting: unwrapped, upTo: .max)
// body may only be consumable once, replace it with the collected data
body = .init(data)
let text = String(decoding: data, as: UTF8.self)
print("\(operationID) response body -> \(text)")
}
return (response, body)
}
}
@@ -0,0 +1,31 @@
import DeveloperAPI
// syntactic sugar to make it nicer to work with `anyOf:` types
public protocol OpenAPIExtensibleEnum {
associatedtype Value1Payload: RawRepresentable<String>, Codable, Hashable, Sendable, CaseIterable
var value1: Value1Payload? { get set }
var value2: String? { get set }
init(value1: Value1Payload?, value2: String?)
}
extension OpenAPIExtensibleEnum {
public var rawValue: String {
value2!
}
public init(_ value: Value1Payload) {
self.init(value1: value, value2: nil)
}
}
extension Components.Schemas.BundleIdPlatform: OpenAPIExtensibleEnum {}
extension Components.Schemas.CapabilityOption.KeyPayload: OpenAPIExtensibleEnum {}
extension Components.Schemas.CapabilitySetting.KeyPayload: OpenAPIExtensibleEnum {}
extension Components.Schemas.CapabilityType: OpenAPIExtensibleEnum {}
extension Components.Schemas.CertificateType: OpenAPIExtensibleEnum {}
extension Components.Schemas.Device.AttributesPayload.DeviceClassPayload: OpenAPIExtensibleEnum {}
extension Components.Schemas.Device.AttributesPayload.StatusPayload: OpenAPIExtensibleEnum {}
extension Components.Schemas.Profile.AttributesPayload.ProfileStatePayload: OpenAPIExtensibleEnum {}
extension Components.Schemas.Profile.AttributesPayload.ProfileTypePayload: OpenAPIExtensibleEnum {}
extension Components.Schemas.ProfileCreateRequest.DataPayload.AttributesPayload.ProfileTypePayload: OpenAPIExtensibleEnum {}
@@ -80,7 +80,7 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
_type: .profiles,
attributes: .init(
name: "XTL profile \(bundleID.id)",
profileType: .iosAppDevelopment
profileType: .init(.iosAppDevelopment)
),
relationships: .init(
bundleId: .init(
@@ -239,9 +239,7 @@ public actor IntegratedInstaller {
guard let appDir = payload.implicitContents.first(where: { $0.pathExtension == "app" })
else { throw Error.appExtractionFailed }
try await updateStage(to: "Logging in")
try await self.updateStage(to: "Preparing device")
try await updateStage(to: "Preparing device")
// TODO: Maybe use `Connection` here instead of creating the lockdown
// client manually?
@@ -270,9 +268,8 @@ public actor IntegratedInstaller {
try await updateProgress(to: 1)
let context = try SigningContext(
udid: udid,
deviceName: deviceName,
auth: auth
auth: auth,
targetDevice: .init(udid: udid, name: deviceName)
)
let signer = AutoSigner(context: context) { certs in
+10 -8
View File
@@ -11,24 +11,26 @@ import DeveloperAPI
public struct SigningContext: Sendable {
public let udid: String
public let deviceName: String
public let auth: DeveloperAPIAuthData
public let signer: Signer
public struct TargetDevice: Sendable, Hashable {
public var udid: String
public var name: String
}
public var auth: DeveloperAPIAuthData
public var targetDevice: TargetDevice?
public var signer: Signer
public var developerAPIClient: DeveloperAPIClient {
DeveloperAPIClient(auth: auth)
}
public init(
udid: String,
deviceName: String,
auth: DeveloperAPIAuthData,
targetDevice: TargetDevice? = nil,
signer: Signer? = nil
) throws {
self.udid = udid
self.deviceName = deviceName
self.auth = auth
self.targetDevice = targetDevice
self.signer = try signer ?? .first()
}
@@ -21,8 +21,8 @@ extension ProvisioningIdentifiers {
return identifier.split(separator: ".").dropFirst().joined(separator: ".")
}
static func identifier(fromSanitized sanitized: String, context: SigningContext? = nil) -> String {
let uuid = (context?.auth.identityID ?? UUID().uuidString).split(separator: "-")[0].uppercased()
static func identifier(fromSanitized sanitized: String, context: SigningContext) -> String {
let uuid = context.auth.identityID.split(separator: "-")[0].uppercased()
return "\(Self.idPrefix)\(uuid).\(sanitized)"
}
@@ -36,7 +36,7 @@ extension ProvisioningIdentifiers {
return sanitize(identifier: id)
}
static func groupID(fromSanitized sanitized: String, context: SigningContext? = nil) -> DeveloperServicesAppGroup.GroupID {
static func groupID(fromSanitized sanitized: String, context: SigningContext) -> DeveloperServicesAppGroup.GroupID {
.init(rawValue: "\(Self.groupPrefix)\(identifier(fromSanitized: sanitized, context: context))")
}
@@ -22,7 +22,15 @@ struct DSCertificatesListCommand: AsyncParsableCommand {
func run() async throws {
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
let certificates = try await client.certificatesGetCollection().ok.body.json.data
let certificates = try await DeveloperAPIPages {
try await client.certificatesGetCollection().ok.body.json
} next: {
$0.links.next
}
.map(\.data)
.reduce(into: [], +=)
for certificate in certificates {
print("- id: \(certificate.id)")
guard let attributes = certificate.attributes else {
@@ -22,7 +22,15 @@ struct DSDevicesListCommand: AsyncParsableCommand {
func run() async throws {
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
let devices = try await client.devicesGetCollection().ok.body.json.data
let devices = try await DeveloperAPIPages {
try await client.devicesGetCollection().ok.body.json
} next: {
$0.links.next
}
.map(\.data)
.reduce(into: [], +=)
for device in devices {
print("- id: \(device.id)")
guard let attributes = device.attributes else {
@@ -22,7 +22,15 @@ struct DSIdentifiersListCommand: AsyncParsableCommand {
func run() async throws {
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
let bundleIDs = try await client.bundleIdsGetCollection().ok.body.json.data
let bundleIDs = try await DeveloperAPIPages {
try await client.bundleIdsGetCollection().ok.body.json
} next: {
$0.links.next
}
.map(\.data)
.reduce(into: [], +=)
for bundleID in bundleIDs {
print("- id: \(bundleID.id)")
guard let attributes = bundleID.attributes else {
@@ -24,7 +24,15 @@ struct DSProfilesListCommand: AsyncParsableCommand {
func run() async throws {
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
let profiles = try await client.profilesGetCollection().ok.body.json.data
let profiles = try await DeveloperAPIPages {
try await client.profilesGetCollection().ok.body.json
} next: {
$0.links.next
}
.map(\.data)
.reduce(into: [], +=)
for profile in profiles {
print("- id: \(profile.id)")
guard let attributes = profile.attributes else {
+1 -1
View File
@@ -64,7 +64,7 @@ struct PackOperation {
)
let bundle = try await packer.pack()
if let entitlementsPath = schema.base.entitlementsPath {
if let entitlementsPath = plan.entitlementsPath {
let data = try await Data(reading: URL(fileURLWithPath: entitlementsPath))
let decoder = PropertyListDecoder()
let entitlements = try decoder.decode(Entitlements.self, from: data)
+27 -4
View File
@@ -16,12 +16,35 @@ struct SDKBuilder {
case app(String)
init(path: String) throws {
if path.hasSuffix(".xip") {
self = .xip(path)
} else if path.hasSuffix(".app") || path.hasSuffix(".app/") {
var isDir: ObjCBool = false
guard FileManager.default.fileExists(atPath: path, isDirectory: &isDir) else {
throw Console.Error("Could not read file or directory at path '\(path)'")
}
let url = URL(fileURLWithPath: path)
if isDir.boolValue {
self = .app(path)
let devDir = url.appendingPathComponent("Contents/Developer")
guard devDir.dirExists else {
throw Console.Error("""
The provided directory at '\(path)' does not appear to be a version of Xcode: \
could not read '\(devDir.path)'.
""")
}
} else {
throw Console.Error("Expected input path to end in .xip or .app")
self = .xip(path)
let handle = try FileHandle(forReadingFrom: url)
defer { try? handle.close() }
let expectedMagic = "xar!".utf8
let actualMagic = try handle.read(upToCount: expectedMagic.count) ?? Data()
guard actualMagic.elementsEqual(expectedMagic) else {
throw Console.Error("""
The file at '\(path)' does not appear to be a valid XIP file.
""")
}
}
}
}