From 27f8f0246dacf76aab9433caa6a823efdbe0f0c5 Mon Sep 17 00:00:00 2001 From: chong-shao <31256040+chong-shao@users.noreply.github.com> Date: Tue, 6 Dec 2022 22:29:57 +0000 Subject: [PATCH 1/2] Migrate messaging's oauth token generation to use google auth --- messaging/messaging.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/messaging/messaging.py b/messaging/messaging.py index 3f1c039..d2cbd5a 100644 --- a/messaging/messaging.py +++ b/messaging/messaging.py @@ -12,8 +12,9 @@ import argparse import json import requests +import google.auth.transport.requests -from oauth2client.service_account import ServiceAccountCredentials +from google.oauth2 import service_account PROJECT_ID = '' BASE_URL = 'https://fcm.googleapis.com' @@ -27,10 +28,12 @@ def _get_access_token(): :return: Access token. """ - credentials = ServiceAccountCredentials.from_json_keyfile_name( - 'service-account.json', SCOPES) + credentials = service_account.Credentials.from_service_account_file( + 'service-account.json', scopes=SCOPES) + request = google.auth.transport.requests.Request() access_token_info = credentials.get_access_token() - return access_token_info.access_token + credentials.refresh(request) + return credentials.token # [END retrieve_access_token] def _send_fcm_message(fcm_message): From 2c68e7c5020f4dbb072cca4da03dba389fbbe4ec Mon Sep 17 00:00:00 2001 From: chong-shao <31256040+chong-shao@users.noreply.github.com> Date: Tue, 6 Dec 2022 16:11:15 -0800 Subject: [PATCH 2/2] Remove a line of code that's not needed Remove a line of code that's not needed --- messaging/messaging.py | 1 - 1 file changed, 1 deletion(-) diff --git a/messaging/messaging.py b/messaging/messaging.py index d2cbd5a..7e9b235 100644 --- a/messaging/messaging.py +++ b/messaging/messaging.py @@ -31,7 +31,6 @@ def _get_access_token(): credentials = service_account.Credentials.from_service_account_file( 'service-account.json', scopes=SCOPES) request = google.auth.transport.requests.Request() - access_token_info = credentials.get_access_token() credentials.refresh(request) return credentials.token # [END retrieve_access_token]