Skip to content

Commit

Permalink
adding auth key param to unsubscribe
Browse files Browse the repository at this point in the history
  • Loading branch information
Devendra committed Jan 8, 2015
1 parent 4a95a6d commit dfe2f7a
Show file tree
Hide file tree
Showing 23 changed files with 328 additions and 308 deletions.
13 changes: 7 additions & 6 deletions core/pubnub-common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,9 @@ function PN_API(setup) {

// Announce Leave Event
var SELF = {
'LEAVE' : function( channel, blocking, callback, error ) {
'LEAVE' : function( channel, blocking, auth_key, callback, error ) {

var data = { 'uuid' : UUID, 'auth' : AUTH_KEY }
var data = { 'uuid' : UUID, 'auth' : auth_key || AUTH_KEY }
, origin = nextorigin(ORIGIN)
, callback = callback || function(){}
, err = error || function(){}
Expand Down Expand Up @@ -582,9 +582,9 @@ function PN_API(setup) {
});
return true;
},
'LEAVE_GROUP' : function( channel_group, blocking, callback, error ) {
'LEAVE_GROUP' : function( channel_group, blocking, auth_key, callback, error ) {

var data = { 'uuid' : UUID, 'auth' : AUTH_KEY }
var data = { 'uuid' : UUID, 'auth' : auth_key || AUTH_KEY }
, origin = nextorigin(ORIGIN)
, callback = callback || function(){}
, err = error || function(){}
Expand Down Expand Up @@ -1011,6 +1011,7 @@ function PN_API(setup) {
'unsubscribe' : function(args, callback) {
var channel = args['channel']
, channel_group = args['channel_group']
, auth_key = args['auth_key'] || AUTH_KEY
, callback = callback || args['callback'] || function(){}
, err = args['error'] || function(){};

Expand All @@ -1033,7 +1034,7 @@ function PN_API(setup) {
CHANNELS[ch] = 0;
if (ch in STATE) delete STATE[ch];
if (READY) {
CB_CALLED = SELF['LEAVE']( ch, 0 , callback, err);
CB_CALLED = SELF['LEAVE']( ch, 0 , auth_key, callback, err);
}
if (!CB_CALLED) callback({action : "leave"});

Expand All @@ -1057,7 +1058,7 @@ function PN_API(setup) {
CHANNEL_GROUPS[chg] = 0;
if (chg in STATE) delete STATE[chg];
if (READY) {
CB_CALLED = SELF['LEAVE_GROUP']( chg, 0 , callback, err);
CB_CALLED = SELF['LEAVE_GROUP']( chg, 0 , auth_key, callback, err);
}
if (!CB_CALLED) callback({action : "leave"});

Expand Down
13 changes: 7 additions & 6 deletions modern/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,9 +545,9 @@ function PN_API(setup) {

// Announce Leave Event
var SELF = {
'LEAVE' : function( channel, blocking, callback, error ) {
'LEAVE' : function( channel, blocking, auth_key, callback, error ) {

var data = { 'uuid' : UUID, 'auth' : AUTH_KEY }
var data = { 'uuid' : UUID, 'auth' : auth_key || AUTH_KEY }
, origin = nextorigin(ORIGIN)
, callback = callback || function(){}
, err = error || function(){}
Expand Down Expand Up @@ -583,9 +583,9 @@ function PN_API(setup) {
});
return true;
},
'LEAVE_GROUP' : function( channel_group, blocking, callback, error ) {
'LEAVE_GROUP' : function( channel_group, blocking, auth_key, callback, error ) {

var data = { 'uuid' : UUID, 'auth' : AUTH_KEY }
var data = { 'uuid' : UUID, 'auth' : auth_key || AUTH_KEY }
, origin = nextorigin(ORIGIN)
, callback = callback || function(){}
, err = error || function(){}
Expand Down Expand Up @@ -1012,6 +1012,7 @@ function PN_API(setup) {
'unsubscribe' : function(args, callback) {
var channel = args['channel']
, channel_group = args['channel_group']
, auth_key = args['auth_key'] || AUTH_KEY
, callback = callback || args['callback'] || function(){}
, err = args['error'] || function(){};

Expand All @@ -1034,7 +1035,7 @@ function PN_API(setup) {
CHANNELS[ch] = 0;
if (ch in STATE) delete STATE[ch];
if (READY) {
CB_CALLED = SELF['LEAVE']( ch, 0 , callback, err);
CB_CALLED = SELF['LEAVE']( ch, 0 , auth_key, callback, err);
}
if (!CB_CALLED) callback({action : "leave"});

Expand All @@ -1058,7 +1059,7 @@ function PN_API(setup) {
CHANNEL_GROUPS[chg] = 0;
if (chg in STATE) delete STATE[chg];
if (READY) {
CB_CALLED = SELF['LEAVE_GROUP']( chg, 0 , callback, err);
CB_CALLED = SELF['LEAVE_GROUP']( chg, 0 , auth_key, callback, err);
}
if (!CB_CALLED) callback({action : "leave"});

Expand Down
Loading

0 comments on commit dfe2f7a

Please sign in to comment.