From 0bdd3b0a31f8a2b9bc94ad2d953d68b9e1867710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 15 Apr 2016 12:19:43 +0200 Subject: [PATCH] Updated for changes in BlenderID validate_token URL and response. See BlenderID change 432034f858fbfd695f3ce0a0b3724524de7a05bb --- pillar/application/modules/blender_id.py | 2 +- tests/common_test_class.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pillar/application/modules/blender_id.py b/pillar/application/modules/blender_id.py index 6362b843..e0e445b2 100644 --- a/pillar/application/modules/blender_id.py +++ b/pillar/application/modules/blender_id.py @@ -114,7 +114,7 @@ def validate_token(user_id, token, oauth_subclient_id): if oauth_subclient_id: payload['subclient_id'] = oauth_subclient_id - url = '{0}/subclients/validate_token'.format(blender_id_endpoint()) + url = '{0}/u/validate_token'.format(blender_id_endpoint()) log.debug('POSTing to %r', url) # POST to Blender ID, handling errors as negative verification results. diff --git a/tests/common_test_class.py b/tests/common_test_class.py index 714d66a3..de803fd6 100644 --- a/tests/common_test_class.py +++ b/tests/common_test_class.py @@ -97,15 +97,15 @@ class AbstractPillarTest(TestMinimal): """Sets up Responses to mock unhappy validation flow.""" responses.add(responses.POST, - '%s/subclients/validate_token' % self.app.config['BLENDER_ID_ENDPOINT'], + '%s/u/validate_token' % self.app.config['BLENDER_ID_ENDPOINT'], json={'status': 'fail'}, - status=404) + status=403) def mock_blenderid_validate_happy(self): """Sets up Responses to mock happy validation flow.""" responses.add(responses.POST, - '%s/subclients/validate_token' % self.app.config['BLENDER_ID_ENDPOINT'], + '%s/u/validate_token' % self.app.config['BLENDER_ID_ENDPOINT'], json=BLENDER_ID_USER_RESPONSE, status=200)