From a88320b1b276b4d195fdb4e31fa1eeedba3ea0e8 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Wed, 5 Apr 2023 18:48:47 +0000
Subject: [PATCH] backout sign change

---
 src/gam/__init__.py     | 4 ----
 src/gam/auth/signjwt.py | 4 +---
 src/setup.cfg           | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 5ba09408..bd2fc975 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -7962,17 +7962,13 @@ def create_signjwt_serviceaccount():
             'key_type': 'signjwt',
             'token_uri': 'https://oauth2.googleapis.com/token'
             }
-    print(1)
     request = transport.create_request()
-    print(2)
     try:
         creds, sa_info['project_id'] = google.auth.default(scopes=['https://www.googleapis.com/auth/iam'],
                 request=request)
     except google.auth.exceptions.DefaultCredentialsError as e:
         controlflow.system_error_exit(2, e)
-    print(3)
     creds.refresh(request)
-    print(4)
     sa_info['client_email'] = creds.service_account_email
     oa2 = buildGAPIObjectNoAuthentication('oauth2')
     token_info = gapi.call(oa2, 'tokeninfo', access_token=creds.token)
diff --git a/src/gam/auth/signjwt.py b/src/gam/auth/signjwt.py
index 84b2d841..c26557f3 100644
--- a/src/gam/auth/signjwt.py
+++ b/src/gam/auth/signjwt.py
@@ -73,10 +73,8 @@ class SignJwt(google.auth.crypt.Signer):
 
     def sign(self, message):
         ''' Call IAM Credentials SignJWT API to get our signed JWT '''
-        request = transport.create_request()
         try:
-            credentials, _ = google.auth.default(scopes=['https://www.googleapis.com/auth/iam'],
-                                                 request=request)
+            credentials, _ = google.auth.default(scopes=['https://www.googleapis.com/auth/iam'])
         except google.auth.exceptions.DefaultCredentialsError as e:
             controlflow.system_error_exit(2, e)
         httpObj = transport.AuthorizedHttp(
diff --git a/src/setup.cfg b/src/setup.cfg
index cc30fcae..38cb1260 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -31,7 +31,6 @@ install_requires =
     google-auth-oauthlib >= 0.4.6
     google-auth >= 2.3.3
     httplib2 >= 0.20.2
-    importlib.metadata; python_version < '3.8'
     passlib >= 1.7.4
     pathvalidate
     python-dateutil