diff options
Diffstat (limited to 'mediagoblin')
| -rw-r--r-- | mediagoblin/oauth/views.py | 8 | ||||
| -rw-r--r-- | mediagoblin/tests/test_oauth1.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mediagoblin/oauth/views.py b/mediagoblin/oauth/views.py index 910df957..1b7c789a 100644 --- a/mediagoblin/oauth/views.py +++ b/mediagoblin/oauth/views.py @@ -125,15 +125,15 @@ def client_register(request): error = "Invalid registration type" return json_response({"error": error}, status=400) - logo_url = data.get("logo_url", client.logo_url) - if logo_url is not None and not validate_url(logo_url): - error = "Logo URL {0} is not a valid URL.".format(logo_url) + logo_uri = data.get("logo_uri", client.logo_url) + if logo_uri is not None and not validate_url(logo_uri): + error = "Logo URI {0} is not a valid URI.".format(logo_uri) return json_response( {"error": error}, status=400 ) else: - client.logo_url = logo_url + client.logo_url = logo_uri client.application_name = data.get("application_name", None) diff --git a/mediagoblin/tests/test_oauth1.py b/mediagoblin/tests/test_oauth1.py index 9a5e332b..e41a68c7 100644 --- a/mediagoblin/tests/test_oauth1.py +++ b/mediagoblin/tests/test_oauth1.py @@ -72,7 +72,7 @@ class TestOAuth(object): "application_name": "Testificate MD", "application_type": "web", "contacts": "someone@someplace.com tuteo@tsengeo.lu", - "logo_url": "http://ayrel.com/utral.png", + "logo_uri": "http://ayrel.com/utral.png", "redirect_uris": "http://navi-kosman.lu http://gmg-yawne-oeru.lu", } @@ -85,7 +85,7 @@ class TestOAuth(object): assert client.secret == client_info["client_secret"] assert client.application_type == query["application_type"] assert client.redirect_uri == query["redirect_uris"].split() - assert client.logo_url == query["logo_url"] + assert client.logo_url == query["logo_uri"] assert client.contacts == query["contacts"].split() @@ -102,7 +102,7 @@ class TestOAuth(object): "type": "client_update", "application_name": "neytiri", "contacts": "someone@someplace.com abc@cba.com", - "logo_url": "http://place.com/picture.png", + "logo_uri": "http://place.com/picture.png", "application_type": "web", "redirect_uris": "http://blah.gmg/whatever https://inboxen.org/", } @@ -117,7 +117,7 @@ class TestOAuth(object): assert client.application_type == update_query["application_type"] assert client.application_name == update_query["application_name"] assert client.contacts == update_query["contacts"].split() - assert client.logo_url == update_query["logo_url"] + assert client.logo_url == update_query["logo_uri"] assert client.redirect_uri == update_query["redirect_uris"].split() def to_authorize_headers(self, data): |