fixing encryption to be compatible with JS and javastaging-3.3.5

2 files changed, 4 insertions, 32 deletions

diff --git a/common/PubnubBase.py b/common/PubnubBase.py
index 64d43ed..5856921 100644
--- a/common/PubnubBase.py
+++ b/common/PubnubBase.py
@@ -42,6 +42,7 @@ class PubnubBase(object):
         self.secret_key    = secret_key
         self.cipher_key    = cipher_key
         self.ssl           = ssl_on
+        self.pc            = PubnubCrypto()
 
         if self.ssl :
             self.origin = 'https://' + self.origin
@@ -69,22 +70,7 @@ class PubnubBase(object):
 
     def encrypt(self, message):
         if self.cipher_key:
-            pc = PubnubCrypto()
-            out = []
-            if type( message ) == type(list()):
-                for item in message:
-                    encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
-                    out.append(encryptItem)
-                message = json.dumps(out)
-            elif type( message ) == type(dict()):
-                outdict = {}
-                for k, item in message.iteritems():
-                    encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
-                    outdict[k] = encryptItem
-                    out.append(outdict)
-                message = json.dumps(out[0])
-            else:
-                message = json.dumps(pc.encrypt(self.cipher_key, json.dumps(message)).replace('\n',''))
+            message = json.dumps(self.pc.encrypt(self.cipher_key, json.dumps(message)).replace('\n',''))
         else :
             message = json.dumps(message)
 
@@ -92,21 +78,7 @@ class PubnubBase(object):
 
     def decrypt(self, message):
         if self.cipher_key:
-            pc = PubnubCrypto()
-            if type( message ) == type(list()):
-                for item in message:
-                    encryptItem = pc.decrypt(self.cipher_key, item )
-                    out.append(encryptItem)
-                message = out
-            elif type( message ) == type(dict()):
-                outdict = {}
-                for k, item in message.iteritems():
-                    encryptItem = pc.decrypt(self.cipher_key, item )
-                    outdict[k] = encryptItem
-                    out.append(outdict)
-                message = out[0]
-            else:
-                message = pc.decrypt(self.cipher_key, message)
+            message = self.pc.decrypt(self.cipher_key, message)
 
         return message
 
diff --git a/common/PubnubCore.py b/common/PubnubCore.py
index 9a4fcae..dcfd319 100644
--- a/common/PubnubCore.py
+++ b/common/PubnubCore.py
@@ -106,7 +106,7 @@ class PubnubCore(PubnubBase):
 
                 ## Run user Callback and Reconnect if user permits.
                 for message in messages :
-                    if not callback(message) :
+                    if not callback(self.decrypt(message)) :
                         return
 
             except Exception: