1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-22 16:29:09 +01:00
This commit is contained in:
Kyle Spearrin 2016-09-21 15:21:50 -04:00
parent 6281b1d106
commit 7d2a16c1f4
8 changed files with 30 additions and 19 deletions

View File

@ -16,7 +16,7 @@
<div class="list-section-item list-section-item-icon-input">
<i class="fa fa-lock fa-lg fa-fw"></i>
<label for="code" class="sr-only">Verification Code</label>
<input id="code" type="number" name="Code" placeholder="Verification Code" ng-model="model.code">
<input id="code" type="text" name="Code" placeholder="Verification Code" ng-model="model.code">
</div>
</div>
<div class="list-section-footer">

View File

@ -1,7 +1,7 @@
angular
.module('bit.global')
.controller('mainController', function ($scope, $state) {
.controller('mainController', function ($scope, $state, loginService, toastr) {
var self = this;
self.currentYear = new Date().getFullYear();
self.animation = '';
@ -23,5 +23,11 @@
else if (msg.command === 'syncStarted') {
$scope.$broadcast('syncStarted');
}
else if (msg.command === 'logout') {
loginService.logOut(function () {
toastr.warning('Your login session has expired.', 'Logged out');
$state.go('home');
});
}
});
});

View File

@ -10,7 +10,7 @@
$scope.logOut = function () {
SweetAlert.swal({
title: 'Log out',
title: 'Log Out',
text: 'Are you sure you want to log out?',
type: 'warning',
showCancelButton: true,

View File

@ -21,7 +21,7 @@
<i class="fa fa-chevron-right fa-lg"></i>
</a>
<a class="list-section-item" href="" ng-click="logOut()">
Log out
Log Out
</a>
</div>
</div>

View File

@ -64,10 +64,6 @@
return item.name.toLowerCase();
};
$scope.filterByFolder = function (folder) {
};
$scope.searchSites = function () {
if (!$scope.searchText) {
return;

View File

@ -1,4 +1,4 @@
function ApiService(tokenService) {
function ApiService(tokenService) {
this.baseUrl = 'https://api.bitwarden.com';
this.tokenService = tokenService;
@ -269,6 +269,11 @@ function initApiService() {
// Helpers
function handleError(errorCallback, jqXHR, textStatus, errorThrown) {
if (jqXHR.status === 401 || jqXHR.status === 403) {
chrome.runtime.sendMessage(null, { command: 'logout' });
return;
}
errorCallback(new ErrorResponse(jqXHR));
}
};

View File

@ -1,4 +1,4 @@
function FolderService(cryptoService, userService, apiService) {
function FolderService(cryptoService, userService, apiService) {
this.cryptoService = cryptoService;
this.userService = userService;
this.apiService = apiService;
@ -29,7 +29,7 @@ function initFolderService() {
chrome.storage.local.get(foldersKey, function (obj) {
var folders = obj[foldersKey];
if (id in folders) {
if (folders && id in folders) {
callback(new Folder(folders[id]));
return;
}
@ -97,10 +97,14 @@ function initFolderService() {
request = new FolderRequest(folder);
if (!folder.id) {
self.apiService.postFolder(request, apiSuccess, handleError);
self.apiService.postFolder(request, apiSuccess, function (response) {
handleError(response, deferred)
});
}
else {
self.apiService.putFolder(folder.id, request, apiSuccess, handleError);
self.apiService.putFolder(folder.id, request, apiSuccess, function (response) {
handleError(response, deferred)
});
}
function apiSuccess(response) {
@ -219,4 +223,8 @@ function initFolderService() {
});
});
};
function handleError(error, deferred) {
deferred.reject(error);
}
};

View File

@ -1,4 +1,4 @@
function SiteService(cryptoService, userService, apiService) {
function SiteService(cryptoService, userService, apiService) {
this.cryptoService = cryptoService;
this.userService = userService;
this.apiService = apiService;
@ -43,7 +43,7 @@ function initSiteService() {
chrome.storage.local.get(sitesKey, function (obj) {
var sites = obj[sitesKey];
if (id in sites) {
if (sites && id in sites) {
callback(new Site(sites[id]));
return;
}
@ -254,10 +254,6 @@ function initSiteService() {
};
function handleError(error, deferred) {
if (error.status === 401 || error.status === 403) {
// TODO: logout
}
deferred.reject(error);
}
};