Skip to content

Watch app: Fix crash when authenticated with site credentials #16094

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
merged 1 commit into from
Sep 8, 2025
Merged

Watch app: Fix crash when authenticated with site credentials #16094

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions Modules/Sources/NetworkingCore/ApplicationPassword/ApplicationPasswordUseCase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ import enum Alamofire.AFError
import struct Alamofire.HTTPMethod
import KeychainAccess

#if canImport(UIKit)
#if !os(watchOS)
import UIKit
#else
import WatchKit
#endif

public enum ApplicationPasswordUseCaseError: Error {
Expand Down Expand Up @@ -148,13 +150,16 @@ final public class DefaultApplicationPasswordUseCase: ApplicationPasswordUseCase
private extension DefaultApplicationPasswordUseCase {
/// Helper method to create password name from device
static func createPasswordName() -> String {
#if !os(watchOS)
let bundleIdentifier = Bundle.main.bundleIdentifier ?? "Unknown"
#if !os(watchOS)
let model = UIDevice.current.model
let identifierForVendor = UIDevice.current.identifierForVendor?.uuidString ?? ""
return "\(bundleIdentifier).ios-app-client.\(model).\(identifierForVendor)"
#else
fatalError("Unexpected error: Application password should not be generated through watch app")
let model = WKInterfaceDevice.current().model
let identifierForVendor =
WKInterfaceDevice.current().identifierForVendor?.uuidString ?? ""
return "\(bundleIdentifier).watch-app-client.\(model).\(identifierForVendor)"
#endif
}

Expand Down