From eb45334efecb66202898a216fb02800008a1d636 Mon Sep 17 00:00:00 2001 From: Giulio Cesare Solaroli Date: Sun, 6 Oct 2019 15:22:33 +0200 Subject: [PATCH] Added some logs on OTP handshake --- frontend/delta/js/Clipperz/Async.js | 6 +++--- frontend/delta/js/Clipperz/PM/Connection.js | 3 ++- frontend/delta/js/Clipperz/PM/DataModel/User.js | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/frontend/delta/js/Clipperz/Async.js b/frontend/delta/js/Clipperz/Async.js index 57018f26..e4160b72 100644 --- 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 + " ", aThenBlock, null, aValue); + deferredResult = Clipperz.Async.callbacks(aName + " ", aThenBlock, someArguments, aValue); } else { - deferredResult = Clipperz.Async.callbacks(aName + " ", anElseBlock, null, aValue); + deferredResult = Clipperz.Async.callbacks(aName + " ", anElseBlock, someArguments, aValue); } return deferredResult; diff --git a/frontend/delta/js/Clipperz/PM/Connection.js b/frontend/delta/js/Clipperz/PM/Connection.js index 0eb317fe..8516b122 100644 --- 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 index f85cd175..68413fe0 100644 --- 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'));