Skip to content

Commit 676bd50

Browse files
douglasduteildouglasduteil
committed
Merge branch 'main' into douglasduteil/chore-rename-gouvfr-lasuite-to-proconnect-gouv
2 parents 1855820 + 6d7ab12 commit 676bd50

File tree

55 files changed

+6424
-1768
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+6424
-1768
lines changed

‎.env.development‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ DATABASE_URL=postgres://proconnect-identite:proconnect-identite@127.0.0.1:5432/p
22
FRANCECONNECT_ISSUER=http://localhost:3000/___testing___/oidc.franceconnect.gouv.fr/api/v2
33
NODE_TLS_REJECT_UNAUTHORIZED=0 # from https://github.com/maildev/maildev?tab=readme-ov-file#configure-your-project
44
SMTP_URL=smtp://localhost:1025
5+
SYMMETRIC_ENCRYPTION_KEY=aTrueRandom32BytesLongBase64EncodedStringAA=

‎.github/workflows/tsdoc.yml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎assets/js/app.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import "@gouvfr/dsfr/dist/component/header/header.module";
2-
import "@gouvfr/dsfr/dist/component/modal/modal.module";
3-
import "@gouvfr/dsfr/dist/component/navigation/navigation.module";
41
import "@gouvfr/dsfr/dist/core/core.module";
2+
import "@gouvfr/dsfr/dist/component/navigation/navigation.module";
3+
import "@gouvfr/dsfr/dist/component/modal/modal.module";
4+
import "@gouvfr/dsfr/dist/component/header/header.module";
55
import { disableFormsOnSubmit } from "./modules/disable-on-submit";
66
import "./modules/load-bar";
77
import {

‎cypress/e2e/activate_totp/fixtures.sql‎

Lines changed: 59 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,66 @@
1-
INSERT INTO users
2-
(id, email, email_verified, email_verified_at, encrypted_password, created_at, updated_at, given_name, family_name, phone_number, job, force_2fa)
1+
INSERT INTO
2+
users (
3+
id,
4+
email,
5+
email_verified,
6+
email_verified_at,
7+
encrypted_password,
8+
created_at,
9+
updated_at,
10+
given_name,
11+
family_name,
12+
phone_number,
13+
job,
14+
force_2fa
15+
)
316
VALUES
4-
(1, 'lion.eljonson@darkangels.world', true, CURRENT_TIMESTAMP, '$2a$10$kzY3LINL6..50Fy9shWCcuNlRfYq0ft5lS.KCcJ5PzrhlWfKK4NIO', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Lion', 'El''Jonson', 'I', 'Primarque', false),
5-
(2, 'unused1@yopmail.com', true, CURRENT_TIMESTAMP, '$2a$10$kzY3LINL6..50Fy9shWCcuNlRfYq0ft5lS.KCcJ5PzrhlWfKK4NIO', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Raphapha', 'Dubibi', '0123456789', 'Sbire', false);
17+
(
18+
1,
19+
'lion.eljonson@darkangels.world',
20+
true,
21+
CURRENT_TIMESTAMP,
22+
'$2a$10$kzY3LINL6..50Fy9shWCcuNlRfYq0ft5lS.KCcJ5PzrhlWfKK4NIO',
23+
CURRENT_TIMESTAMP,
24+
CURRENT_TIMESTAMP,
25+
'Lion',
26+
'El''Jonson',
27+
'I',
28+
'Primarque',
29+
false
30+
),
31+
(
32+
2,
33+
'unused1@yopmail.com',
34+
true,
35+
CURRENT_TIMESTAMP,
36+
'$2a$10$kzY3LINL6..50Fy9shWCcuNlRfYq0ft5lS.KCcJ5PzrhlWfKK4NIO',
37+
CURRENT_TIMESTAMP,
38+
CURRENT_TIMESTAMP,
39+
'Raphapha',
40+
'Dubibi',
41+
'0123456789',
42+
'Sbire',
43+
false
44+
);
645

7-
INSERT INTO organizations
8-
(id, siret, created_at, updated_at)
46+
INSERT INTO
47+
organizations (id, siret, created_at, updated_at)
948
VALUES
10-
(1, '21340126800130', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
49+
(
50+
1,
51+
'21340126800130',
52+
CURRENT_TIMESTAMP,
53+
CURRENT_TIMESTAMP
54+
);
1155

12-
INSERT INTO users_organizations
13-
(user_id, organization_id, is_external, verification_type, has_been_greeted)
56+
INSERT INTO
57+
users_organizations (
58+
user_id,
59+
organization_id,
60+
is_external,
61+
verification_type,
62+
has_been_greeted
63+
)
1464
VALUES
1565
(1, 1, false, 'verified_email_domain', true),
1666
(2, 1, false, 'verified_email_domain', true);

‎cypress/e2e/broken_standard_client/fixtures.sql‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,47 @@
1-
2-
INSERT INTO oidc_clients
3-
(client_name, client_id, client_secret, redirect_uris,
4-
post_logout_redirect_uris, scope, client_uri, client_description,
5-
userinfo_signed_response_alg, id_token_signed_response_alg,
6-
authorization_signed_response_alg, introspection_signed_response_alg,
7-
is_proconnect_federation)
1+
INSERT INTO
2+
oidc_clients (
3+
client_name,
4+
client_id,
5+
client_secret,
6+
redirect_uris,
7+
post_logout_redirect_uris,
8+
scope,
9+
client_uri,
10+
client_description,
11+
userinfo_signed_response_alg,
12+
id_token_signed_response_alg,
13+
authorization_signed_response_alg,
14+
introspection_signed_response_alg,
15+
is_proconnect_federation
16+
)
817
VALUES
918
(
1019
'ProConnect Federation',
1120
'proconnect_federation_client_id',
1221
'proconnect_federation_client_secret',
13-
ARRAY [
14-
'http://localhost:4001/login-callback'
15-
],
16-
ARRAY []::varchar[],
22+
ARRAY['http://localhost:4001/login-callback'],
23+
ARRAY[]::varchar[],
1724
'openid uid given_name usual_name email phone siret is_service_public is_public_service',
1825
'http://localhost:4001/',
1926
'Dispositif d’identification des agents de la fonction publique.',
20-
'ES256', 'ES256', 'ES256', 'ES256',
27+
'ES256',
28+
'ES256',
29+
'ES256',
30+
'ES256',
2131
true
2232
),
2333
(
2434
'Broken URL',
2535
'standard_client_id',
2636
'standard_client_secret',
27-
ARRAY [
28-
'0/login-callback'
29-
],
30-
ARRAY []::varchar[],
37+
ARRAY['0/login-callback'],
38+
ARRAY[]::varchar[],
3139
'openid email profile organization',
3240
'http://localhost:4000/',
3341
'ProConnect test client. More info: https://github.com/proconnect-gouv/proconnect-test-client.',
34-
null, null, null, null,
42+
null,
43+
null,
44+
null,
45+
null,
3546
false
36-
);
47+
);

‎cypress/e2e/check_email_deliverability/fixtures.sql‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
1-
INSERT INTO oidc_clients
2-
(client_name, client_id, client_secret, redirect_uris,
3-
post_logout_redirect_uris, scope, client_uri, client_description,
4-
userinfo_signed_response_alg, id_token_signed_response_alg,
5-
authorization_signed_response_alg, introspection_signed_response_alg)
1+
INSERT INTO
2+
oidc_clients (
3+
client_name,
4+
client_id,
5+
client_secret,
6+
redirect_uris,
7+
post_logout_redirect_uris,
8+
scope,
9+
client_uri,
10+
client_description,
11+
userinfo_signed_response_alg,
12+
id_token_signed_response_alg,
13+
authorization_signed_response_alg,
14+
introspection_signed_response_alg
15+
)
616
VALUES
717
(
818
'ProConnect Federation',
919
'proconnect_federation_client_id',
1020
'proconnect_federation_client_secret',
11-
ARRAY [
12-
'http://localhost:4001/login-callback'
13-
],
14-
ARRAY []::varchar[],
21+
ARRAY['http://localhost:4001/login-callback'],
22+
ARRAY[]::varchar[],
1523
'openid uid given_name usual_name email phone siret is_service_public is_public_service',
1624
'http://localhost:4001/',
1725
'Dispositif d’identification des agents de la fonction publique.',
18-
'ES256', 'ES256', 'ES256', 'ES256');
26+
'ES256',
27+
'ES256',
28+
'ES256',
29+
'ES256'
30+
);

‎cypress/e2e/connect_franceconnect_account/fixtures.sql‎

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,49 @@
1-
INSERT INTO users
2-
(id, email, email_verified, email_verified_at, encrypted_password, created_at, updated_at, given_name, family_name,
3-
phone_number, job)
1+
INSERT INTO
2+
users (
3+
id,
4+
email,
5+
email_verified,
6+
email_verified_at,
7+
encrypted_password,
8+
created_at,
9+
updated_at,
10+
given_name,
11+
family_name,
12+
phone_number,
13+
job
14+
)
415
VALUES
5-
(1, 'god-emperor@mankind.world', true, CURRENT_TIMESTAMP, '$2a$10$kzY3LINL6..50Fy9shWCcuNlRfYq0ft5lS.KCcJ5PzrhlWfKK4NIO', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'God', 'Emperor', '9999999999', 'God Emperor')
6-
;
16+
(
17+
1,
18+
'god-emperor@mankind.world',
19+
true,
20+
CURRENT_TIMESTAMP,
21+
'$2a$10$kzY3LINL6..50Fy9shWCcuNlRfYq0ft5lS.KCcJ5PzrhlWfKK4NIO',
22+
CURRENT_TIMESTAMP,
23+
CURRENT_TIMESTAMP,
24+
'God',
25+
'Emperor',
26+
'9999999999',
27+
'God Emperor'
28+
);
729

8-
INSERT INTO organizations
9-
(id, siret, created_at, updated_at)
30+
INSERT INTO
31+
organizations (id, siret, created_at, updated_at)
1032
VALUES
11-
(1, '21340126800130', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
33+
(
34+
1,
35+
'21340126800130',
36+
CURRENT_TIMESTAMP,
37+
CURRENT_TIMESTAMP
38+
);
1239

13-
INSERT INTO users_organizations
14-
(user_id, organization_id, is_external, verification_type, has_been_greeted)
40+
INSERT INTO
41+
users_organizations (
42+
user_id,
43+
organization_id,
44+
is_external,
45+
verification_type,
46+
has_been_greeted
47+
)
1548
VALUES
1649
(1, 1, false, 'verified_email_domain', true);

‎cypress/e2e/delete_account/fixtures.sql‎

Lines changed: 56 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,63 @@
1-
INSERT INTO users
2-
(id, email, email_verified, email_verified_at, encrypted_password, created_at, updated_at, given_name, family_name,
3-
phone_number, job)
1+
INSERT INTO
2+
users (
3+
id,
4+
email,
5+
email_verified,
6+
email_verified_at,
7+
encrypted_password,
8+
created_at,
9+
updated_at,
10+
given_name,
11+
family_name,
12+
phone_number,
13+
job
14+
)
415
VALUES
5-
(1, 'lion.eljonson@darkangels.world', true, CURRENT_TIMESTAMP, '$2a$10$kzY3LINL6..50Fy9shWCcuNlRfYq0ft5lS.KCcJ5PzrhlWfKK4NIO', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Rebibi', 'Dumama', '0123456789', 'Sbirette'),
6-
(2, 'franceconnected+jean@bon.com', true, CURRENT_TIMESTAMP, '$2a$10$kzY3LINL6..50Fy9shWCcuNlRfYq0ft5lS.KCcJ5PzrhlWfKK4NIO', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Jean', 'Bon', '0123456789', 'Sbirette');
16+
(
17+
1,
18+
'lion.eljonson@darkangels.world',
19+
true,
20+
CURRENT_TIMESTAMP,
21+
'$2a$10$kzY3LINL6..50Fy9shWCcuNlRfYq0ft5lS.KCcJ5PzrhlWfKK4NIO',
22+
CURRENT_TIMESTAMP,
23+
CURRENT_TIMESTAMP,
24+
'Rebibi',
25+
'Dumama',
26+
'0123456789',
27+
'Sbirette'
28+
),
29+
(
30+
2,
31+
'franceconnected+jean@bon.com',
32+
true,
33+
CURRENT_TIMESTAMP,
34+
'$2a$10$kzY3LINL6..50Fy9shWCcuNlRfYq0ft5lS.KCcJ5PzrhlWfKK4NIO',
35+
CURRENT_TIMESTAMP,
36+
CURRENT_TIMESTAMP,
37+
'Jean',
38+
'Bon',
39+
'0123456789',
40+
'Sbirette'
41+
);
742

8-
INSERT INTO organizations
9-
(id, siret, created_at, updated_at)
43+
INSERT INTO
44+
organizations (id, siret, created_at, updated_at)
1045
VALUES
11-
(1, '21340126800130', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
46+
(
47+
1,
48+
'21340126800130',
49+
CURRENT_TIMESTAMP,
50+
CURRENT_TIMESTAMP
51+
);
1252

13-
INSERT INTO users_organizations
14-
(user_id, organization_id, is_external, verification_type, has_been_greeted)
53+
INSERT INTO
54+
users_organizations (
55+
user_id,
56+
organization_id,
57+
is_external,
58+
verification_type,
59+
has_been_greeted
60+
)
1561
VALUES
1662
(1, 1, false, 'verified_email_domain', true),
1763
(2, 1, false, 'verified_email_domain', true);

‎cypress/e2e/delete_totp/env.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYMMETRIC_ENCRYPTION_KEY=aTrueRandom32BytesLongBase64EncodedStringAA=

0 commit comments

Comments
 (0)