Added some logs on OTP handshake

clipperz · Oct 6, 2019 · eb45334 · eb45334
1 parent 582e0ad
commit eb45334
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/frontend/delta/js/Clipperz/Async.js b/frontend/delta/js/Clipperz/Async.js
@@ -549,14 +549,14 @@ MochiKit.Base.update(Clipperz.Async, {
 
 	//-------------------------------------------------------------------------
 
-	'deferredIf': function (aName, aThenBlock, anElseBlock) {
+	'deferredIf': function (aName, aThenBlock, anElseBlock, someArguments) {
 		return function (aValue) {
 			var deferredResult;
 
 			if (!MochiKit.Base.isUndefinedOrNull(aValue) && aValue) {
-				deferredResult = Clipperz.Async.callbacks(aName + " <then>", aThenBlock, null, aValue);
+				deferredResult = Clipperz.Async.callbacks(aName + " <then>", aThenBlock, someArguments, aValue);
 			} else {
-				deferredResult = Clipperz.Async.callbacks(aName + " <else>", anElseBlock, null, aValue);
+				deferredResult = Clipperz.Async.callbacks(aName + " <else>", anElseBlock, someArguments, aValue);
 			}
 
 			return deferredResult;

diff --git a/frontend/delta/js/Clipperz/PM/Connection.js b/frontend/delta/js/Clipperz/PM/Connection.js
@@ -314,6 +314,7 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
 		var normalizedOTP;
 
 		normalizedOTP = Clipperz.PM.DataModel.OneTimePassword.normalizedOneTimePassword(someParameters['password']);
+console.log("normalizedOTP", normalizedOTP);
 
 		args = {
 			'message': 'oneTimePassword',
@@ -323,7 +324,7 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
 				'oneTimePasswordKeyChecksum':	Clipperz.PM.DataModel.OneTimePassword.computeKeyChecksumWithUsernameAndPassword(someParameters['username'], normalizedOTP)
 			}
 		}
-
+console.log("Connction.redeemOneTimePassword 'handshake' args", args);
 		return Clipperz.Async.callbacks("Connction.redeemOneTimePassword", [
 			MochiKit.Base.method(this.proxy(), 'handshake', args),
 			function(aResult) {

diff --git a/frontend/delta/js/Clipperz/PM/DataModel/User.js b/frontend/delta/js/Clipperz/PM/DataModel/User.js
@@ -328,15 +328,15 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 		deferredResult.addCallback(Clipperz.PM.DataModel.OneTimePassword.isValidOneTimePasswordValue);
 
 		deferredResult.addCallback(Clipperz.Async.deferredIf("Is the passphrase an OTP", [
-			MochiKit.Base.method(this,'getPassphrase'),
-			MochiKit.Base.method(this,'setUsedOTP'),
+			MochiKit.Base.method(this, 'getPassphrase'),
+			MochiKit.Base.method(this, 'setUsedOTP'),
 			MochiKit.Base.method(this, 'getCredentials'),
 			MochiKit.Base.method(this.connection(), 'redeemOneTimePassword'),
 			function (aPassphrase) {
 				return MochiKit.Base.partial(MochiKit.Async.succeed, aPassphrase);
 			},
 			MochiKit.Base.method(this, 'setPassphraseFunction')
-		], []));
+		], [], {trace:false}));
 
 		deferredResult.addBoth(MochiKit.Base.method(this, 'loginWithPassphrase'));
 		deferredResult.addBothPass(MochiKit.Base.method(this, 'resetUsedOTP'));