diff options
| author | Galen Guyer <galen@galenguyer.com> | 2021-08-22 17:10:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-22 17:10:12 -0700 |
| commit | f61cd2b5b616e3b7f35fad95b515313ea2d50bcb (patch) | |
| tree | 9d7e614a187ae97a362c33b1310c3716f48291a2 | |
| parent | 3648b10df9ea4532a5aa9fd96c309a44e2d420f6 (diff) | |
| parent | 9df4bf9ac0aae5f1a2efc5ee64d5c71d98305bd1 (diff) | |
Merge pull request #289 from mxmeinhold/revert-onesignal-2.0
Revert "Update onesignal-sdk requirement from ~=1.0.0 to ~=2.0.0"
| -rw-r--r-- | packet/__init__.py | 6 | ||||
| -rw-r--r-- | packet/notifications.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/packet/__init__.py b/packet/__init__.py index 82e2119..85102f5 100644 --- a/packet/__init__.py +++ b/packet/__init__.py @@ -7,7 +7,7 @@ import logging import os import csh_ldap -import onesignal_sdk.client as onesignal +import onesignal from flask import Flask from flask_gzip import Gzip from flask_migrate import Migrate @@ -57,7 +57,7 @@ if app.config['ONESIGNAL_USER_AUTH_KEY'] and \ app.config['ONESIGNAL_CSH_APP_ID']: csh_onesignal_client = onesignal.Client( user_auth_key=app.config['ONESIGNAL_USER_AUTH_KEY'], - rest_api_key=app.config['ONESIGNAL_CSH_APP_AUTH_KEY'], + app_auth_key=app.config['ONESIGNAL_CSH_APP_AUTH_KEY'], app_id=app.config['ONESIGNAL_CSH_APP_ID'] ) app.logger.info('CSH Onesignal configured and notifications enabled') @@ -68,7 +68,7 @@ if app.config['ONESIGNAL_USER_AUTH_KEY'] and \ app.config['ONESIGNAL_INTRO_APP_ID']: intro_onesignal_client = onesignal.Client( user_auth_key=app.config['ONESIGNAL_USER_AUTH_KEY'], - rest_api_key=app.config['ONESIGNAL_INTRO_APP_AUTH_KEY'], + app_auth_key=app.config['ONESIGNAL_INTRO_APP_AUTH_KEY'], app_id=app.config['ONESIGNAL_INTRO_APP_ID'] ) app.logger.info('Intro Onesignal configured and notifications enabled') diff --git a/packet/notifications.py b/packet/notifications.py index 49b89fb..7327912 100644 --- a/packet/notifications.py +++ b/packet/notifications.py @@ -1,7 +1,7 @@ from datetime import datetime from typing import Any, Callable, TypeVar, cast -import onesignal_sdk.client as onesignal +import onesignal from packet import app, intro_onesignal_client, csh_onesignal_client from packet.models import NotificationSubscription, Packet diff --git a/requirements.txt b/requirements.txt index 4b0024a..33c1bbe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ ddtrace flask_sqlalchemy~=2.5.1 gunicorn~=20.0.4 mypy -onesignal-sdk~=2.0.0 +onesignal-sdk~=1.0.0 psycopg2-binary~=2.8.6 pylint-quotes~=0.2.1 pylint~=2.7.2 |