Skip to content
Snippets Groups Projects
Commit fdde2797 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] Device/Login: apply barcode scanner when selected in method popover

parent ab541674
No related branches found
No related tags found
No related merge requests found
Pipeline #2844 passed with warnings
......@@ -50,8 +50,9 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, CryptoUtils,
// Init method
var method = parameters.method || csSettings.data.login && csSettings.data.login.method || 'SCRYPT_DEFAULT';
var params = csSettings.data.login && csSettings.data.login.params;
if (($scope.isAuth && method === 'PUBKEY') || ( method === 'default')) {
method = 'SCRYPT_DEFAULT'; // PUBKEY not enable if auth need, or if ask for 'default'
// used default method, when PUBKEY + auth, or SCAN, or if ask for 'default'
if (($scope.isAuth && method === 'PUBKEY') || (method === 'SCAN') || (method === 'default')) {
method = 'SCRYPT_DEFAULT';
}
$scope.changeMethod(method, params);
};
......@@ -350,6 +351,10 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, CryptoUtils,
delete $scope.form.$submitted;
}
if (method == 'SCAN') {
return $scope.doLogin();
}
// Scrypt (advanced or not)
if (method == 'SCRYPT_DEFAULT' || method == 'SCRYPT_ADVANCED') {
// Search scrypt object
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment