Skip to content

Commit 5eaad8a

Browse files
giohappygiohappy
authored
[Fixes #12847] Stop using Gravatar service for the default gravar (#12849)
* disable gravatar provider * fix hardcoded avatar urls in permspec tests * fix hardcoded avatar urls in permspec tests (2)
1 parent 58b43b0 commit 5eaad8a

File tree

6 files changed

+30
-28
lines changed

6 files changed

+30
-28
lines changed

‎geonode/base/api/tests.py‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
from django.contrib.auth import get_user_model
4343

4444
from owslib.etree import etree
45+
from avatar.templatetags.avatar_tags import avatar_url
4546

4647
from rest_framework.test import APITestCase
4748
from rest_framework.renderers import JSONRenderer
@@ -1030,13 +1031,13 @@ def test_perms_resources(self):
10301031
"username": bobby.username,
10311032
"first_name": bobby.first_name,
10321033
"last_name": bobby.last_name,
1033-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
1034+
"avatar": build_absolute_uri(avatar_url(bobby)),
10341035
"permissions": "owner",
10351036
"is_staff": False,
10361037
"is_superuser": False,
10371038
},
10381039
{
1039-
"avatar": "https://www.gravatar.com/avatar/7a68c67c8d409ff07e42aa5d5ab7b765/?s=240",
1040+
"avatar": build_absolute_uri(avatar_url(bobby)),
10401041
"first_name": "admin",
10411042
"id": 1,
10421043
"last_name": "",
@@ -1111,7 +1112,7 @@ def test_perms_resources(self):
11111112
"username": bobby.username,
11121113
"first_name": bobby.first_name,
11131114
"last_name": bobby.last_name,
1114-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
1115+
"avatar": build_absolute_uri(avatar_url(bobby)),
11151116
"permissions": "owner",
11161117
"is_staff": False,
11171118
"is_superuser": False,
@@ -1121,13 +1122,13 @@ def test_perms_resources(self):
11211122
"username": norman.username,
11221123
"first_name": norman.first_name,
11231124
"last_name": norman.last_name,
1124-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
1125+
"avatar": build_absolute_uri(avatar_url(bobby)),
11251126
"permissions": "edit",
11261127
"is_staff": False,
11271128
"is_superuser": False,
11281129
},
11291130
{
1130-
"avatar": "https://www.gravatar.com/avatar/7a68c67c8d409ff07e42aa5d5ab7b765/?s=240",
1131+
"avatar": build_absolute_uri(avatar_url(bobby)),
11311132
"first_name": "admin",
11321133
"id": 1,
11331134
"last_name": "",
@@ -1160,13 +1161,13 @@ def test_perms_resources(self):
11601161
"username": bobby.username,
11611162
"first_name": bobby.first_name,
11621163
"last_name": bobby.last_name,
1163-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
1164+
"avatar": build_absolute_uri(avatar_url(bobby)),
11641165
"permissions": "owner",
11651166
"is_staff": False,
11661167
"is_superuser": False,
11671168
},
11681169
{
1169-
"avatar": "https://www.gravatar.com/avatar/7a68c67c8d409ff07e42aa5d5ab7b765/?s=240",
1170+
"avatar": build_absolute_uri(avatar_url(bobby)),
11701171
"first_name": "admin",
11711172
"id": 1,
11721173
"last_name": "",
@@ -1223,13 +1224,13 @@ def test_perms_resources(self):
12231224
"username": bobby.username,
12241225
"first_name": bobby.first_name,
12251226
"last_name": bobby.last_name,
1226-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
1227+
"avatar": build_absolute_uri(avatar_url(bobby)),
12271228
"permissions": "owner",
12281229
"is_staff": False,
12291230
"is_superuser": False,
12301231
},
12311232
{
1232-
"avatar": "https://www.gravatar.com/avatar/7a68c67c8d409ff07e42aa5d5ab7b765/?s=240",
1233+
"avatar": build_absolute_uri(avatar_url(bobby)),
12331234
"first_name": "admin",
12341235
"id": 1,
12351236
"last_name": "",
@@ -2156,7 +2157,7 @@ def test_manager_can_edit_map(self):
21562157
"username": "bobby",
21572158
"first_name": "bobby",
21582159
"last_name": "",
2159-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
2160+
"avatar": build_absolute_uri(avatar_url(bobby)),
21602161
"permissions": "manage",
21612162
"is_superuser": False,
21622163
"is_staff": False,
@@ -2166,7 +2167,7 @@ def test_manager_can_edit_map(self):
21662167
"username": "admin",
21672168
"first_name": "admin",
21682169
"last_name": "",
2169-
"avatar": "https://www.gravatar.com/avatar/7a68c67c8d409ff07e42aa5d5ab7b765/?s=240",
2170+
"avatar": build_absolute_uri(avatar_url(bobby)),
21702171
"permissions": "owner",
21712172
"is_superuser": True,
21722173
"is_staff": True,
@@ -2197,7 +2198,7 @@ def test_manager_can_edit_map(self):
21972198
"username": "bobby",
21982199
"first_name": "bobby",
21992200
"last_name": "",
2200-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
2201+
"avatar": build_absolute_uri(avatar_url(bobby)),
22012202
"permissions": "manage",
22022203
"is_staff": False,
22032204
"is_superuser": False,
@@ -2207,7 +2208,7 @@ def test_manager_can_edit_map(self):
22072208
"username": "admin",
22082209
"first_name": "admin",
22092210
"last_name": "",
2210-
"avatar": "https://www.gravatar.com/avatar/7a68c67c8d409ff07e42aa5d5ab7b765/?s=240",
2211+
"avatar": build_absolute_uri(avatar_url(bobby)),
22112212
"permissions": "owner",
22122213
"is_staff": True,
22132214
"is_superuser": True,
@@ -2236,7 +2237,7 @@ def test_manager_can_edit_map(self):
22362237
"username": "bobby",
22372238
"first_name": "bobby",
22382239
"last_name": "",
2239-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
2240+
"avatar": build_absolute_uri(avatar_url(bobby)),
22402241
"permissions": "manage",
22412242
"is_staff": False,
22422243
"is_superuser": False,
@@ -2246,7 +2247,7 @@ def test_manager_can_edit_map(self):
22462247
"username": "admin",
22472248
"first_name": "admin",
22482249
"last_name": "",
2249-
"avatar": "https://www.gravatar.com/avatar/7a68c67c8d409ff07e42aa5d5ab7b765/?s=240",
2250+
"avatar": build_absolute_uri(avatar_url(bobby)),
22502251
"permissions": "owner",
22512252
"is_staff": True,
22522253
"is_superuser": True,

‎geonode/people/templates/people/profile_detail.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ <h2 class="page-title">{{ profile.name_long }}</h2>
2626
</div>
2727

2828
<div class="col-xs-3 col-md-2 profile-image">
29-
{% autoescape off %}{% avatar profile 240 %}{% endautoescape %}
29+
{% autoescape off %}{% avatar profile %}{% endautoescape %}
3030
</div>
3131

3232
<div class="col-xs-9 col-md-7 profile-details">

‎geonode/people/templates/people/profile_edit.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h2 class="page-title">{% trans "Edit Profile for" %} {{ profile.username }}</h2
1515
</div>
1616

1717
<div class="col-xs-3 col-md-2 profile-image">
18-
{% autoescape off %}{% avatar profile.username 240 %}{% endautoescape %}
18+
{% autoescape off %}{% avatar profile.username %}{% endautoescape %}
1919
{% if user == profile %}
2020
<p><a class="btn btn-primary btn-block" href="{% url 'avatar:change' %}">{% trans "Change your avatar" %}</a></p>
2121
{% endif %}

‎geonode/security/tests.py‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
from requests.auth import HTTPBasicAuth
3131
from tastypie.test import ResourceTestCaseMixin
32+
from avatar.templatetags.avatar_tags import avatar_url
3233

3334
from django.db.models import Q
3435
from django.urls import reverse
@@ -48,7 +49,7 @@
4849
from geonode.documents.models import Document
4950
from geonode.compat import ensure_string
5051
from geonode.upload.models import ResourceHandlerInfo
51-
from geonode.utils import check_ogc_backend
52+
from geonode.utils import check_ogc_backend, build_absolute_uri
5253
from geonode.tests.utils import check_dataset
5354
from geonode.decorators import on_ogc_backend
5455
from geonode.resource.manager import resource_manager
@@ -1363,13 +1364,13 @@ def test_perm_spec_conversion(self):
13631364
"username": standard_user.username,
13641365
"first_name": standard_user.first_name,
13651366
"last_name": standard_user.last_name,
1366-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
1367+
"avatar": build_absolute_uri(avatar_url(standard_user)),
13671368
"permissions": "owner",
13681369
"is_staff": False,
13691370
"is_superuser": False,
13701371
},
13711372
{
1372-
"avatar": "https://www.gravatar.com/avatar/7a68c67c8d409ff07e42aa5d5ab7b765/?s=240",
1373+
"avatar": build_absolute_uri(avatar_url(standard_user)),
13731374
"first_name": "admin",
13741375
"id": 1,
13751376
"last_name": "",
@@ -1416,13 +1417,13 @@ def test_perm_spec_conversion(self):
14161417
"username": standard_user.username,
14171418
"first_name": standard_user.first_name,
14181419
"last_name": standard_user.last_name,
1419-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
1420+
"avatar": build_absolute_uri(avatar_url(standard_user)),
14201421
"permissions": "owner",
14211422
"is_staff": False,
14221423
"is_superuser": False,
14231424
},
14241425
{
1425-
"avatar": "https://www.gravatar.com/avatar/7a68c67c8d409ff07e42aa5d5ab7b765/?s=240",
1426+
"avatar": build_absolute_uri(avatar_url(standard_user)),
14261427
"first_name": "admin",
14271428
"id": 1,
14281429
"last_name": "",
@@ -1486,7 +1487,7 @@ def test_perm_spec_conversion(self):
14861487
"username": standard_user.username,
14871488
"first_name": standard_user.first_name,
14881489
"last_name": standard_user.last_name,
1489-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
1490+
"avatar": build_absolute_uri(avatar_url(standard_user)),
14901491
"permissions": "view",
14911492
}
14921493
]
@@ -1566,13 +1567,13 @@ def test_perm_spec_conversion(self):
15661567
"username": standard_user.username,
15671568
"first_name": standard_user.first_name,
15681569
"last_name": standard_user.last_name,
1569-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
1570+
"avatar": build_absolute_uri(avatar_url(standard_user)),
15701571
"permissions": "download",
15711572
"is_staff": False,
15721573
"is_superuser": False,
15731574
},
15741575
{
1575-
"avatar": "https://www.gravatar.com/avatar/7a68c67c8d409ff07e42aa5d5ab7b765/?s=240",
1576+
"avatar": build_absolute_uri(avatar_url(standard_user)),
15761577
"first_name": "admin",
15771578
"id": 1,
15781579
"last_name": "",
@@ -1625,13 +1626,13 @@ def test_perm_spec_conversion(self):
16251626
"username": standard_user.username,
16261627
"first_name": standard_user.first_name,
16271628
"last_name": standard_user.last_name,
1628-
"avatar": "https://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e/?s=240",
1629+
"avatar": build_absolute_uri(avatar_url(standard_user)),
16291630
"permissions": "view",
16301631
"is_staff": False,
16311632
"is_superuser": False,
16321633
},
16331634
{
1634-
"avatar": "https://www.gravatar.com/avatar/7a68c67c8d409ff07e42aa5d5ab7b765/?s=240",
1635+
"avatar": build_absolute_uri(avatar_url(standard_user)),
16351636
"first_name": "admin",
16361637
"id": 1,
16371638
"last_name": "",

‎geonode/settings.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,6 @@
13601360
AVATAR_PROVIDERS = (
13611361
(
13621362
"avatar.providers.PrimaryAvatarProvider",
1363-
"avatar.providers.GravatarAvatarProvider",
13641363
"avatar.providers.DefaultAvatarProvider",
13651364
)
13661365
if os.getenv("AVATAR_PROVIDERS") is None

‎geonode/templates/avatar/avatar_tag.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<img src="{{ url }}" {% for key, value in kwargs.items %}{{key}}="{{value}}" {% endfor %}/>

0 commit comments

Comments
 (0)