Skip to content

[Fixes #12167] providing multiple openid_connect django.allauth socialproviders fails when loading login page #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mwallschlaeger merged 1 commit into from
Apr 23, 2024
Merged

[Fixes #12167] providing multiple openid_connect django.allauth socialproviders fails when loading login page #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions geonode/people/adapters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,7 @@ def get_provider(self, request=None, provider=None):
provider = provider or self.provider_id
provider_class = registry.get_class(provider)
if provider_class is None or provider_class.uses_apps:
# check if first app provider contains client_id, mutiple apps in a single provider
# get seperated into multiple providers, an this function gets called multiple times
# https://github.com/pennersr/django-allauth/blob/main/docs/socialaccount/providers/openid_connect.rst
if not self.list_apps(request)[0].client_id:
raise (ImproperlyConfigured(f"Missing client_id parameter in provider: {provider} configuration"))
app = self.get_app(request, provider=provider, client_id=self.list_apps(request)[0].client_id)
app = self.get_app(request, provider=provider)
if not provider_class:
# In this case, the `provider` argument passed was a
# `provider_id`.
Expand Down
4 changes: 2 additions & 2 deletions geonode/templates/socialaccount/snippets/provider_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
{% for provider in socialaccount_providers %}
{% if provider.id == "openid" %}
{% for brand in provider.get_brands %}
<a class="list-group-item" title="{{brand.name}}" href="{% provider_login_url provider.id openid=brand.openid_url process=process %}">
<a class="list-group-item" title="{{brand.name}}" href="{% provider_login_url provider openid=brand.openid_url process=process %}">
{{brand.name}}
</a>
{% endfor %}
{% endif %}
<div class="form-group">
<a class="btn btn-default btn-block" title="{{provider.name}}" href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}">
<a class="btn btn-default btn-block" title="{{provider.name}}" href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
<i class="fa fa-{{ provider.name|lower }}-square fa-2x" aria-hidden="true"></i>
{% if process == "login" %}
{% trans "Sign in with" %}
Expand Down
4 changes: 2 additions & 2 deletions geonode/templates/socialaccount/snippets/remaining_providers_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
{% for provider in other_providers %}
{% if provider.id == "openid" %}
{% for brand in provider.get_brands %}
<a class="list-group-item" title="{{brand.name}}" href="{% provider_login_url provider.id openid=brand.openid_url process=process %}">
<a class="list-group-item" title="{{brand.name}}" href="{% provider_login_url provider openid=brand.openid_url process=process %}">
{{brand.name}}
</a>
{% endfor %}
{% endif %}
<div class="form-group">
<a class="btn btn-default btn-block" title="{{provider.name}}" href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}">
<a class="btn btn-default btn-block" title="{{provider.name}}" href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
<i class="fa fa-{{ provider.name|lower }}-square fa-2x" aria-hidden="true"></i>
{% if process == "login" %}
{% trans "Sign in with" %}
Expand Down