From b1461ac478995b5d4ec3f11d98464e09253aecbc Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 27 May 2021 14:33:06 +0200 Subject: [PATCH 09/12] to fixup: rename franceconnect to franceconnect-data --- .../apps/{franceconnect => franceconnect_data}/__init__.py | 0 passerelle/apps/{franceconnect => franceconnect_data}/fc.py | 0 .../migrations/0001_initial.py | 0 .../migrations/__init__.py | 0 passerelle/apps/{franceconnect => franceconnect_data}/models.py | 2 +- .../templates/franceconnect_data}/callback.html | 0 .../templates/franceconnect_data}/demo.html | 0 .../templates/franceconnect_data}/resource_detail.html | 2 +- passerelle/settings.py | 2 +- 9 files changed, 3 insertions(+), 3 deletions(-) rename passerelle/apps/{franceconnect => franceconnect_data}/__init__.py (100%) rename passerelle/apps/{franceconnect => franceconnect_data}/fc.py (100%) rename passerelle/apps/{franceconnect => franceconnect_data}/migrations/0001_initial.py (100%) rename passerelle/apps/{franceconnect => franceconnect_data}/migrations/__init__.py (100%) rename passerelle/apps/{franceconnect => franceconnect_data}/models.py (99%) rename passerelle/apps/{franceconnect/templates/franceconnect => franceconnect_data/templates/franceconnect_data}/callback.html (100%) rename passerelle/apps/{franceconnect/templates/franceconnect => franceconnect_data/templates/franceconnect_data}/demo.html (100%) rename passerelle/apps/{franceconnect/templates/franceconnect => franceconnect_data/templates/franceconnect_data}/resource_detail.html (73%) diff --git a/passerelle/apps/franceconnect/__init__.py b/passerelle/apps/franceconnect_data/__init__.py similarity index 100% rename from passerelle/apps/franceconnect/__init__.py rename to passerelle/apps/franceconnect_data/__init__.py diff --git a/passerelle/apps/franceconnect/fc.py b/passerelle/apps/franceconnect_data/fc.py similarity index 100% rename from passerelle/apps/franceconnect/fc.py rename to passerelle/apps/franceconnect_data/fc.py diff --git a/passerelle/apps/franceconnect/migrations/0001_initial.py b/passerelle/apps/franceconnect_data/migrations/0001_initial.py similarity index 100% rename from passerelle/apps/franceconnect/migrations/0001_initial.py rename to passerelle/apps/franceconnect_data/migrations/0001_initial.py diff --git a/passerelle/apps/franceconnect/migrations/__init__.py b/passerelle/apps/franceconnect_data/migrations/__init__.py similarity index 100% rename from passerelle/apps/franceconnect/migrations/__init__.py rename to passerelle/apps/franceconnect_data/migrations/__init__.py diff --git a/passerelle/apps/franceconnect/models.py b/passerelle/apps/franceconnect_data/models.py similarity index 99% rename from passerelle/apps/franceconnect/models.py rename to passerelle/apps/franceconnect_data/models.py index f64946de..fd618107 100644 --- a/passerelle/apps/franceconnect/models.py +++ b/passerelle/apps/franceconnect_data/models.py @@ -199,7 +199,7 @@ class Resource(BaseResource): context['data'] = {'id': self.store(token), 'text': token['text']} except fc.FranceConnectError as e: context['error'] = e - return TemplateResponse(request, 'franceconnect/callback.html', context=context) + return TemplateResponse(request, 'franceconnect_data/callback.html', context=context) @endpoint( description=_('Demo page (to check your configuration)'), diff --git a/passerelle/apps/franceconnect/templates/franceconnect/callback.html b/passerelle/apps/franceconnect_data/templates/franceconnect_data/callback.html similarity index 100% rename from passerelle/apps/franceconnect/templates/franceconnect/callback.html rename to passerelle/apps/franceconnect_data/templates/franceconnect_data/callback.html diff --git a/passerelle/apps/franceconnect/templates/franceconnect/demo.html b/passerelle/apps/franceconnect_data/templates/franceconnect_data/demo.html similarity index 100% rename from passerelle/apps/franceconnect/templates/franceconnect/demo.html rename to passerelle/apps/franceconnect_data/templates/franceconnect_data/demo.html diff --git a/passerelle/apps/franceconnect/templates/franceconnect/resource_detail.html b/passerelle/apps/franceconnect_data/templates/franceconnect_data/resource_detail.html similarity index 73% rename from passerelle/apps/franceconnect/templates/franceconnect/resource_detail.html rename to passerelle/apps/franceconnect_data/templates/franceconnect_data/resource_detail.html index 7a227e3d..eac77859 100644 --- a/passerelle/apps/franceconnect/templates/franceconnect/resource_detail.html +++ b/passerelle/apps/franceconnect_data/templates/franceconnect_data/resource_detail.html @@ -3,6 +3,6 @@ {% block description %} {{ block.super }} -{% url "generic-endpoint" connector="franceconnect" slug=object.slug endpoint="callback" as callback_url %} +{% url "generic-endpoint" connector="franceconnect-data" slug=object.slug endpoint="callback" as callback_url %}

URL de callback pour FranceConnect: {{ request.scheme }}://{{ request.get_host }}{{ callback_url }}

{% endblock %} diff --git a/passerelle/settings.py b/passerelle/settings.py index 0c136948..3750c8f0 100644 --- a/passerelle/settings.py +++ b/passerelle/settings.py @@ -141,7 +141,7 @@ INSTALLED_APPS = ( 'passerelle.apps.esirius', 'passerelle.apps.family', 'passerelle.apps.feeds', - 'passerelle.apps.franceconnect', + 'passerelle.apps.franceconnect_data', 'passerelle.apps.gdc', 'passerelle.apps.gesbac', 'passerelle.apps.jsondatastore', -- 2.32.0.rc0