Skip to content

Fix 2FA failing #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nythepegasus merged 2 commits into from
Oct 13, 2026
+40 −29
Merged

Fix 2FA failing #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
567ddca
retry 2fa on status code 409
NiceAesth Oct 13, 2026
7a18c89
well windows was doing this too so
NiceAesth Oct 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 40 additions & 29 deletions Sources/DeveloperPortal/Authentication.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
import Foundation
import GSACryptoKit

private enum PushedCodeState {
@TaskLocal static var handled = false
}

public extension DeveloperPortal {

func authenticate(appleID unsanitizedAppleID: String,
Expand Down Expand Up @@ -185,40 +189,47 @@ public extension DeveloperPortal {
}

verboseLog("[SideSign] Parse complete. dsid: \(dsid), token: \(idmsToken)")

// 2FA auth type
let statusDictionary = completeResponseDictionary["Status"] as? [String: any Sendable]
let authType = (statusDictionary?["au"] as? String)
?? (completeResponseDictionary["au"] as? String)
?? ((statusDictionary?["hsc"] as? Int) == 409 ? "pushedCode" : nil)
verboseLog("[SideSign] Authentication status type: \(authType ?? "nil")")

let twoFactorAuthContext = TwoFactorAuthContext(
dsid: dsid,
idmsToken: idmsToken,
anisetteData: anisetteData,
dsid: dsid,
idmsToken: idmsToken,
anisetteData: anisetteData,
xcodeVersion: xcodeVersion
)

switch authType {
case "trustedDeviceSecondaryAuth", "trustedDevice", "secondaryAuth", "sms", "voice", "phone":
let isTrustedDevice = (authType == "trustedDeviceSecondaryAuth" || authType == "trustedDevice")
case "trustedDeviceSecondaryAuth", "trustedDevice", "secondaryAuth", "sms", "voice", "phone", "pushedCode":
let pushedCode = authType == "pushedCode"
guard !pushedCode || !PushedCodeState.handled else {
throw DeveloperPortalError.requiresTwoFactorAuthentication
}
let isTrustedDevice = pushedCode || authType == "trustedDeviceSecondaryAuth" || authType == "trustedDevice"
try await handle2FARequest(
isTrustedDevice: isTrustedDevice,
completeResponseDictionary: completeResponseDictionary,
statusDictionary: statusDictionary,
context: twoFactorAuthContext,
verificationHandler: verificationHandler
)
// recur coz we just solved 2FA above and this invocation shouldn't come to this case
return try await authenticate(
appleID: unsanitizedAppleID,
password: password,
anisetteData: anisetteData,
xcodeVersion: xcodeVersion,
machinePassword: machinePassword,
accountRepairHandler: accountRepairHandler,
verificationHandler: verificationHandler
verificationHandler: verificationHandler,
codeAlreadySent: pushedCode
)
return try await PushedCodeState.$handled.withValue(PushedCodeState.handled || pushedCode) {
try await authenticate(
appleID: unsanitizedAppleID,
password: password,
anisetteData: anisetteData,
xcodeVersion: xcodeVersion,
machinePassword: machinePassword,
accountRepairHandler: accountRepairHandler,
verificationHandler: verificationHandler
)
}

case "repair":
let directRepairURL = completeResponseDictionary["repairUrl"] as? String
Expand Down Expand Up @@ -572,7 +583,8 @@ public extension DeveloperPortal {
completeResponseDictionary: [String: any Sendable],
statusDictionary: [String: any Sendable]?,
context: TwoFactorAuthContext,
verificationHandler: VerificationHandler?) async throws
verificationHandler: VerificationHandler?,
codeAlreadySent: Bool = false) async throws
{
guard let verificationHandler else {
debugLog("[SideSign] 2FA required but no verificationHandler provided")
Expand All @@ -586,11 +598,10 @@ public extension DeveloperPortal {

let preferredMode: TwoFactorDeliveryMode = isTrustedDevice ? .trustedDevice : .sms

var currentRequest: TwoFactorRequest = .selectDeliveryMethod(
preferredMode: preferredMode,
phoneNumbers: phoneNumbers
)
var activeChannel: TwoFactorAuthChannel? = nil
var currentRequest: TwoFactorRequest = codeAlreadySent
? .trustedDevice(error: nil)
: .selectDeliveryMethod(preferredMode: preferredMode, phoneNumbers: phoneNumbers)
var activeChannel: TwoFactorAuthChannel? = codeAlreadySent ? .trustedDevice : nil

while true {
debugLog("[SideSign] Prompting user with 2FA request (\(currentRequest))...")
Expand Down Expand Up @@ -720,9 +731,9 @@ public extension DeveloperPortal {
let errorMsg = (responseDict?["em"] as? String)
?? ((responseDict?["Status"] as? [String: any Sendable])?["em"] as? String)

if errorCode == GrandSlamAuthErrorCodes.tooManyAttempts
|| errorCode == GrandSlamAuthErrorCodes.tooManyCodesRequested
|| errorCode == GrandSlamAuthErrorCodes.rateLimited
if errorCode == GrandSlamAuthErrorCodes.tooManyAttempts
|| errorCode == GrandSlamAuthErrorCodes.tooManyCodesRequested
|| errorCode == GrandSlamAuthErrorCodes.rateLimited
|| statusCode == HTTPStatusCodes.tooManyRequests
{
let msg = errorMsg ?? "Verification codes cannot be sent to this phone number at this time. Please try again later."
Expand Down Expand Up @@ -839,9 +850,9 @@ public extension DeveloperPortal {
?? xmluiMessage
?? xmluiTitle

if errorCode == GrandSlamAuthErrorCodes.tooManyAttempts
|| errorCode == GrandSlamAuthErrorCodes.tooManyCodesRequested
|| errorCode == GrandSlamAuthErrorCodes.rateLimited
if errorCode == GrandSlamAuthErrorCodes.tooManyAttempts
|| errorCode == GrandSlamAuthErrorCodes.tooManyCodesRequested
|| errorCode == GrandSlamAuthErrorCodes.rateLimited
|| statusCode == HTTPStatusCodes.tooManyRequests
{
let msg = errorMsg ?? "Too many verification code attempts. Please try again later."
Expand Down