Skip to content

Commit

Permalink
Merge pull request #127 from happner/release/2.15.1
Browse files Browse the repository at this point in the history
all tests ok
  • Loading branch information
southbite committed Sep 21, 2016
2 parents 3232574 + 7eb198e commit 111f0d5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -333,4 +333,9 @@

- transport protocol 1.1.0

2.15.1 2016-10-20
------------------------

- fixed encrypted payload error login


2 changes: 1 addition & 1 deletion lib/services/pubsub/transform-payload-encryption.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ TransformPayloadEncryption.prototype.outgoing = function(packet, next){

if (packet.data._meta.action == 'login') {

if (packet.data._meta && packet.data._meta.status == 'error') return;
if (packet.data._meta && packet.data._meta.status == 'error') return next();

packet.data.encrypted = this.__pubsub.happn.services.crypto.asymmetricEncrypt(packet.data.data.user.publicKey, this.__pubsub.happn.services.security._keyPair.privateKey, JSON.stringify(packet.data));
packet.data._meta = {type: 'login'};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "happn",
"description": "pub/sub api as a service using primus and mongo & redis or nedb, can work as cluster, single process or embedded using nedb, use in production at your own risk",
"version": "2.15.0",
"version": "2.15.1",
"main": "./lib/index",
"protocol":"1.1.0",
"scripts": {
Expand Down

0 comments on commit 111f0d5

Please sign in to comment.