bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 18:53:29 +00:00
Code Issues Releases Wiki Activity

tuneing up mdoels and services for site add

Browse Source
This commit is contained in:
Kyle Spearrin
2016-09-05 01:49:44 -04:00
parent cc67d12c57
commit abb6f37af2
8 changed files with 141 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/popup/app/services/loginService.js
View File

@@ -1,15 +1,15 @@
angular
.module('bit.services')
.factory('loginService', function (cryptoService, apiService, apiService, userService, tokenService, $q) {
.factory('loginService', function (cryptoService, apiService, userService, tokenService, $q) {
var _service = {};
_service.logIn = function (email, masterPassword) {
var key = cryptoService.makeKey(masterPassword, email);
var deferred = $q.defer();
cryptoService.hashPassword(masterPassword, key, function (hashedPassword) {
var request = new TokenRequest(email, hashedPassword);
var deferred = $q.defer();
apiService.postToken(request, function (response) {
if (!response || !response.token) {
return;
@@ -25,9 +25,8 @@
}, function (error) {
deferred.reject(error);
});
return deferred.promise;
});
return deferred.promise;
};
_service.logInTwoFactor = function (code, provider) {

16
src/popup/app/vault/vaultAddSiteController.js
View File

@@ -7,8 +7,7 @@
};
$scope.createSite = function (model) {
var newModel = model;
encryptSite(newModel, function (siteModel) {
encryptSite(model, function (siteModel) {
var site = new Site(siteModel, true);
siteService.save(site, function () {
$scope.close();
@@ -20,16 +19,17 @@
$scope.parentScope.closeAddSite();
};
function encryptSite(siteModel, callback) {
cryptoService.encrypt(siteModel.name, function (nameCipherString) {
function encryptSite(model, callback) {
var siteModel = {};
cryptoService.encrypt(model.name, function (nameCipherString) {
siteModel.name = nameCipherString;
cryptoService.encrypt(siteModel.uri, function (uriCipherString) {
cryptoService.encrypt(model.uri, function (uriCipherString) {
siteModel.uri = uriCipherString;
cryptoService.encrypt(siteModel.username, function (usernameCipherString) {
cryptoService.encrypt(model.username, function (usernameCipherString) {
siteModel.username = usernameCipherString;
cryptoService.encrypt(siteModel.password, function (passwordCipherString) {
cryptoService.encrypt(model.password, function (passwordCipherString) {
siteModel.password = passwordCipherString;
cryptoService.encrypt(siteModel.notes, function (notesCipherString) {
cryptoService.encrypt(model.notes, function (notesCipherString) {
siteModel.notes = notesCipherString;
callback(siteModel);
});

2
src/popup/app/vault/views/vaultAddSite.html
View File

@@ -15,7 +15,7 @@
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">URI</span>
<input type="url" ng-model="site.uri">
<input type="text" ng-model="site.uri">
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">Username</span>