Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-17 10:45:41 +01:00
Code Issues Projects Releases Wiki Activity

added lock now option

Browse Source
This commit is contained in:
Kyle Spearrin 2017-06-13 11:53:08 -04:00
parent 4861aa0210
commit e079b70e6a
5 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/_locales/en/messages.json
View File

@ -399,6 +399,10 @@
"message": "Lock Options",
"description": "Lock Options"
},
"lockNow": {
"message": "Lock Now",
"description": "Lock Now"
},
"immediately": {
"message": "Immediately",
"description": "Immediately"

3
src/popup/app/services/backgroundService.js
View File

@ -42,4 +42,7 @@
})
.factory('settingsService', function () {
return chrome.extension.getBackgroundPage().settingsService;
})
.factory('lockService', function () {
return chrome.extension.getBackgroundPage().lockService;
});

16
src/popup/app/settings/settingsController.js
View File

@ -2,7 +2,7 @@
.module('bit.settings')
.controller('settingsController', function ($scope, $state, SweetAlert, utilsService, $analytics,
i18nService, constantsService, cryptoService) {
i18nService, constantsService, cryptoService, lockService) {
utilsService.initListSectionItemListeners($(document), angular);
$scope.lockOption = '';
$scope.i18n = i18nService;
@ -48,6 +48,14 @@
});
};
$scope.lock = function () {
lockService.lock().then(function () {
return $state.go('lock', {
animation: 'in-slide-up'
});
});
};
$scope.logOut = function () {
SweetAlert.swal({
title: i18nService.logOut,
@ -114,13 +122,13 @@
case 'chrome':
chrome.tabs.create({
url: 'https://chrome.google.com/webstore/detail/bitwarden-free-password-m/' +
'nngceckbapebfimnlniiiahkandclblb/reviews'
'nngceckbapebfimnlniiiahkandclblb/reviews'
});
break;
case 'firefox':
chrome.tabs.create({
url: 'https://addons.mozilla.org/en-US/firefox/addon/' +
'bitwarden-password-manager/#reviews'
'bitwarden-password-manager/#reviews'
});
break;
case 'edge':
@ -129,7 +137,7 @@
case 'opera':
chrome.tabs.create({
url: 'https://addons.opera.com/en/extensions/details/' +
'bitwarden-free-password-manager/#feedback-container'
'bitwarden-free-password-manager/#feedback-container'
});
break;
default:

4
src/popup/app/settings/views/settings.html
View File

@ -23,6 +23,10 @@
<option value="">{{i18n.never}}</option>
</select>
</div>
<a class="list-section-item" href="" ng-click="lock()">
{{i18n.lockNow}}
<i class="fa fa-chevron-right fa-lg"></i>
</a>
<a class="list-section-item" href="" ng-click="twoStep()">
{{i18n.twoStepLogin}}
<i class="fa fa-chevron-right fa-lg"></i>

10
src/services/lockService.js
View File

@ -50,7 +50,7 @@ function initLockService(self) {
var diffSeconds = ((new Date()).getTime() - lastActive) / 1000;
if (diffSeconds >= lockOptionSeconds) {
// need to lock now
self.lock();
return self.lock();
}
});
}
@ -59,16 +59,18 @@ function initLockService(self) {
chrome.idle.onStateChanged.addListener(function (newState) {
if (newState === 'locked') {
getLockOption().then(function (lockOption) {
if (lockOption === -2) {
self.lock();
if (lockOption !== -2) {
return;
}
return self.lock();
});
}
});
}
LockService.prototype.lock = function () {
Q.all([
return Q.all([
self.cryptoService.clearKey(),
self.cryptoService.clearOrgKeys(true),
self.cryptoService.clearPrivateKey(true)