moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2024-11-23 01:12:19 -05:00
Code Issues Releases Wiki Activity

implement feedback on keygen and login

Browse Source
This commit is contained in:
Tankred Hase 2013-11-04 14:20:14 +01:00
parent 2b06c3146e
commit 24f97db09e
11 changed files with 121 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/app.js
View File

@ -22,7 +22,7 @@ require([
// set router paths
app.config(function($routeProvider) {
$routeProvider.when('/login', {
templateUrl: 'tpl/loading.html',
templateUrl: 'tpl/login.html',
controller: LoginCtrl
});
$routeProvider.when('/login-existing', {

50
src/js/controller/login-existing.js
View File

@ -4,49 +4,42 @@ define(function(require) {
var appController = require('js/app-controller');
var LoginExistingCtrl = function($scope, $location) {
var emailDao = appController._emailDao;
$scope.buttonEnabled = true;
$scope.incorrect = false;
$scope.confirmPassphrase = function() {
var passphrase = $scope.passphrase,
emailDao = appController._emailDao;
if (!passphrase) {
if (!$scope.passphrase) {
return;
}
// disable button once loggin has started
$scope.buttonEnabled = false;
$scope.incorrect = false;
unlockCrypto(imapLogin);
unlockCrypto();
};
function unlockCrypto(callback) {
var userId = emailDao._account.emailAddress;
emailDao._keychain.getUserKeyPair(userId, function(err, keypair) {
if (err) {
callback(err);
return;
}
emailDao.unlock(keypair, passphrase, callback);
});
}
function imapLogin(err) {
function unlockCrypto() {
var userId = emailDao._account.emailAddress;
appController._emailDao._keychain.getUserKeyPair(userId, function(err, keypair) {
if (err) {
handleError(err);
return;
}
emailDao.unlock(keypair, $scope.passphrase, onUnlock);
});
}
// login to imap backend
appController._emailDao.imapLogin(function(err) {
if (err) {
handleError(err);
return;
}
onLogin();
});
function onUnlock(err) {
if (err) {
handleError(err);
return;
}
};
$location.path('/desktop');
$scope.$apply();
}
function handleError(err) {
$scope.incorrect = true;
@ -54,11 +47,6 @@ define(function(require) {
$scope.$apply();
console.error(err);
}
function onLogin() {
$location.path('/desktop');
$scope.$apply();
}
};
return LoginExistingCtrl;

22
src/js/controller/login-initial.js
View File

@ -51,26 +51,26 @@ define(function(require) {
}
var id = keys.keyId.substring(8, keys.keyId.length);
dl.createDownload(keys.publicKeyArmored + keys.privateKeyArmored, id + '.asc', 'text/plain');
$scope.exported = true;
dl.createDownload({
content: keys.publicKeyArmored + keys.privateKeyArmored,
filename: id + '.asc',
contentType: 'text/plain'
}, onSave);
});
};
$scope.proceed = function() {
// login to imap backend
appController._emailDao.imapLogin(function(err) {
function onSave(err) {
if (err) {
console.error(err);
return;
}
onLogin();
});
$scope.proceed();
$scope.$apply();
}
};
function onLogin() {
$scope.proceed = function() {
$location.path('/desktop');
$scope.$apply();
}
};
function setState(state, async) {
$scope.state = state;

67
src/js/controller/login-new-device.js
View File

@ -5,64 +5,53 @@ define(function(require) {
appController = require('js/app-controller');
var LoginExistingCtrl = function($scope, $location) {
var emailDao = appController._emailDao;
$scope.incorrect = false;
$scope.confirmPassphrase = function() {
var passphrase = $scope.passphrase,
emailDao = appController._emailDao;
if (!passphrase) {
if (!$scope.passphrase) {
$scope.incorrect = true;
return;
}
$scope.incorrect = false;
unlockCrypto(imapLogin);
unlockCrypto();
};
function unlockCrypto(callback) {
var userId = emailDao._account.emailAddress;
emailDao._keychain.getUserKeyPair(userId, function(err, keypair) {
if (err) {
callback(err);
return;
}
keypair.privateKey = {
_id: keypair.publicKey._id,
userId: userId,
encryptedKey: $scope.key.privateKeyArmored
};
emailDao.unlock(keypair, passphrase, function(err) {
if (err) {
$scope.incorrect = true;
$scope.$apply();
callback(err);
return;
}
emailDao._keychain.putUserKeyPair(keypair, callback);
});
});
}
function imapLogin(err) {
function unlockCrypto() {
var userId = emailDao._account.emailAddress;
emailDao._keychain.getUserKeyPair(userId, function(err, keypair) {
if (err) {
console.error(err);
return;
}
// login to imap backend
appController._emailDao.imapLogin(function(err) {
keypair.privateKey = {
_id: keypair.publicKey._id,
userId: userId,
encryptedKey: $scope.key.privateKeyArmored
};
emailDao.unlock(keypair, $scope.passphrase, function(err) {
if (err) {
$scope.incorrect = true;
$scope.$apply();
console.error(err);
return;
}
onLogin();
});
}
};
function onLogin() {
emailDao._keychain.putUserKeyPair(keypair, onUnlock);
});
});
}
function onUnlock(err) {
if (err) {
console.error(err);
return;
}
$location.path('/desktop');
$scope.$apply();
}

11
src/js/controller/login.js
View File

@ -27,13 +27,22 @@ define(function(require) {
return;
}
// initiate controller by creating email dao
appController.init(auth.emailAddress, auth.token, function(err, availableKeys) {
if (err) {
console.error(err);
return;
}
redirect(availableKeys);
// login to imap backend
appController._emailDao.imapLogin(function(err) {
if (err) {
console.error(err);
console.log('Error logging into IMAP... proceeding in offline mode.');
}
redirect(availableKeys);
});
});
});
}

41
src/js/util/download.js
View File

@ -3,23 +3,40 @@ define(function() {
var dl = {};
dl.createDownload = function(content, filename, contentType) {
contentType = contentType || 'application/octet-stream';
dl.createDownload = function(options, callback) {
var contentType = options.contentType || 'application/octet-stream';
chrome.fileSystem.chooseEntry({
type: 'saveFile',
suggestedName: filename
}, function(file) {
suggestedName: options.filename
}, onEntry);
function onEntry(file) {
if (!file) {
callback();
return;
}
file.createWriter(function(writer) {
writer.onerror = console.error;
writer.onwriteend = function() {};
writer.write(new Blob([content], {
type: contentType
}));
}, console.error);
});
file.createWriter(onWriter, onError);
}
function onWriter(writer) {
writer.onerror = onError;
writer.onwriteend = onEnd;
writer.write(new Blob([options.content], {
type: contentType
}));
}
function onError(e) {
console.error(e);
callback({
errMsg: 'Error exporting keypair to file!'
});
}
function onEnd() {
callback();
}
};
return dl;

1
src/sass/all.scss
View File

@ -19,6 +19,7 @@
@import "components/layout";
// Views
@import "views/shared";
@import "views/navigation";
@import "views/mail-list";
@import "views/read";

3
src/sass/views/_shared.scss Normal file
View File

@ -0,0 +1,3 @@
.waiting-cursor {
cursor: wait;
}

1
src/tpl/loading.html
View File

@ -1 +0,0 @@
<p>loading...</p>

12
src/tpl/login-initial.html
View File

@ -1,4 +1,4 @@
<div class="view-login">
<div class="view-login" ng-class="{'waiting-cursor': state === states.PROCESSING}">
<div class="logo-wrapper">
<div class="logo"></div>
@ -7,7 +7,7 @@
<div class="content" ng-show="state === states.IDLE">
<h1>Set passphrase</h1>
<p>If you forget your passphrase, there is no way to restore your data. So it might be a good idea to write it down and keep it in a safe place.</p>
<p>This is used to protect your keypair. If you forget your passphrase, there is no way to restore your data.</p>
<form>
<div>
@ -23,15 +23,15 @@
<div class="content" ng-show="state === states.PROCESSING">
<h1>Generating keypair</h1>
<p>A batch of highly trained monkeys has been dispatched to collect entropy for your personal keypair. Please stand by...</p>
<p>Please stand by. This can take a while...</p>
</div><!--/content-->
<div class="content" ng-show="state === states.DONE">
<h1>Keypair generated</h1>
<p>A keypair has been generated for you. Please store this key pair in a safe location before you proceed.</p>
<button ng-click="exportKeypair()" class="btn" tabindex="4">Export keypair</button>
<button ng-click="proceed()" ng-disabled="!exported" class="btn" tabindex="4">Proceed</button>
<p>Your personal keypair has been generated. You can export it (e.g. to a USB flash drive) to setup whiteout on another computer or as a backup.</p>
<button ng-click="exportKeypair()" class="btn" tabindex="4">Export now</button>
<button ng-click="proceed()" class="btn" tabindex="5">Do it later</button>
</div><!--/content-->
</div>

13
src/tpl/login.html Normal file
View File

@ -0,0 +1,13 @@
<div class="view-login waiting-cursor">
<div class="logo-wrapper">
<div class="logo"></div>
</div><!--/logo-->
<div class="content">
<h1>Login</h1>
<p>Authenticating with the mail server...</p>
</div><!--/content-->
</div>