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

Add a setting to allow biometric-only access on IOS. #50

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add a setting to allow biometric-only access on IOS. #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6ee794
Add a setting to allow biometric-only access on IOS.
ken0105 Dec 24, 2021
1088826
Add a setting to allow biometric-only access on IOS.
ken0105 Dec 24, 2021
480386c
Add a setting to allow biometric-only access on IOS.
ken0105 Dec 24, 2021
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
8 changes: 7 additions & 1 deletion lib/src/biometric_storage.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class StorageFileInitOptions {
this.authenticationValidityDurationSeconds = -1,
this.authenticationRequired = true,
this.androidBiometricOnly = true,
this.iosBiometricOnly = false,
});

final int authenticationValidityDurationSeconds;
Expand All @@ -102,12 +103,17 @@ class StorageFileInitOptions {
/// https://github.com/authpass/biometric_storage/issues/12#issuecomment-902508609
final bool androidBiometricOnly;

/// Only makes difference on iOS, where if set true, you can't use
/// passcode to get the file.
final bool iosBiometricOnly;

Map<String, dynamic> toJson() => <String, dynamic>{
'authenticationValidityDurationSeconds':
authenticationValidityDurationSeconds,
'authenticationRequired': authenticationRequired,
'androidBiometricOnly': androidBiometricOnly,
};
'iosBiometricOnly': iosBiometricOnly,
};
}

/// Android specific configuration of the prompt displayed for biometry.
Expand Down
18 changes: 14 additions & 4 deletions macos/Classes/BiometricStorageImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ class InitOptions {
init(params: [String: Any]) {
authenticationValidityDurationSeconds = params["authenticationValidityDurationSeconds"] as? Int
authenticationRequired = params["authenticationRequired"] as? Bool
iosBiometricOnly = params["iosBiometricOnly"] as? Bool
}
let authenticationValidityDurationSeconds: Int!
let authenticationRequired: Bool!
let iosBiometricOnly: Bool!
}

class IOSPromptInfo {
Expand All @@ -35,12 +37,12 @@ private func hpdebug(_ message: String) {
}

class BiometricStorageImpl {

init(storageError: @escaping StorageError, storageMethodNotImplemented: Any) {
self.storageError = storageError
self.storageMethodNotImplemented = storageMethodNotImplemented
}

private var stores: [String: InitOptions] = [:]
private let storageError: StorageError
private let storageMethodNotImplemented: Any
Expand All @@ -56,7 +58,7 @@ class BiometricStorageImpl {
}

public func handle(_ call: StorageMethodCall, result: @escaping StorageCallback) {

func requiredArg<T>(_ name: String, _ cb: (T) -> Void) {
guard let args = call.arguments as? Dictionary<String, Any> else {
result(storageError(code: "InvalidArguments", message: "Invalid arguments \(String(describing: call.arguments))", details: nil))
Expand Down Expand Up @@ -175,9 +177,17 @@ class BiometricStorageImpl {
hpdebug("Pre OSX 10.12 no touchIDAuthenticationAllowableReuseDuration available. ignoring.")
}
}
var flag = SecAccessControlCreateFlags.userPresence
if initOptions.iosBiometricOnly {
if #available(iOS 11.3, *) {
flag = SecAccessControlCreateFlags.biometryCurrentSet
} else {
flag = SecAccessControlCreateFlags.touchIDCurrentSet
}
}
let access = SecAccessControlCreateWithFlags(nil, // Use the default allocator.
kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly,
.userPresence,
flag,
nil) // Ignore any error.
query.merge([
kSecUseAuthenticationContext as String: context,
Expand Down