Merge remote-tracking branch 'origin/main' into property-retry

clundin25 · clundin25 · commit bcbe8282c3dd · 2022-09-22T14:27:30.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,21 @@
 
 [1]: https://pypi.org/project/google-auth/#history
 
+## [2.11.1](https://github.com/googleapis/google-auth-library-python/compare/v2.11.0...v2.11.1) (2022-09-20)
+
+
+### Bug Fixes
+
+* Fix socket leak in impersonated_credentials ([#1123](https://github.com/googleapis/google-auth-library-python/issues/1123)) ([b1eb467](https://github.com/googleapis/google-auth-library-python/commit/b1eb467f50f0c080e89a122426061b28f0be0567)), closes [#1122](https://github.com/googleapis/google-auth-library-python/issues/1122)
+* Make pluggable auth tests work in all environments ([#1114](https://github.com/googleapis/google-auth-library-python/issues/1114)) ([bb5c979](https://github.com/googleapis/google-auth-library-python/commit/bb5c9791c64e2472a90ba7191f79f4c5fedb2538))
+* Skip oauth2client adapter tests if oauth2client is not installed ([#1132](https://github.com/googleapis/google-auth-library-python/issues/1132)) ([d15092f](https://github.com/googleapis/google-auth-library-python/commit/d15092ff8b66b3039641d482a0debafde4ba0077))
+* Update token refresh threshold from 20 seconds to 5 minutes ([#1146](https://github.com/googleapis/google-auth-library-python/issues/1146)) ([261a561](https://github.com/googleapis/google-auth-library-python/commit/261a56138fba33ff7d898ab5907a6098125fefef))
+
+
+### Documentation
+
+* **samples:** Add auth samples and tests ([#1102](https://github.com/googleapis/google-auth-library-python/issues/1102)) ([ac87520](https://github.com/googleapis/google-auth-library-python/commit/ac875201bc8ba5d638a9eafcd3ccfdeb73a2f0ec))
+
 ## [2.11.0](https://github.com/googleapis/google-auth-library-python/compare/v2.10.0...v2.11.0) (2022-08-18)
 
 
diff --git a/google/auth/_helpers.py b/google/auth/_helpers.py
@@ -23,11 +23,7 @@
 from six.moves import urllib
 
 
-# Token server doesn't provide a new a token when doing refresh unless the
-# token is expiring within 30 seconds, so refresh threshold should not be
-# more than 30 seconds. Otherwise auth lib will send tons of refresh requests
-# until 30 seconds before the expiration, and cause a spike of CPU usage.
-REFRESH_THRESHOLD = datetime.timedelta(seconds=20)
+REFRESH_THRESHOLD = datetime.timedelta(seconds=300)
 
 
 def copy_docstring(source_class):
diff --git a/google/auth/version.py b/google/auth/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "2.11.0"
+__version__ = "2.11.1"
diff --git a/google/oauth2/_reauth_async.py b/google/oauth2/_reauth_async.py
@@ -307,7 +307,7 @@ async def refresh_grant(
     ):
         if not enable_reauth_refresh:
             raise exceptions.RefreshError(
-                "Reauthentication is needed. Please run `gcloud auth login --update-adc` to reauthenticate."
+                "Reauthentication is needed. Please run `gcloud auth application-default login` to reauthenticate."
             )
 
         rapt_token = await get_rapt_token(
diff --git a/google/oauth2/reauth.py b/google/oauth2/reauth.py
@@ -332,7 +332,7 @@ def refresh_grant(
     ):
         if not enable_reauth_refresh:
             raise exceptions.RefreshError(
-                "Reauthentication is needed. Please run `gcloud auth login --update-adc` to reauthenticate."
+                "Reauthentication is needed. Please run `gcloud auth application-default login` to reauthenticate."
             )
 
         rapt_token = get_rapt_token(

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ async def refresh_grant(`
`307`	`307`	`):`
`308`	`308`	`if not enable_reauth_refresh:`
`309`	`309`	`raise exceptions.RefreshError(`
`310`		- "Reauthentication is needed. Please run `gcloud auth login --update-adc` to reauthenticate."
	`310`	+ "Reauthentication is needed. Please run `gcloud auth application-default login` to reauthenticate."
`311`	`311`	`)`
`312`	`312`
`313`	`313`	`rapt_token = await get_rapt_token(`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ def refresh_grant(`
`332`	`332`	`):`
`333`	`333`	`if not enable_reauth_refresh:`
`334`	`334`	`raise exceptions.RefreshError(`
`335`		- "Reauthentication is needed. Please run `gcloud auth login --update-adc` to reauthenticate."
	`335`	+ "Reauthentication is needed. Please run `gcloud auth application-default login` to reauthenticate."
`336`	`336`	`)`
`337`	`337`
`338`	`338`	`rapt_token = get_rapt_token(`