-
-
-
- {% endif %}
- {% if SETTINGS.REGISTRATION_OPEN %}
-
-
- {% endif %}
-
+
+
+ {% include "socialaccount/provider_list.html" with process="login" %}
+
+
+ {% if SETTINGS.RESET_USER_PASSWORD %}
+
+
+ {% endif %}
+ {% if SETTINGS.REGISTRATION_OPEN %}
+
+ {% endif %}
+
{% include 'include/login_page_version.html' %}
diff --git a/g3w-admin/usersmanage/receivers.py b/g3w-admin/usersmanage/receivers.py
index a07ffc399..b528716c3 100644
--- a/g3w-admin/usersmanage/receivers.py
+++ b/g3w-admin/usersmanage/receivers.py
@@ -104,3 +104,5 @@ def send_email_to_user(sender, **kwargs):
)
user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL, fail_silently=True)
+
+
diff --git a/g3w-admin/usersmanage/templates/socialaccount/provider_list.html b/g3w-admin/usersmanage/templates/socialaccount/provider_list.html
new file mode 100644
index 000000000..b3b60307a
--- /dev/null
+++ b/g3w-admin/usersmanage/templates/socialaccount/provider_list.html
@@ -0,0 +1,22 @@
+{% load allauth socialaccount %}
+{% load i18n %}
+{% get_providers as socialaccount_providers %}
+{% if socialaccount_providers %}
+
+ {% for provider in socialaccount_providers %}
+ {% if provider.id == "openid" %}
+ {% for brand in provider.get_brands %}
+ {% provider_login_url provider openid=brand.openid_url process=process as href %}
+ {% element provider name=brand.name provider_id=provider.id href=href %}
+ {% endelement %}
+ {% endfor %}
+ {% endif %}
+ {% provider_login_url provider process=process scope=scope auth_params=auth_params as href %}
+
+ {% endfor %}
+
+{% endif %}
diff --git a/g3w-admin/usersmanage/vendors/__init__.py b/g3w-admin/usersmanage/vendors/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/g3w-admin/usersmanage/vendors/allauth/__init__.py b/g3w-admin/usersmanage/vendors/allauth/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/g3w-admin/usersmanage/vendors/allauth/adapter.py b/g3w-admin/usersmanage/vendors/allauth/adapter.py
new file mode 100644
index 000000000..241159225
--- /dev/null
+++ b/g3w-admin/usersmanage/vendors/allauth/adapter.py
@@ -0,0 +1,79 @@
+# coding=utf-8
+""""
+.. note:: This program is free software; you can redistribute it and/or modify
+ it under the terms of the Mozilla Public License 2.0.
+
+"""
+
+__author__ = 'lorenzetti@gis3w.it'
+__date__ = '2024-12-17'
+__copyright__ = 'Copyright 2015 - 2024, Gis3w'
+__license__ = 'MPL 2.0'
+
+from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
+from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
+from allauth.account.models import EmailAddress
+from usersmanage.models import User, Group as AuthGroup, Userbackend, USER_BACKEND_DEFAULT
+from usersmanage.configs import G3W_EDITOR1, G3W_EDITOR2, G3W_VIEWER1
+
+import logging
+
+logging = logging.getLogger('g3wadmin.debug')
+
+class G3WSocialAccountAdapter(DefaultSocialAccountAdapter):
+
+ def _set_user_role_backend(self, user):
+ """
+ Set the role and the backend for the user login by social
+ Set up alse the group of user if the settings is set
+ """
+
+ # Role to se from settings
+ role = settings.SOCIALACCOUNT_USER_ROLE \
+ if settings.SOCIALACCOUNT_USER_ROLE in (G3W_EDITOR1, G3W_EDITOR2, G3W_VIEWER1) else G3W_VIEWER1
+
+ AuthGroup.objects.get(name=role).user_set.add(user)
+
+ # Backend
+ if not hasattr(user, 'userbackend'):
+ Userbackend(user=user, backend=USER_BACKEND_DEFAULT).save()
+
+ # Add User group if is set
+ if hasattr(settings, 'SOCIALACCOUNT_USER_GROUP'):
+ try:
+ ugroup = AuthGroup.objects.get(name=settings.SOCIALACCOUNT_USER_GROUP)
+
+ # Test user role group compatibility
+ if role in (G3W_VIEWER1, ) and ugroup.grouprole.role != 'viewer':
+ raise Exception(f"User role {G3W_VIEWER1} not compatible with user group {ugroup}")
+
+ # Assign user to group
+ ugroup.user_set.add(user)
+ except Exception as e:
+ logging.error("[SOCIAL AUTH] Error setting user group: {}".format(e))
+
+
+
+ def pre_social_login(self, request, sociallogin):
+
+ # Social account already exists, so this is just a login
+ if sociallogin.is_existing:
+ return
+
+ # some social logins don't have an email address
+ if not sociallogin.email_addresses:
+ return
+ try:
+ existing_user = User.objects.get(email=sociallogin.email_addresses[0].email)
+ self._set_user_role_backend(existing_user)
+ except ObjectDoesNotExist:
+ return
+
+ # if it does, connect this new social login to the existing user
+ sociallogin.connect(request, existing_user)
+
+ def save_user(self, request, sociallogin, form=None):
+ user = super(G3WSocialAccountAdapter, self).save_user(request, sociallogin, form=form)
+ self._set_user_role_backend(user)
+ return user
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 2ab928343..66015f121 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ django-ordered-model==3.3.0
django-ajax-selects==2.2.0
django-modeltranslation==0.17.5
django-filter
-django-bleach
+django-bleach==3.0.1
pathlib2
lxml
psycopg2-binary
@@ -30,7 +30,7 @@ django-import-export==3.2.0
coverage
urllib3
python-magic
-celery==4.4.7
+celery #==5.0.2
deprecation
huey==2.4.3
redis==4.5.4
@@ -40,3 +40,5 @@ django-recaptcha==3.0.0
pydantic==2.6.3
weasyprint==63.0
distro==1.7.0
+django-allauth[socialaccount]==0.63.6
+