django-restit 4.2.93__py3-none-any.whl → 4.2.95__py3-none-any.whl

account/fcm/__init__.py

@@ -1,33 +1 @@
-import requests
-from rest import settings
-from rest import log
-
-# SEND_URL = "POST https://fcm.googleapis.com/v1/{parent=projects/*}/messages:send"
-SEND_URL = "https://fcm.googleapis.com/fcm/send"
-CM_PROVIDERS = settings.get("CM_PROVIDERS", None)
-
-FCM_KEY = CM_PROVIDERS["fcm"]["key"]
-
-logger = log.getLogger("fcm", filename="fcm.log")
-
-
-def sendToDevice(device, data):
-    return sendData(device.cm_token, data)
-
-
-def sendNotification(to_token, title, body):
-    return postMessage(dict(to=to_token, notification=dict(title=title, body=body)))
-
-
-def sendData(to_token, data, priority="high"):
-    return postMessage(dict(to=to_token, data=data, content_available=True, priority=priority))
-
-
-def postMessage(payload):
-    logger.info("sending FCM", payload)
-    headers = dict(Authorization=F"key={FCM_KEY}")
-    headers['Content-type'] = 'application/json'
-    resp = requests.post(SEND_URL, json=payload, headers=headers)
-    logger.info("response", resp.text)
-    return resp
-
+from . import v1

account/fcm/legacy.py

@@ -0,0 +1,35 @@
+import requests
+from rest import settings
+from rest import log
+
+
+SEND_URL = "https://fcm.googleapis.com/fcm/send"
+CM_PROVIDERS = settings.get("CM_PROVIDERS", None)
+
+FCM_KEY = None
+if CM_PROVIDERS and "fcm" in CM_PROVIDERS:
+    FCM_KEY = CM_PROVIDERS["fcm"]["key"]
+
+logger = log.getLogger("fcm", filename="fcm.log")
+
+
+def sendToDevice(device, data):
+    return sendData(device.cm_token, data)
+
+
+def sendNotification(to_token, title, body):
+    return postMessage(dict(to=to_token, notification=dict(title=title, body=body)))
+
+
+def sendData(to_token, data, priority="high"):
+    return postMessage(dict(to=to_token, data=data, content_available=True, priority=priority))
+
+
+def postMessage(payload):
+    logger.info("sending FCM", payload)
+    headers = dict(Authorization=F"key={FCM_KEY}")
+    headers['Content-type'] = 'application/json'
+    resp = requests.post(SEND_URL, json=payload, headers=headers)
+    logger.info("response", resp.text)
+    return resp
+

account/fcm/v1.py

@@ -1,47 +1,105 @@
-from google.oauth2 import service_account
-import google.auth.transport.requests
+import json
+import time
+import jwt  # PyJWT library
 import requests
-from rest import settings
-from rest import log
+from objict import objict
 
 
-FCM_ENDPOINT = 'https://fcm.googleapis.com/v1/projects/{}/messages:send'
-
-logger = log.getLogger("fcm", filename="fcm.log")
-
-
-def getCredentials(data):
-    # Load the credentials from the dictionary
-    credentials = service_account.Credentials.from_service_account_info(
-        data,
-        scopes=["https://www.googleapis.com/auth/firebase.messaging"])
-    # Use the credentials to authenticate a Requests session
-    auth_req = google.auth.transport.requests.Request()
-    credentials.refresh(auth_req)
-    return credentials
-
-
-def sendToDevice(device, data):
-    return sendData(device.cm_token, data)
-
-
-def sendNotification(to_token, title, body):
-    return postMessage(dict(token=to_token, notification=dict(title=title, body=body)))
-
-
-def sendData(to_token, data, priority="high"):
-    return postMessage(dict(token=to_token, data=data, content_available=True, priority=priority))
-
+def create_jwt(service_account_info):
+    """
+    Create a JWT (JSON Web Token) for service account authentication.
+    
+    :param service_account_info: Dictionary containing service account credentials.
+    :return: JWT string.
+    """
+    now = int(time.time())
+    payload = {
+        'iss': service_account_info['client_email'],
+        'sub': service_account_info['client_email'],
+        'aud': 'https://oauth2.googleapis.com/token',
+        'iat': now,
+        'exp': now + 3600,
+        'scope': 'https://www.googleapis.com/auth/firebase.messaging'
+    }
+    
+    additional_headers = {
+        'kid': service_account_info['private_key_id']
+    }
+    
+    token = jwt.encode(payload, service_account_info['private_key'], algorithm='RS256', headers=additional_headers)
+    return token
 
-def postMessage(credentials, payload):
-    logger.info("sending FCM", payload)
+def get_access_token(jwt_token):
+    """
+    Exchange a JWT for an access token.
+    
+    :param jwt_token: JWT string.
+    :return: Access token string.
+    """
+    url = 'https://oauth2.googleapis.com/token'
     headers = {
-        'Authorization': 'Bearer ' + credentials.token,
-        'Content-Type': 'application/json; UTF-8',
+        'Content-Type': 'application/x-www-form-urlencoded'
+    }
+    payload = {
+        'grant_type': 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+        'assertion': jwt_token
     }
-    body = dict(message=payload)
-    resp = requests.post(FCM_ENDPOINT.format(credentials.project_id), headers=headers, json=body)
-    logger.info("response", resp.text)
-    return resp
+    
+    response = requests.post(url, headers=headers, data=payload)
+    response_data = response.json()
+    return response_data['access_token']
 
+class FirebaseNotifier:
+    def __init__(self, service_account_info):
+        """
+        Initialize the FirebaseNotifier with the project ID and service account info.
+        
+        :param project_id: The project ID from Firebase project settings.
+        :param service_account_info: Dictionary containing service account credentials.
+        """
+        self.project_id = service_account_info.get("project_id")
+        self.service_account_info = service_account_info
+        self.fcm_url = f'https://fcm.googleapis.com/v1/projects/{self.project_id}/messages:send'
+        self.jwt_token = None
+        self._jwt_expires = 0
+        self.access_token = None
 
+    @property
+    def is_jwt_expired(self):
+        return time.time() > self._jwt_expires
+    
+    
+    def _get_access_token(self):
+        """
+        Get the access token, refreshing if necessary.
+        
+        :return: Access token string.
+        """
+        if not self.jwt_token or self.is_jwt_expired:
+            self.jwt_token = create_jwt(self.service_account_info)
+            self._jwt_expires = time.time() + 3000
+            self.access_token = get_access_token(self.jwt_token)
+        return self.access_token
+    
+    def send(self, registration_token, title, body, data=None):
+        """
+        Send a notification to the specified registration token.
+        
+        :param registration_token: Device registration token.
+        :param title: Title of the notification.
+        :param body: Body of the notification.
+        :param data: Optional data payload to send along with the notification.
+        :return: Response from the FCM server.
+        """
+        access_token = self._get_access_token()
+        headers = {
+            'Content-Type': 'application/json',
+            'Authorization': f'Bearer {access_token}',
+        }
+        message = dict(token=registration_token)
+        if title and body:
+            message["notification"] = dict(title=title, body=body)
+        if data:
+            message["data"] = data
+        payload = dict(message=message)
+        return requests.post(self.fcm_url, headers=headers, data=json.dumps(payload))

account/migrations/0021_alter_cloudcredentials_group.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.1.5 on 2024-06-07 20:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0020_cloudcredentials_cloudcredentialsmetadata'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cloudcredentials',
+            name='group',
+            field=models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cloud_credentials', to='account.group'),
+        ),
+    ]

account/models/device.py

@@ -39,13 +39,13 @@ class MemberDevice(models.Model, rm.RestModel, rm.MetaDataModel):
         }
 
     def sendData(self, message, **kwargs):
-        messenger = getCloudMessanger(self.cm_provider)
+        messenger = getCloudMessenger(self.cm_provider)
         if messenger:
             return messenger.sendToDevice(self, message)
         return objict(status_code=404, reason=self.cm_provider)
 
     def sendNotification(self, title, body):
-        messenger = getCloudMessanger(self.cm_provider)
+        messenger = getCloudMessenger(self.cm_provider)
         if messenger:
             return messenger.sendNotification(self.cm_token, title, body)
         return objict(status_code=404, reason=self.cm_provider)
@@ -129,7 +129,9 @@ class CloudCredentials(models.Model, rm.RestModel, rm.MetaDataModel):
 
     created = models.DateTimeField(auto_now_add=True)
     modified = models.DateTimeField(auto_now=True)
-    group = models.ForeignKey("account.Group", related_name="cloud_credentials", on_delete=models.CASCADE)
+    group = models.ForeignKey(
+        "account.Group", null=True, default=None,
+        related_name="cloud_credentials", on_delete=models.CASCADE)
 
     name = models.CharField(max_length=128, blank=True, null=True, default=None)
     uuid = models.CharField(db_index=True, max_length=64, blank=True, null=True, default=None)
@@ -137,23 +139,28 @@ class CloudCredentials(models.Model, rm.RestModel, rm.MetaDataModel):
 
     credentials = rf.JSONField()
 
+    _notifier = None
+
+    @property
+    def notifier(self):
+        if self._notifier is None:
+            from account import fcm
+            self._notifier = fcm.v1.FirebaseNotifier(self.credentials) 
+        return self._notifier
+
     def sendToDevice(self, device, message):
-        pass
+        self.notifier.send(device.cm_token, None, None, message)
 
     def sendNotification(self, token, title, body):
-        pass
+        self.notifier.send(token, title, body)
 
 
 class CloudCredentialsMetaData(rm.MetaDataBase):
     parent = models.ForeignKey(CloudCredentials, related_name="properties", on_delete=models.CASCADE)
 
 
-def getCloudMessanger(name):
-    # creds = CloudCredentials.objects.filter(uuid=name).last()
-    # if creds is not None:
-    #     return creds
-    if name not in CM_BACKENDS:
-        if name == "fcm":
-            from account import fcm
-            CM_BACKENDS["fcm"] = fcm
-    return CM_BACKENDS.get(name, None)
+def getCloudMessenger(name):
+    creds = CloudCredentials.objects.filter(uuid=name).last()
+    if creds is not None:
+        return creds
+    return None

account/rpc/device.py

@@ -19,33 +19,12 @@ def rest_on_member_device(request, pk=None):
     return am.MemberDevice.on_rest_request(request, pk)
 
 
-@rd.urlPOST(r'^member/device/register$')
+@rd.urlPOST('member/device/register')
 @rd.login_required
 def rest_on_member_device_register(request):
     # this requires a JWT with a device_id
     if not request.device_id:
         return rv.restPermissionDenied(request, "requires jwt with device id")
-    cm_token = request.DATA.get("cm_token")
-    device_id = request.device_id
-    if not device_id:
-        return rv.restStatus(request, False, error="missing device id")
-    md = am.MemberDevice.objects.filter(uuid=device_id).last()
-    if md is None:
-        md = am.MemberDevice.createFromRequest(request, uuid=device_id, user=request.member)
-    elif cm_token is not None and md.cm_token != cm_token:
-        md.cm_token = cm_token
-        md.cm_provider = "fcm"
-        md.save()
-    return rv.restStatus(request, True)
-
-
-@rd.urlPOST(r'^member/device/register$')
-@rd.login_required
-def rest_on_member_device_register(request):
-    # this requires a JWT with a device_id
-    if not request.device_id:
-        return rv.restPermissionDenied(request, "requires jwt with device id")
-
     md = am.MemberDevice.register(request, request.member, request.device_id)
     return rv.restStatus(request, md is not None)
 

{django_restit-4.2.93.dist-info → django_restit-4.2.95.dist-info}/METADATA

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

{django_restit-4.2.93.dist-info → django_restit-4.2.95.dist-info}/RECORD

@@ -1,8 +1,8 @@
 account/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 account/admin.py,sha256=8MQ1gAgjpPUC_SGCVMwd7I8fqLetqcutLiasjssEPRY,1839
-account/fcm/__init__.py,sha256=gSTChf99a5T20oKuf4Lh9UR-f3V5qI20AZxIhlPlnVs,980
-account/fcm/google.py,sha256=T-TZZgrT90YY9sEtKC6rNGpwfBmVTCuFpB31vRDguu0,1710
-account/fcm/v1.py,sha256=PGpSmAnq40cMao4SwDU2tv6m5PpteDWLbzvldjalRJ8,1434
+account/fcm/__init__.py,sha256=lXuz5z0bL5TXqVdaXxiVr-4zF_Q1IZ8kPEkuYGb5eB0,17
+account/fcm/legacy.py,sha256=5WM5HAnjVPweT0oe3rBN9tBGHfC-DPa-e9luH3baT8Y,959
+account/fcm/v1.py,sha256=dMCHvDRgTrkkrfFocxuVvBo7sAzqonOO1IqVYp2B7Jk,3601
 account/migrations/0001_initial.py,sha256=PhYNDTiwjyUplErBmYc34ecynLIEJL2JuC02o8GCXes,15894
 account/migrations/0003_member_phone_number.py,sha256=auAJCfxsK-y3Veo0vwZfrIZxvwHYBjg5CpYRgCWghCQ,738
 account/migrations/0004_group_modified_alter_group_created.py,sha256=20iNFlUGtRCWUsxEqTJFRQKQ73z4REhfo-hGam8IHXY,551
@@ -22,9 +22,10 @@ account/migrations/0017_rename_requires_topt_member_requires_totp.py,sha256=GksG
 account/migrations/0018_userpasskey.py,sha256=SdXYo4TkIeP5wLNfCza3Jq5-gKuUufzTHGBw0hFQOMY,1475
 account/migrations/0019_group_location.py,sha256=EfMB_w4qWUGDqQeNc453PFZwpjpTeoA6xr6Qgo_YAOM,601
 account/migrations/0020_cloudcredentials_cloudcredentialsmetadata.py,sha256=mHwxkyDfA4ueQOt34w5ndJB4XwNTDLv79CkKgzhlz-c,2250
+account/migrations/0021_alter_cloudcredentials_group.py,sha256=zoFYmE-hd3uRGX6DRO9k-osPwH0jFeTU7S-pjCOtakk,561
 account/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 account/models/__init__.py,sha256=cV_lMnT2vL_mjiYtT4hlcIHo52ocFbGSNVkOIHHLXZY,385
-account/models/device.py,sha256=TloXvvrx3khF3BeGFuVYn6DhXjOW0AMZb4F9Fl5nBII,5491
+account/models/device.py,sha256=dKq6fDQSKkeBrq9glZtmewSQPDBCnYuUlBEx7ZonfBc,5693
 account/models/feeds.py,sha256=vI7fG4ASY1M0Zjke24RdnfDcuWeATl_yR_25jPmT64g,2011
 account/models/group.py,sha256=mjWwePt3ogQUo9m0EhURMz0aBrVVx_0Drr0lNDESQio,22281
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
@@ -41,7 +42,7 @@ account/passkeys/core.py,sha256=xj-vXjSrfWDvc5MYtEmXzwaMkNHl-cXrQKVrN9soRCg,4126
 account/periodic.py,sha256=-u0n-7QTJgDOkasGhBAPwHAwjpqWGA-MZLEFkVTqCGU,874
 account/rpc/__init__.py,sha256=SGF0M_-H0dKh3b1apSX29BotNWAvITYccGQVC0MIjL8,336
 account/rpc/auth.py,sha256=p62tyihWvSY2zn7eaVxKcCG9qLnnZBIkwdRH81sS5_Y,16615
-account/rpc/device.py,sha256=mB14a6qvJIBnCa9ivLhPXwEt5Gk2foyqsKBtZxC506k,3070
+account/rpc/device.py,sha256=lU2BHNPreHV0dDTjAPc7Sc-5m2JP8SiWVqiKuBfV7Fo,2281
 account/rpc/group.py,sha256=riymUK6ttv8G6SG6K-v7UCvM40WQy3HaGSeF_sEiaU0,4929
 account/rpc/member.py,sha256=VNRSD38mmTUCbq3cCSy3qRyquzeVEwW_8zzrtS0-vAA,1817
 account/rpc/notify.py,sha256=Q2YWejP36egeF060Hih5uX4Psv_B8NWlLLPi7iDYlIw,3344
@@ -479,7 +480,7 @@ wiki/migrations/0002_alter_pagemedia_entry.py,sha256=9CUnfvBmj0D4akCkux7HFuXgw9B
 wiki/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wiki/models/__init__.py,sha256=jE-9r_Hqpyo7ysKu9BschXOn5Zg34wUt894GwJpxA28,132
 wiki/models/faq.py,sha256=nvcEFerllQKT61kIYlasvZzRKwpXyfmQpiqkpHP1V1o,1745
-wiki/models/page.py,sha256=JlcdT0ZLbhumJj0O5BvfAwhaO4hKgDlAcfuLx6NRPLU,7299
+wiki/models/page.py,sha256=7_HAbvHtWIQpttiMoxrm8-Mfik6kUW6F47xkXZN2Omk,7311
 wiki/models/revision.py,sha256=St5-vz8SGvogsDL6jTWqHLE23PS5mp9iA0DUt3hWTsU,729
 wiki/periodic.py,sha256=t-UgXJIug-OLslJM_r03-5WrNKj39TxrvfuNFjVAhDs,334
 wiki/renderers/__init__.py,sha256=lLEoJvjU3ezXwBGcjleKk_kMyNeMD9MpfBlEiKayEiM,461
@@ -506,7 +507,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.93.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.93.dist-info/METADATA,sha256=OCowDR53jgY3SaLn5JQEG2TnwCYW_NBhDQfj9Zdq6Oc,7662
-django_restit-4.2.93.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.93.dist-info/RECORD,,
+django_restit-4.2.95.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.95.dist-info/METADATA,sha256=K21UAXzCkyfR09FSmBEKjfKpusJtmjN5JxSqTyXeoCc,7662
+django_restit-4.2.95.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.95.dist-info/RECORD,,

wiki/models/page.py

@@ -72,7 +72,7 @@ class Page(dm.Model, rm.RestModel, rm.MetaDataModel):
                 }
             },
             "toc": {
-                "extra": ["children"],
+                "extra": ["children", "metadata"],
                 "graphs": {
                     "self": "basic",
                     "children": "toc_child"

account/fcm/google.py

@@ -1,53 +0,0 @@
-import json
-import requests
-import time
-from jwt import JWT, jwk_from_dict
-from datetime import datetime, timedelta
-
-
-def oauthLogin(service_account_info):
-    # Token endpoint
-    token_uri = service_account_info["token_uri"]
-
-    # The current time and expiration time for the assertion
-    issued_at_time = datetime.utcnow()
-    expiration_time = issued_at_time + timedelta(minutes=60)
-
-    # JWT Header
-    jwt_header = {
-        "alg": "RS256",
-        "typ": "JWT",
-        "kid": service_account_info["private_key_id"]
-    }
-
-    # JWT Payload
-    jwt_payload = {
-        "iss": service_account_info["client_email"],
-        "sub": service_account_info["client_email"],
-        "aud": token_uri,
-        "iat": int(issued_at_time.timestamp()),
-        "exp": int(expiration_time.timestamp()),
-        "scope": "https://www.googleapis.com/auth/firebase.messaging"
-    }
-
-    # Create a JWT
-    jwt_instance = JWT()
-    private_key = jwk_from_dict({"k": service_account_info["private_key"], "kty": "RSA"})
-    assertion = jwt_instance.encode(jwt_header, jwt_payload, private_key)
-
-    # Exchange the JWT for an access token
-    response = requests.post(token_uri, data={
-        "grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
-        "assertion": assertion
-    })
-
-    response_data = response.json()
-
-    access_token = response_data.get("access_token")
-    expires_in = response_data.get("expires_in")  # Seconds until the token expires
-
-    # You can now use this access_token to authenticate requests to Google APIs.
-    # Remember to refresh the token using a similar process once it's close to expiration.
-
-    print("Access Token:", access_token)
-    print("Expires In:", expires_in)