Skip to content

iOS only: Fixed isAvailable to return error code rather than generic … #227

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

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

iOS only: Fixed isAvailable to return error code rather than generic … #227

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61b8da3
iOS only: Fixed isAvailable to return error code rather than generic …
Feb 12, 2020
e702057
Merge branch 'master' into bug/226
NiklasMerz Feb 22, 2020
3fd6e46
make handleError function as private
jainank Mar 2, 2020
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
68 changes: 31 additions & 37 deletions src/ios/Fingerprint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ import LocalAuthentication
var pluginResult = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: "Not available");
let available = authenticationContext.canEvaluatePolicy(policy, error: &error);

var results: [String : Any]

if(error != nil){
biometryType = "none";
errorResponse["code"] = error?.code;
Expand All @@ -55,31 +53,45 @@ import LocalAuthentication

pluginResult = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: biometryType);
}else{
var code: Int;
switch(error!._code) {
case Int(kLAErrorBiometryNotAvailable):
code = PluginError.BIOMETRIC_UNAVAILABLE.rawValue;
break;
case Int(kLAErrorBiometryNotEnrolled):
code = PluginError.BIOMETRIC_NOT_ENROLLED.rawValue;
break;

default:
code = PluginError.BIOMETRIC_UNKNOWN_ERROR.rawValue;
break;
}
results = ["code": code, "message": error!.localizedDescription];
pluginResult = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: results);
pluginResult = self.handleError(error: error);
}

commandDelegate.send(pluginResult, callbackId:command.callbackId);
}

@objc(handleError:)
private func handleError(error: Error?) -> CDVPluginResult? {
let errorResponse: [AnyHashable: Any] = [
"message": "Something went wrong"
];
var pluginResult = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: errorResponse);
if (error != nil) {

var errorCodes = [Int: ErrorCodes]()
var errorResult: [String : Any] = ["code": PluginError.BIOMETRIC_UNKNOWN_ERROR.rawValue, "message": error?.localizedDescription ?? ""];

errorCodes[1] = ErrorCodes(code: PluginError.BIOMETRIC_AUTHENTICATION_FAILED.rawValue)
errorCodes[2] = ErrorCodes(code: PluginError.BIOMETRIC_DISMISSED.rawValue)
errorCodes[5] = ErrorCodes(code: PluginError.BIOMETRIC_SCREEN_GUARD_UNSECURED.rawValue)
errorCodes[6] = ErrorCodes(code: PluginError.BIOMETRIC_UNAVAILABLE.rawValue)
errorCodes[7] = ErrorCodes(code: PluginError.BIOMETRIC_NOT_ENROLLED.rawValue)
errorCodes[8] = ErrorCodes(code: PluginError.BIOMETRIC_LOCKED_OUT.rawValue)

let errorCode = abs(error!._code)
if let e = errorCodes[errorCode] {
errorResult = ["code": e.code, "message": error!.localizedDescription];
}

pluginResult = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: errorResult);
}
return pluginResult;
}


@objc(authenticate:)
func authenticate(_ command: CDVInvokedUrlCommand){
let authenticationContext = LAContext();
var errorResponse: [AnyHashable: Any] = [
let errorResponse: [AnyHashable: Any] = [
"message": "Something went wrong"
];
var pluginResult = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: errorResponse);
Expand Down Expand Up @@ -112,25 +124,7 @@ import LocalAuthentication
if( success ) {
pluginResult = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: "Success");
}else {
if (error != nil) {

var errorCodes = [Int: ErrorCodes]()
var errorResult: [String : Any] = ["code": PluginError.BIOMETRIC_UNKNOWN_ERROR.rawValue, "message": error?.localizedDescription ?? ""];

errorCodes[1] = ErrorCodes(code: PluginError.BIOMETRIC_AUTHENTICATION_FAILED.rawValue)
errorCodes[2] = ErrorCodes(code: PluginError.BIOMETRIC_DISMISSED.rawValue)
errorCodes[5] = ErrorCodes(code: PluginError.BIOMETRIC_SCREEN_GUARD_UNSECURED.rawValue)
errorCodes[6] = ErrorCodes(code: PluginError.BIOMETRIC_UNAVAILABLE.rawValue)
errorCodes[7] = ErrorCodes(code: PluginError.BIOMETRIC_NOT_ENROLLED.rawValue)
errorCodes[8] = ErrorCodes(code: PluginError.BIOMETRIC_LOCKED_OUT.rawValue)

let errorCode = abs(error!._code)
if let e = errorCodes[errorCode] {
errorResult = ["code": e.code, "message": error!.localizedDescription];
}

pluginResult = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: errorResult);
}
pluginResult = self.handleError(error: error);
}
self.commandDelegate.send(pluginResult, callbackId:command.callbackId);
}
Expand Down