Skip to content
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

Jump to bottom

SDKS-2995_Device_Binding_Block_Simulator #260

Merged
merged 7 commits into from
Feb 27, 2024
Merged

SDKS-2995_Device_Binding_Block_Simulator #260

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5fa1203
Checking if the DeviceBinding/Signing callback is triggered in a simu…
george-bafaloukas-forgerock Feb 16, 2024
9258c05
Setting the outcome to be unsupported.
george-bafaloukas-forgerock Feb 16, 2024
8afbafd
Commenting out binding tests for Simulators as the feature is not sup…
george-bafaloukas-forgerock Feb 20, 2024
735bb3f
Updated copywriting
george-bafaloukas-forgerock Feb 20, 2024
399d774
Skip unsupported tests on simulator
vahancouver Feb 21, 2024
9fae2ee
Update Device binding tests to cover simulator unsupported cases
vahancouver Feb 21, 2024
2940b3c
Fix failing tests
vahancouver Feb 22, 2024
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
4 changes: 2 additions & 2 deletions FRCore/FRCore/Authenticator/CryptoKey.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ public struct CryptoKey {
query[String(kSecReturnRef)] = true
query[String(kSecAttrApplicationTag)] = keyAlias

#if !targetEnvironment(simulator)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update copyright

if let pin = pin {
let context = LAContext()
let credentialIsSet = context.setCredential(pin.data(using: .utf8), type: .applicationPassword)
guard credentialIsSet == true else { return nil }
context.interactionNotAllowed = false
query[kSecUseAuthenticationContext as String] = context
}
#endif


if let accessGroup = accessGroup {
query[String(kSecAttrAccessGroup)] = accessGroup
Expand Down
7 changes: 5 additions & 2 deletions FRDeviceBinding/FRDeviceBinding/Sources/Callbacks/DeviceBindingCallback.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ open class DeviceBindingCallback: MultipleValuesCallback, Binding {
/// - Parameter completion: Completion block for Device binding result callback
open func bind(deviceAuthenticator: ((DeviceBindingAuthenticationType) -> DeviceAuthenticator)? = nil,
completion: @escaping DeviceBindingResultCallback) {

let authInterface = deviceAuthenticator?(deviceBindingAuthenticationType) ?? deviceAuthenticatorIdentifier(deviceBindingAuthenticationType)

let dispatchQueue = DispatchQueue(label: "com.forgerock.serialQueue", qos: .userInitiated)
Expand All @@ -167,7 +166,11 @@ open class DeviceBindingCallback: MultipleValuesCallback, Binding {
deviceId: String? = nil,
deviceRepository: DeviceBindingRepository = LocalDeviceBindingRepository(),
_ completion: @escaping DeviceBindingResultCallback) {

#if targetEnvironment(simulator)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update copyright

// DeviceBinding/Signing is not supported on the iOS Simulator
handleException(status: .unsupported(errorMessage: "DeviceBinding/Signing is not supported on the iOS Simulator"), completion: completion)
return
#endif
let authInterface = authInterface ?? getDeviceAuthenticator(type: deviceBindingAuthenticationType)
authInterface.initialize(userId: userId, prompt: Prompt(title: title, subtitle: subtitle, description: promptDescription))
let deviceId = deviceId ?? FRDevice.currentDevice?.identifier.getIdentifier()
Expand Down
6 changes: 5 additions & 1 deletion FRDeviceBinding/FRDeviceBinding/Sources/Callbacks/DeviceSigningVerifierCallback.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,11 @@ open class DeviceSigningVerifierCallback: MultipleValuesCallback, Binding {
authInterface: DeviceAuthenticator,
customClaims: [String: Any] = [:],
_ completion: @escaping DeviceSigningResultCallback) {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update copyright

#if targetEnvironment(simulator)
// DeviceBinding/Signing is not supported on the iOS Simulator
handleException(status: .unsupported(errorMessage: "DeviceBinding/Signing is not supported on the iOS Simulator"), completion: completion)
return
#endif
authInterface.initialize(userId: userKey.userId, prompt: Prompt(title: title, subtitle: subtitle, description: promptDescription))
guard authInterface.isSupported() else {
handleException(status: .unsupported(errorMessage: nil), completion: completion)
Expand Down
Loading