django-restit 4.2.98__tar.gz → 4.2.100__tar.gz

{django_restit-4.2.98 → django_restit-4.2.100}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.98
+Version: 4.2.100
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.98 → django_restit-4.2.100}/account/fcm/v1.py

@@ -3,6 +3,12 @@ import time
 import jwt  # PyJWT library
 import requests
 from objict import objict
+from rest import log
+from rest import settings
+
+
+DEBUG_FCM = settings.get("DEBUG_FCM", False)
+logger = log.getLogger("fcm", filename="fcm.log")
 
 
 def create_jwt(service_account_info):
@@ -49,6 +55,7 @@ def get_access_token(jwt_token):
     response_data = response.json()
     return response_data['access_token']
 
+
 class FirebaseNotifier:
     def __init__(self, service_account_info):
         """
@@ -81,7 +88,7 @@ class FirebaseNotifier:
             self.access_token = get_access_token(self.jwt_token)
         return self.access_token
     
-    def send(self, registration_token, title, body, data=None):
+    def send(self, registration_token, title, body, data=None, **kwargs):
         """
         Send a notification to the specified registration token.
         
@@ -89,6 +96,8 @@ class FirebaseNotifier:
         :param title: Title of the notification.
         :param body: Body of the notification.
         :param data: Optional data payload to send along with the notification.
+
+        :param ttl: optional life of message in seconds 
         :return: Response from the FCM server.
         """
         access_token = self._get_access_token()
@@ -101,5 +110,16 @@ class FirebaseNotifier:
             message["notification"] = dict(title=title, body=body)
         if data:
             message["data"] = data
+            if priority == "high":
+                message["android"] = dict(priority="high")
+                message["apns"] = dict(headers={"apns-priority": "10"})
+            else:
+                message["android"] = dict(priority="normal")
+                message["apns"] = dict(headers={"apns-priority": "5"})
         payload = dict(message=message)
-        return requests.post(self.fcm_url, headers=headers, data=json.dumps(payload))
+        if DEBUG_FCM:
+            logger.info("request", payload)
+        resp = requests.post(self.fcm_url, headers=headers, data=json.dumps(payload))
+        if DEBUG_FCM:
+            logger.info("response", resp.json())
+        return resp

{django_restit-4.2.98 → django_restit-4.2.100}/account/models/device.py

@@ -77,8 +77,8 @@ class MemberDevice(models.Model, rm.RestModel, rm.MetaDataModel):
                 md.cm_token = cm_token
             if buid and md.buid != buid:
                 md.buid = buid
-            if cm_token is not None:
-                md.cm_provider = "fcm"
+            if cm_provider is not None:
+                md.cm_provider = cm_provider
             if md.state != 1:
                 md.state = 1
             md.touch(request.ip)
@@ -137,6 +137,9 @@ class CloudCredentials(models.Model, rm.RestModel, rm.MetaDataModel):
     uuid = models.CharField(db_index=True, max_length=64, blank=True, null=True, default=None)
     state = models.IntegerField(db_index=True, default=1)
 
+    # specify the cloud provider class "account.fcm.v1.FirebaseNotifier"
+    # provider_class = models.CharField(max_length=255, null=True, default=None)
+
     credentials = rf.JSONField()
 
     _notifier = None

{django_restit-4.2.98 → django_restit-4.2.100}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.98"
+version = "4.2.100"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"