Fix flask required decorator to redirect on expired credentials. #452

theacodes · 2016-03-04T18:53:34Z

No description provided.

theacodes · 2016-03-04T19:00:56Z

/r @dhermes or @nathanielmanistaatgoogle

@elibixby ran into this in his application. Apparently I was mistaken in just checking credentials.invalid which doesn't actually get set to True until a request fails.

@waprin a similar change is probably need to the django helper.

waprin · 2016-03-04T19:06:37Z

acknowledged, I'll take a look at Django.

tests/contrib/test_flask_util.py

+
+                response = client.get('/protected')
+                self.assertEqual(response.status_code, httplib.OK)
+                self.assertTrue('Hello' in response.data.decode('utf-8'))


theacodes · 2016-03-10T19:08:13Z

Thanks for the review, just FYI I won't be able to fix the few nits for a few days. Will ping when ready.

theacodes · 2016-03-11T18:07:38Z

Comments addressed.

dhermes · 2016-03-11T19:13:36Z

LoL Python 2.6. You need to swap out for unittest2 in tests.contrib.test_flask_util.

theacodes · 2016-03-11T19:16:34Z

LoL Python 2.6

ugh. Fixed.

tests/contrib/test_flask_util.py

+
+                response = client.get('/protected')
+            self.assertEqual(response.status_code, httplib.FOUND)
+            self.assertTrue('oauth2authorize' in response.headers['Location'])


theacodes · 2016-03-11T21:05:00Z

@nathanielmanistaatgoogle all of the instances self.assertTrue(y in z) have been changed to self.assertIn(y, z).

oauth2client/contrib/flask_util.py

@@ -443,7 +443,12 @@ def credentials(self):

    def has_credentials(self):
        """Returns True if there are valid credentials for the current user."""
-        return self.credentials and not self.credentials.invalid
+        if not self.credentials:
+            return False


oauth2client/contrib/flask_util.py

+        if not self.credentials:
+            return False
+        # Is the access token expired? If so, do we have an refresh token?
+        if (self.credentials.access_token_expired


nathanielmanistaatgoogle · 2016-03-11T21:50:10Z

Looks good; waiting on fresh test results.

Fix flask required decorator to redirect on expired credentials.

theacodes · 2016-03-11T21:53:41Z

Thanks. :)

On Fri, Mar 11, 2016 at 1:53 PM Nathaniel Manista notifications@github.com
wrote:

Merged #452 #452.

—
Reply to this email directly or view it on GitHub
#452 (comment).

googlebot added the cla: yes label Mar 4, 2016

theacodes mentioned this pull request Mar 4, 2016

oauth2client.client.HttpAccessTokenRefreshError: invalid_grant: Bad Request #451

Closed

nathanielmanistaatgoogle reviewed Mar 8, 2016
View reviewed changes

tests/contrib/test_flask_util.py

response = client.get('/protected')

self.assertEqual(response.status_code, httplib.OK)

self.assertTrue('Hello' in response.data.decode('utf-8'))

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

theacodes force-pushed the flask-util-expired-credentials branch from 861cc4b to 3a30e21 Compare March 11, 2016 18:07

theacodes force-pushed the flask-util-expired-credentials branch from 3a30e21 to a5e0223 Compare March 11, 2016 19:15

nathanielmanistaatgoogle reviewed Mar 11, 2016
View reviewed changes

tests/contrib/test_flask_util.py

response = client.get('/protected')

self.assertEqual(response.status_code, httplib.FOUND)

self.assertTrue('oauth2authorize' in response.headers['Location'])

This comment was marked as spam.

Sign in to view

theacodes force-pushed the flask-util-expired-credentials branch from a5e0223 to 1966a6f Compare March 11, 2016 21:03

theacodes force-pushed the flask-util-expired-credentials branch from 1966a6f to 947997c Compare March 11, 2016 21:15

nathanielmanistaatgoogle reviewed Mar 11, 2016
View reviewed changes

theacodes force-pushed the flask-util-expired-credentials branch from 947997c to 98e2899 Compare March 11, 2016 21:30

nathanielmanistaatgoogle reviewed Mar 11, 2016
View reviewed changes

oauth2client/contrib/flask_util.py

if not self.credentials:

return False

# Is the access token expired? If so, do we have an refresh token?

if (self.credentials.access_token_expired

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Fix flask required decorator to redirect on expired credentials.

a82146a

theacodes force-pushed the flask-util-expired-credentials branch from 98e2899 to a82146a Compare March 11, 2016 21:48

nathanielmanistaatgoogle added a commit that referenced this pull request Mar 11, 2016

Merge pull request #452 from jonparrott/flask-util-expired-credentials

20dcfe2

Fix flask required decorator to redirect on expired credentials.

nathanielmanistaatgoogle merged commit 20dcfe2 into googleapis:master Mar 11, 2016

theacodes mentioned this pull request Apr 15, 2016

Release v2.0.2. #501

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix flask required decorator to redirect on expired credentials. #452

Fix flask required decorator to redirect on expired credentials. #452

theacodes commented Mar 4, 2016

theacodes commented Mar 4, 2016

waprin commented Mar 4, 2016

This comment was marked as spam.

This comment was marked as spam.

theacodes commented Mar 10, 2016

theacodes commented Mar 11, 2016

dhermes commented Mar 11, 2016

theacodes commented Mar 11, 2016

This comment was marked as spam.

theacodes commented Mar 11, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

nathanielmanistaatgoogle commented Mar 11, 2016

theacodes commented Mar 11, 2016

Fix flask required decorator to redirect on expired credentials. #452

Fix flask required decorator to redirect on expired credentials. #452

Conversation

theacodes commented Mar 4, 2016

theacodes commented Mar 4, 2016

waprin commented Mar 4, 2016

This comment was marked as spam.

This comment was marked as spam.

theacodes commented Mar 10, 2016

theacodes commented Mar 11, 2016

dhermes commented Mar 11, 2016

theacodes commented Mar 11, 2016

This comment was marked as spam.

theacodes commented Mar 11, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

nathanielmanistaatgoogle commented Mar 11, 2016

theacodes commented Mar 11, 2016