1 files changed, 29 insertions, 5 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/Connection.js b/frontend/gamma/js/Clipperz/PM/Connection.js
index b4e8aaa..a05a310 100644
--- a/frontend/gamma/js/Clipperz/PM/Connection.js
+++ b/frontend/gamma/js/Clipperz/PM/Connection.js
@@ -36,16 +36,17 @@ Clipperz.PM.Connection = function (args) {
         args = args || {};
 
         this._proxy = args.proxy || Clipperz.PM.Proxy.defaultProxy;
         this._getCredentialsFunction = args.getCredentialsFunction;
 
         this._clipperz_pm_crypto_version = null;
         this._connectionId = null;
         this._sharedSecret = null;
+        this._serverLockValue = null;
 
         return this;
 }
 
 Clipperz.PM.Connection.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "Connection [" + this.version() + "]";
@@ -141,16 +142,26 @@ MochiKit.Logging.logError("### Connection.defaultErrorHandler: " + anErrorString
         'connectionId': function() {
                 return this._connectionId;
         },
         
         'setConnectionId': function(aValue) {
                 this._connectionId = aValue;
         },
 
+        //-------------------------------------------------------------------------
+
+        'serverLockValue': function () {
+                return this._serverLockValue;
+        },
+        
+        'setServerLockValue': function (aValue) {
+                this._serverLockValue = aValue;
+        },
+
         //=========================================================================
 /*
         //TODO: ?????
         'oneTimePassword': function() {
                 return this._oneTimePassword;
         },
         
         'setOneTimePassword': function(aValue) {
@@ -315,23 +326,22 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
                                 });
                         },
                         function(aResult) {
                                 return (new Clipperz.ByteArray().appendBase64String(aResult['passphrase'])).asString();
                                 }               
                 ], {trace:false})
         },
 
-        'login': function(/*anUsername, aPassphrase*/) {
+        'login': function(isReconnecting) {
                         vardeferredResult;
                 var cryptoVersion;
                 var srpConnection;
 
                 cryptoVersion = this.clipperz_pm_crypto_version();
-
                 deferredResult = new Clipperz.Async.Deferred("Connection.login", {trace:false});
                 deferredResult.addCallback(this.getCredentialsFunction());
                 deferredResult.addMethod(this, 'normalizedCredentials');
         //      deferredResult.addCallbackPass(MochiKit.Signal.signal, this, 'updatedProgressState', 'connection_sendingCredentials');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.addCallback(MochiKit.Base.bind(function(someCredentials) {
                         srpConnection = new Clipperz.Crypto.SRP.Connection({ C:someCredentials['username'], P:someCredentials['password'], hash:this.hash() });
                 }, this));
@@ -394,16 +404,23 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
                 deferredResult.addCallback(MochiKit.Base.bind(function(someParameters) {
                         this.setConnectionId(someParameters['connectionId']);
                         this.setSharedSecret(srpConnection.K());
                         
         //      TODO: ?????             
         //              if (this.oneTimePassword() != null) {
         ///     ??              result = this.user().oneTimePasswordManager().archiveOneTimePassword(this.oneTimePassword()));
         //              }
+
+                        if ((isReconnecting == true) && (this.serverLockValue() != someParameters['lock'])) {
+                                throw Clipperz.PM.Connection.exception.StaleData;
+                        } else {
+                                this.setServerLockValue(someParameters['lock']);
+                        }
+
                         return someParameters;
                 }, this));
         //      deferredResult.addCallbackPass(MochiKit.Signal.signal, this, 'updatedProgressState', 'connection_loggedIn');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.addCallback(MochiKit.Async.succeed, {result:"done"});
 
                 deferredResult.callback();
                 
@@ -424,38 +441,44 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
         'ping': function () {
                         //TODO: ping the server in order to have a valid session
         },
 
         //=========================================================================
 
         'message': function(aMessageName, someParameters) {
                 var args;
+                var parameters;
+
+                parameters = someParameters || {};
+                if (typeof(parameters['user']) != 'undefined') {
+                        parameters['user']['lock'] = this.serverLockValue();
+                }
 
 //console.log(">>> Connection.message", aMessageName, someParameters);
                 args = {
                         message: aMessageName,
                         srpSharedSecret: this.sharedSecret(),
-                        parameters: (someParameters || {})
+        //              parameters: (someParameters || {})
+                        parameters: parameters
                 }
 
                 return this.sendMessage(args);
         },
 
         //-------------------------------------------------------------------------
 
         'sendMessage': function(someArguments) {
                         vardeferredResult;
                 
                 deferredResult = new Clipperz.Async.Deferred("Connection.sendMessage", {trace:false});
                 deferredResult.addMethod(this.proxy(), 'message', someArguments);
                 deferredResult.addCallback(MochiKit.Base.bind(function(res) {
                         if (typeof(res['lock']) != 'undefined') {
-        //TODO: ?????
-        //      ??              this.user().setLock(res['lock']);
+                                this.setServerLockValue(res['lock']);
                         }
                         return res;
                 }, this));
 
                 deferredResult.addErrback(MochiKit.Base.method(this, 'messageExceptionHandler'), someArguments);
                 deferredResult.callback();
                 
                 return deferredResult
@@ -582,16 +605,17 @@ Clipperz.PM.Connection.SRP['1.1'].prototype = MochiKit.Base.update(new Clipperz.
 
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 
 });
 
 Clipperz.PM.Connection.exception = {
                 WrongChecksum:  new MochiKit.Base.NamedError("Clipperz.ByteArray.exception.InvalidValue"),
+                StaleData:              new MochiKit.Base.NamedError("Stale data"),
                 UnexpectedRequest:new MochiKit.Base.NamedError("Clipperz.ByteArray.exception.UnexpectedRequest")
 };
 
 
 Clipperz.PM.Connection.communicationProtocol = {
         'currentVersion': '0.2',
         'versions': {
                         '0.1': Clipperz.PM.Connection.SRP['1.0'],//Clipperz.Crypto.SRP.versions['1.0'].Connection,