Skip to content
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

Connexion: Suppression du code de connexion via Inclusion Connect #5443

Merged
merged 3 commits into from
Jan 24, 2025
Merged

Connexion: Suppression du code de connexion via Inclusion Connect #5443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e35b563
inclusion_connect: Remove everything except app
tonial Jan 23, 2025
e1ec852
pro_connect: Refactor templates
tonial Jan 24, 2025
f74c1fc
pro_connect: Display demo accounts link when available
tonial Jan 23, 2025
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
6 changes: 1 addition & 5 deletions config/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,10 +417,6 @@
FRANCE_CONNECT_CLIENT_ID = os.getenv("FRANCE_CONNECT_CLIENT_ID")
FRANCE_CONNECT_CLIENT_SECRET = os.getenv("FRANCE_CONNECT_CLIENT_SECRET")

INCLUSION_CONNECT_BASE_URL = os.getenv("INCLUSION_CONNECT_BASE_URL")
INCLUSION_CONNECT_CLIENT_ID = os.getenv("INCLUSION_CONNECT_CLIENT_ID")
INCLUSION_CONNECT_CLIENT_SECRET = os.getenv("INCLUSION_CONNECT_CLIENT_SECRET")

PRO_CONNECT_BASE_URL = os.getenv("PRO_CONNECT_BASE_URL")
PRO_CONNECT_CLIENT_ID = os.getenv("PRO_CONNECT_CLIENT_ID")
PRO_CONNECT_CLIENT_SECRET = os.getenv("PRO_CONNECT_CLIENT_SECRET")
Expand Down Expand Up @@ -698,7 +694,7 @@

AIRFLOW_BASE_URL = os.getenv("AIRFLOW_BASE_URL")

FORCE_IC_LOGIN = True
FORCE_PROCONNECT_LOGIN = True

C4_TOKEN = os.getenv("C4_TOKEN", None)

Expand Down
2 changes: 1 addition & 1 deletion config/settings/dev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
METABASE_PASSWORD = os.getenv("METABASE_PASSWORD", os.getenv("PGPASSWORD", "password")) # noqa: F405
METABASE_DATABASE = os.getenv("METABASE_DATABASE", os.getenv("PGDATABASE", "metabase")) # noqa: F405

FORCE_IC_LOGIN = os.getenv("FORCE_IC_LOGIN", "True") == "True"
FORCE_PROCONNECT_LOGIN = os.getenv("FORCE_PROCONNECT_LOGIN", "True") == "True"

AWS_STORAGE_BUCKET_NAME = "dev"
CSP_IMG_SRC.append(f"{AWS_S3_ENDPOINT_URL}{AWS_STORAGE_BUCKET_NAME}/news-images/") # noqa: F405
Expand Down
2 changes: 0 additions & 2 deletions config/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@
path("pe_connect/", include("itou.openid_connect.pe_connect.urls")),
# FranceConnect URLs.
path("franceconnect/", include("itou.openid_connect.france_connect.urls")),
# Inclusion Connect URLs.
path("inclusion_connect/", include("itou.openid_connect.inclusion_connect.urls")),
# ProConnect URLs.
path("pro_connect/", include("itou.openid_connect.pro_connect.urls")),
# --------------------------------------------------------------------------------------
Expand Down
5 changes: 2 additions & 3 deletions docs/environment.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,10 @@ export CLEVER_SECRET=VOTRE_SECRET

### Inclusion Connect

`FORCE_IC_LOGIN` : Obliger les employeurs et prescripteurs à utiliser
[Inclusion Connect](https://github.com/gip-inclusion/inclusion-connect).
`FORCE_PROCONNECT_LOGIN` : Obliger les employeurs et prescripteurs à utiliser ProConnect

D’autres variables d’environnement permettent de configurer la connexion avec
Inclusion Connect, elles sont préfixées par `INCLUSION_CONNECT_`.
ProConnect, elles sont préfixées par `PRO_CONNECT_`.

#### Mailjet

Expand Down
30 changes: 15 additions & 15 deletions itou/fixtures/django/05_test_users.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": true,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -135,7 +135,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": true,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -174,7 +174,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": false,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -213,7 +213,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": true,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -252,7 +252,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": false,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -330,7 +330,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": true,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -369,7 +369,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": false,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -408,7 +408,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": false,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -447,7 +447,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": false,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -486,7 +486,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": false,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -525,7 +525,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": true,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -603,7 +603,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": true,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -876,7 +876,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": true,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -993,7 +993,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": true,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down Expand Up @@ -1032,7 +1032,7 @@
"geocoding_updated_at": null,
"groups": [],
"has_completed_welcoming_tour": true,
"identity_provider": "IC",
"identity_provider": "PC",
"insee_city": null,
"is_active": true,
"is_staff": false,
Expand Down
22 changes: 0 additions & 22 deletions itou/openid_connect/inclusion_connect/constants.py
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions itou/openid_connect/inclusion_connect/enums.py
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions itou/openid_connect/inclusion_connect/migrations/0002_delete_inclusionconnectstate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Generated by Django 5.1.5 on 2025-01-23 08:17

from django.db import migrations


class Migration(migrations.Migration):
dependencies = [
("inclusion_connect", "0001_initial"),
]

operations = [
migrations.DeleteModel(
name="InclusionConnectState",
),
]
45 changes: 0 additions & 45 deletions itou/openid_connect/inclusion_connect/models.py
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions itou/openid_connect/inclusion_connect/urls.py
View file
Open in desktop

This file was deleted.

Loading
Loading