Release v4.1.3 and update OAuth2 URIs. Fixes #742. (#743)

houglum · web-flow · commit 50d20532a748 · 2018-09-07T14:33:19.000-07:00
Release v4.1.3 and update OAuth2 URIs. Fixes #742.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## v4.1.3
+
+**Note**: oauth2client is deprecated. No more features will be added to the
+libraries and the core team is turning down support. We recommend you use
+[google-auth](https://google-auth.readthedocs.io) and [oauthlib](http://oauthlib.readthedocs.io/).
+
+* Changed OAuth2 endpoints to use oauth2.googleapis.com variants. (#742)
+
 ## v4.1.2
 
 **Note**: oauth2client is deprecated. No more features will be added to the
diff --git a/oauth2client/__init__.py b/oauth2client/__init__.py
@@ -14,10 +14,11 @@
 
 """Client library for using OAuth2, especially with Google APIs."""
 
-__version__ = '4.1.2'
+__version__ = '4.1.3'
 
 GOOGLE_AUTH_URI = 'https://accounts.google.com/o/oauth2/v2/auth'
-GOOGLE_DEVICE_URI = 'https://accounts.google.com/o/oauth2/device/code'
-GOOGLE_REVOKE_URI = 'https://accounts.google.com/o/oauth2/revoke'
-GOOGLE_TOKEN_URI = 'https://www.googleapis.com/oauth2/v4/token'
-GOOGLE_TOKEN_INFO_URI = 'https://www.googleapis.com/oauth2/v3/tokeninfo'
+GOOGLE_DEVICE_URI = 'https://oauth2.googleapis.com/device/code'
+GOOGLE_REVOKE_URI = 'https://oauth2.googleapis.com/revoke'
+GOOGLE_TOKEN_URI = 'https://oauth2.googleapis.com/token'
+GOOGLE_TOKEN_INFO_URI = 'https://oauth2.googleapis.com/tokeninfo'
+
diff --git a/tests/contrib/appengine/test_appengine.py b/tests/contrib/appengine/test_appengine.py
@@ -911,7 +911,7 @@ def test_decorator_from_client_secrets(self, new_http):
 
         # revoke_uri is not required
         self.assertEqual(self.decorator._revoke_uri,
-                         'https://accounts.google.com/o/oauth2/revoke')
+                         'https://oauth2.googleapis.com/revoke')
         self.assertEqual(self.decorator._revoke_uri,
                          self.decorator.credentials.revoke_uri)
 
diff --git a/tests/data/client_secrets.json b/tests/data/client_secrets.json
@@ -4,7 +4,7 @@
     "client_secret": "foo_client_secret",
     "redirect_uris": [],
     "auth_uri": "https://accounts.google.com/o/oauth2/v2/auth",
-    "token_uri": "https://www.googleapis.com/oauth2/v4/token",
-    "revoke_uri": "https://accounts.google.com/o/oauth2/revoke"
+    "token_uri": "https://oauth2.googleapis.com/token",
+    "revoke_uri": "https://oauth2.googleapis.com/revoke"
   }
 }
diff --git a/tests/data/unfilled_client_secrets.json b/tests/data/unfilled_client_secrets.json
@@ -4,6 +4,6 @@
     "client_secret": "[[INSERT CLIENT SECRET HERE]]",
     "redirect_uris": [],
     "auth_uri": "https://accounts.google.com/o/oauth2/v2/auth",
-    "token_uri": "https://www.googleapis.com/oauth2/v4/token"
+    "token_uri": "https://oauth2.googleapis.com/token"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"client_secret": "foo_client_secret",`
`5`	`5`	`"redirect_uris": [],`
`6`	`6`	`"auth_uri": "https://accounts.google.com/o/oauth2/v2/auth",`
`7`		`- "token_uri": "https://www.googleapis.com/oauth2/v4/token",`
`8`		`- "revoke_uri": "https://accounts.google.com/o/oauth2/revoke"`
	`7`	`+ "token_uri": "https://oauth2.googleapis.com/token",`
	`8`	`+ "revoke_uri": "https://oauth2.googleapis.com/revoke"`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`"client_secret": "[[INSERT CLIENT SECRET HERE]]",`
`5`	`5`	`"redirect_uris": [],`
`6`	`6`	`"auth_uri": "https://accounts.google.com/o/oauth2/v2/auth",`
`7`		`- "token_uri": "https://www.googleapis.com/oauth2/v4/token"`
	`7`	`+ "token_uri": "https://oauth2.googleapis.com/token"`
`8`	`8`	`}`
`9`	`9`	`}`