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

Hide error msg if public key verification does nto work

Browse Source
This commit is contained in:
Tankred Hase 2015-04-14 18:46:08 +02:00
parent 9841a59a9e
commit d0f002bfd1
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/controller/login/login-verify-public-key.js
View File

@ -30,7 +30,7 @@ var PublicKeyVerifierCtrl = function($scope, $location, $q, $timeout, $interval,
return success();
}).catch(function(error) {
$scope.errMsg = error.message + ' Retrying in ' + RETRY_INTERVAL / 1000 + ' seconds...'; // display error
$scope.errMsg = error.message; // display error
scheduleVerification(); // schedule next verification attempt
});

2
src/js/service/publickey-verifier.js
View File

@ -95,7 +95,7 @@ PublickeyVerifier.prototype.verify = function() {
if (!verificationSuccessful) {
// nothing unexpected went wrong, but no public key could be verified
throw new Error('Could not verify public key.');
throw new Error();
}
resolve(); // we're done

20
test/unit/controller/login/login-verify-public-key-ctrl-test.js
View File

@ -94,6 +94,26 @@ describe('Public Key Verification Controller unit test', function() {
it('should not verify', function(done) {
var credentials = {};
auth.getCredentials.returns(resolves(credentials));
verifier.configure.withArgs(credentials).returns(resolves());
verifier.verify.withArgs().returns(rejects(new Error()));
scope.verify().then(function() {
expect(auth.getCredentials.calledOnce).to.be.true;
expect(verifier.configure.calledOnce).to.be.true;
expect(verifier.verify.calledOnce).to.be.true;
expect(scope.errMsg).to.equal('');
clearTimeout(scope.timeout);
clearInterval(scope.countdownDecrement);
done();
});
});
it('should not verify with error message', function(done) {
var credentials = {};
auth.getCredentials.returns(resolves(credentials));
verifier.configure.withArgs(credentials).returns(resolves());
verifier.verify.withArgs().returns(rejects(new Error('foo')));

2
test/unit/service/publickey-verifier-test.js
View File

@ -191,7 +191,7 @@ describe('Public-Key Verifier', function() {
// run the test
verifier.verify().catch(function(error) {
expect(error.message).to.equal('Could not verify public key');
expect(error.message).to.equal('');
// verification
expect(imapStub.login.callCount).to.equal(1);