[Fixes #13009] Add property to evaluate the basic auth

Author: mattiagiupponi

geonode/services/models.py

@@ -79,7 +79,7 @@ class Service(ResourceBase):
     # Supported Capabilities
 
     def save(self, notify=False, *args, **kwargs):
-        if kwargs.get("force_insert", False) and self.password:
+        if kwargs.get("force_insert", False) and self.needs_authentication:
             # if is the first creation, we must encrypt the password
             self.password = self.set_password(self.password)
         return super().save(notify, *args, **kwargs)
@@ -93,6 +93,10 @@ def probe(self):
             return self.harvester.remote_available
         return False
 
+    @property
+    def needs_authentication(self):
+        return self.password and self.username
+
     def _get_service_url(self):
         parsed_url = urlparse(self.base_url)
         encoded_get_args = self.extra_queryparams

geonode/services/templates/services/service_detail.html

@@ -10,7 +10,7 @@ <h3><strong>{{service.title|default:service.name}}</strong></h3>
       <p><strong>{% trans "Abstract" %}:</strong> {{service.abstract}}</p>
       <p><strong>{% trans "Keywords" %}:</strong> {{ service.keywords.all|join:", " }}</p>
       <p><strong>{% trans "Contact" %}:</strong> <a href="{% url "profile_detail" service.owner.username %}">{{ service.owner }}</a></p>
-      {% if service.type == 'WMS' and service.username %}
+      {% if service.type == 'WMS' and service.needs_authentication %}
         <p><strong>SERVICE NOTES:</strong> The service is accessed by Basic auth via the user <strong>{{service.username}}</strong></p>
       {% endif %}
     {% autoescape off %}

geonode/services/templates/services/service_list.html

@@ -29,7 +29,7 @@ <h2>{% trans "Remote Services" %}</h2>
       <a href='{{ service.base_url }}' target="_blank" rel="noopener noreferrer">{{ service.base_url }}</a>
       </td>
       <td>{{ service.service_type }}</td>
-      {% if service.username and service.type == 'WMS' %}
+      {% if service.needs_authentication and service.type == 'WMS' %}
       <td>basic auth</td>
       {% endif %}
   </tr>