filter out org logins
This commit is contained in:
parent
bc431b896b
commit
1ab75115f0
|
@ -28,13 +28,22 @@
|
||||||
$scope.processing = true;
|
$scope.processing = true;
|
||||||
|
|
||||||
var reencryptedLogins = [];
|
var reencryptedLogins = [];
|
||||||
var loginsPromise = apiService.logins.list({ dirty: false }, function (encryptedLogins) {
|
var loginsPromise = apiService.logins.list({}, function (encryptedLogins) {
|
||||||
var unencryptedLogins = cipherService.decryptLogins(encryptedLogins.Data);
|
var filteredEncryptedLogins = [];
|
||||||
|
for (var i = 0; i < encryptedLogins.Data.length; i++) {
|
||||||
|
if (encryptedLogins.Data[i].OrganizationId) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
filteredEncryptedLogins.push(encryptedLogins.Data[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
var unencryptedLogins = cipherService.decryptLogins(filteredEncryptedLogins);
|
||||||
reencryptedLogins = cipherService.encryptLogins(unencryptedLogins, _newKey);
|
reencryptedLogins = cipherService.encryptLogins(unencryptedLogins, _newKey);
|
||||||
}).$promise;
|
}).$promise;
|
||||||
|
|
||||||
var reencryptedFolders = [];
|
var reencryptedFolders = [];
|
||||||
var foldersPromise = apiService.folders.list({ dirty: false }, function (encryptedFolders) {
|
var foldersPromise = apiService.folders.list({}, function (encryptedFolders) {
|
||||||
var unencryptedFolders = cipherService.decryptFolders(encryptedFolders.Data);
|
var unencryptedFolders = cipherService.decryptFolders(encryptedFolders.Data);
|
||||||
reencryptedFolders = cipherService.encryptFolders(unencryptedFolders, _newKey);
|
reencryptedFolders = cipherService.encryptFolders(unencryptedFolders, _newKey);
|
||||||
}).$promise;
|
}).$promise;
|
||||||
|
@ -66,7 +75,6 @@
|
||||||
toastr.success('Please log back in.', 'Email Changed');
|
toastr.success('Please log back in.', 'Email Changed');
|
||||||
});
|
});
|
||||||
}, function () {
|
}, function () {
|
||||||
// TODO: recovery mode
|
|
||||||
$uibModalInstance.dismiss('cancel');
|
$uibModalInstance.dismiss('cancel');
|
||||||
toastr.error('Something went wrong.', 'Oh No!');
|
toastr.error('Something went wrong.', 'Oh No!');
|
||||||
}).$promise;
|
}).$promise;
|
||||||
|
|
|
@ -28,13 +28,22 @@
|
||||||
return cryptoService.makeKey(model.newMasterPassword, profile.email.toLowerCase());
|
return cryptoService.makeKey(model.newMasterPassword, profile.email.toLowerCase());
|
||||||
}).then(function (newKey) {
|
}).then(function (newKey) {
|
||||||
var reencryptedLogins = [];
|
var reencryptedLogins = [];
|
||||||
var loginsPromise = apiService.logins.list({ dirty: false }, function (encryptedLogins) {
|
var loginsPromise = apiService.logins.list({}, function (encryptedLogins) {
|
||||||
var unencryptedLogins = cipherService.decryptLogins(encryptedLogins.Data);
|
var filteredEncryptedLogins = [];
|
||||||
|
for (var i = 0; i < encryptedLogins.Data.length; i++) {
|
||||||
|
if (encryptedLogins.Data[i].OrganizationId) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
filteredEncryptedLogins.push(encryptedLogins.Data[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
var unencryptedLogins = cipherService.decryptLogins(filteredEncryptedLogins);
|
||||||
reencryptedLogins = cipherService.encryptLogins(unencryptedLogins, newKey);
|
reencryptedLogins = cipherService.encryptLogins(unencryptedLogins, newKey);
|
||||||
}).$promise;
|
}).$promise;
|
||||||
|
|
||||||
var reencryptedFolders = [];
|
var reencryptedFolders = [];
|
||||||
var foldersPromise = apiService.folders.list({ dirty: false }, function (encryptedFolders) {
|
var foldersPromise = apiService.folders.list({}, function (encryptedFolders) {
|
||||||
var unencryptedFolders = cipherService.decryptFolders(encryptedFolders.Data);
|
var unencryptedFolders = cipherService.decryptFolders(encryptedFolders.Data);
|
||||||
reencryptedFolders = cipherService.encryptFolders(unencryptedFolders, newKey);
|
reencryptedFolders = cipherService.encryptFolders(unencryptedFolders, newKey);
|
||||||
}).$promise;
|
}).$promise;
|
||||||
|
@ -64,7 +73,6 @@
|
||||||
toastr.success('Please log back in.', 'Master Password Changed');
|
toastr.success('Please log back in.', 'Master Password Changed');
|
||||||
});
|
});
|
||||||
}, function () {
|
}, function () {
|
||||||
// TODO: recovery mode
|
|
||||||
$uibModalInstance.dismiss('cancel');
|
$uibModalInstance.dismiss('cancel');
|
||||||
toastr.error('Something went wrong.', 'Oh No!');
|
toastr.error('Something went wrong.', 'Oh No!');
|
||||||
}).$promise;
|
}).$promise;
|
||||||
|
|
Loading…
Reference in New Issue