Skip to content

Commit

Permalink
build(deps): bump django-allauth from 0.61.1 to 0.63.6 (#12421)
Browse files Browse the repository at this point in the history
* build(deps): bump django-allauth from 0.61.1 to 0.63.6

Bumps [django-allauth](https://github.com/pennersr/django-allauth) from 0.61.1 to 0.63.6.
- [Changelog](https://github.com/pennersr/django-allauth/blob/main/ChangeLog.rst)
- [Commits](pennersr/django-allauth@0.61.1...0.63.6)

---
updated-dependencies:
- dependency-name: django-allauth
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update setup.cfg

* fix dependencies. defused is no longer required in django-allauth

* Adapt to updated Oauth2Provider signatures

* adapt to update allauth provider

* fix formatting

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giovanni Allegri <[email protected]>
Co-authored-by: Mattia <[email protected]>
  • Loading branch information
3 people authored Jul 15, 2024
1 parent 0c827f5 commit 4b6d872
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
from allauth.socialaccount.providers.base import AuthAction, ProviderAccount
from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider

from geonode.people.adapters import GenericOpenIDConnectAdapter

PROVIDER_ID = getattr(settings, "SOCIALACCOUNT_OIDC_PROVIDER", "geonode_openid_connect")


Expand All @@ -50,13 +52,14 @@ class GenericOpenIDConnectProvider(OAuth2Provider):
"geonode.people.socialaccount.providers.geonode_openid_connect.provider.GenericOpenIDConnectProviderAccount",
)
)
oauth2_adapter_class = GenericOpenIDConnectAdapter

def get_default_scope(self):
scope = getattr(settings, "SOCIALACCOUNT_PROVIDERS", {}).get(PROVIDER_ID, {}).get("SCOPE", "")
return scope

def get_auth_params(self, request, action):
ret = super(GenericOpenIDConnectProvider, self).get_auth_params(request, action)
def get_auth_params_from_request(self, request, action):
ret = super(GenericOpenIDConnectProvider, self).get_auth_params_from_request(request, action)
if action == AuthAction.REAUTHENTICATE:
ret["prompt"] = (
getattr(settings, "SOCIALACCOUNT_PROVIDERS", {})
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ schema==0.7.7
rdflib==6.3.2
smart_open==7.0.4
PyMuPDF==1.24.3
defusedxml==0.7.1

# Django Apps
django-allauth==0.61.1
django-allauth==0.63.6
django-appconf==1.0.6
django-celery-results==2.5.1
django-filter==24.2
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@ install_requires =
rdflib==6.3.2
smart_open==7.0.4
PyMuPDF==1.24.3
defusedxml==0.7.1

# Django Apps
django-allauth==0.61.1
django-allauth==0.63.6
django-appconf==1.0.6
django-celery-results==2.5.1
django-filter==24.2
Expand Down

0 comments on commit 4b6d872

Please sign in to comment.