refactor: switch to token credentials

Author: kylef

.profile.d/certificates.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+mkdir -p keys
+
+AUTH_KEY=APNS_AUTH_KEY_${APNS_AUTH_KEY_ID}
+echo "${!AUTH_KEY}" > keys/$APNS_AUTH_KEY_ID.pem

.profile.d/keys.sh

@@ -7,7 +7,7 @@ verify_ssl = true
 pytest = "*"
 
 [packages]
-apns2 = "==0.7.1"
+apns2 = {editable = true, git = "https://github.com/Pr0Ger/PyAPNs2.git"}
 bugsnag = "==4.1.0"
 cryptography = "==3.3.2"
 gunicorn = "==20.1.0"

Pipfile

@@ -2,27 +2,31 @@
 from typing import Optional
 
 from apns2.client import APNsClient, NotificationPriority
+from apns2.credentials import TokenCredentials
 from apns2.errors import BadDeviceToken, Unregistered
 from apns2.payload import Payload
 from bugsnag import Client
 
 from palaverapi.models import Device, database
 
 TOPIC = 'com.kylefuller.palaver'
-DIRECTORY = os.path.abspath(
-    os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'certificates')
+KEYS_DIRECTORY = os.path.abspath(
+    os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'keys')
 )
+AUTH_KEY_ID = os.environ.get('APNS_AUTH_KEY_ID')
+TEAM_ID = os.environ.get('APNS_TEAM_ID')
 bugsnag_client = Client(asynchronous=False, install_sys_hook=False)
 apns_client = None
 
 
 def load_apns_client() -> APNsClient:
     global apns_client
-
     if apns_client is None:
-        apns_client = APNsClient(
-            os.path.join(DIRECTORY, 'production.pem'), heartbeat_period=30
+        auth_key_path = os.path.join(KEYS_DIRECTORY, f'{AUTH_KEY_ID}.pem')
+        token_credentials = TokenCredentials(
+            auth_key_path=auth_key_path, auth_key_id=AUTH_KEY_ID, team_id=TEAM_ID
         )
+        apns_client = APNsClient(credentials=token_credentials, heartbeat_period=30)
 
     return apns_client
 

Pipfile.lock

@@ -20,18 +20,6 @@ def syncdb(context):
     Token.create_table()
 
 
-@task
-def upload_certs(context):
-    with open('certificates/private.pem') as fp:
-        priv_key = fp.read()
-
-    with open('certificates/public.pem') as fp:
-        pub_key = fp.read()
-
-    run('heroku config:add "APNS_PRIVATE_KEY={}" --app palaverapi'.format(priv_key))
-    run('heroku config:add "APNS_PUBLIC_KEY={}" --app palaverapi'.format(pub_key))
-
-
 def configure_db():
     database_path = os.path.join(
         os.path.dirname(os.path.realpath(__file__)), 'tests.sqlite'