Skip to content

Commit ae314a8

Browse files
fix: fix user cred universe domain issue (#1436)
1 parent d5fc84f commit ae314a8

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

google/oauth2/credentials.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def __setstate__(self, d):
180180
self._rapt_token = d.get("_rapt_token")
181181
self._enable_reauth_refresh = d.get("_enable_reauth_refresh")
182182
self._trust_boundary = d.get("_trust_boundary")
183-
self._universe_domain = d.get("_universe_domain")
183+
self._universe_domain = d.get("_universe_domain") or _DEFAULT_UNIVERSE_DOMAIN
184184
# The refresh_handler setter should be used to repopulate this.
185185
self._refresh_handler = None
186186

system_tests/secrets.tar.enc

0 Bytes
Binary file not shown.

tests/oauth2/test_credentials.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,17 @@ def test_pickle_and_unpickle(self):
913913
for attr in list(creds.__dict__):
914914
assert getattr(creds, attr) == getattr(unpickled, attr)
915915

916+
def test_pickle_and_unpickle_universe_domain(self):
917+
# old version of auth lib doesn't have _universe_domain, so the pickled
918+
# cred doesn't have such a field.
919+
creds = self.make_credentials()
920+
del creds._universe_domain
921+
922+
unpickled = pickle.loads(pickle.dumps(creds))
923+
924+
# make sure the unpickled cred sets _universe_domain to default.
925+
assert unpickled.universe_domain == "googleapis.com"
926+
916927
def test_pickle_and_unpickle_with_refresh_handler(self):
917928
expected_expiry = _helpers.utcnow() + datetime.timedelta(seconds=2800)
918929
refresh_handler = mock.Mock(return_value=("TOKEN", expected_expiry))

0 commit comments

Comments
 (0)