Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/pysher/pusher.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def subscribe(self, channel_name, auth=None):
if auth is None:
if channel_name.startswith('presence-'):
data['auth'] = self._generate_presence_token(channel_name)
data['channel_data'] = json.dumps(self.user_data)
data['channel_data'] = self.user_data if isinstance(self.user_data, str) else json.dumps(self.user_data)
elif channel_name.startswith('private-'):
data['auth'] = self._generate_auth_token(channel_name)
else:
Expand Down Expand Up @@ -208,7 +208,12 @@ def _generate_presence_token(self, channel_name):
headers=self.auth_endpoint_headers
)
assert response.status_code == 200, f"Failed to get auth token from {self.auth_endpoint}"
auth_key = response.json()["auth"]
response_data = response.json()
auth_key = response_data["auth"]
try:
self.user_data = response_data["channel_data"]
except KeyError:
pass
return auth_key

def _build_url(self, secure=True, port=None, custom_host=None):
Expand Down