#2035 - migration vers proconnect partie 2 #2161

celineung · 2024-09-09T12:24:55Z

No description provided.

socket-security · 2024-09-09T12:25:32Z

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package	New capabilities	Transitives	Size	Publisher
npm/@codegouvfr/react-dsfr@1.13.2	None	`0`	80.9 MB	garronej

🚮 Removed packages: npm/@codegouvfr/react-dsfr@1.10.11

View full report↗︎

enguerranws · 2024-09-16T14:29:38Z

shared/src/federatedIdentities/federatedIdentity.dto.ts

@@ -7,17 +8,25 @@ export type FederatedIdentityProvider =
 export const federatedIdentityProviders = [
 "inclusionConnect",
 "peConnect",
+ "proConnect",


On ne l'utilise pas finalement, à prévoir en renaming une fois que tout sera migré.

shared/src/errors/errors.ts

enguerranws · 2024-09-16T14:40:54Z

front/src/core-logic/domain/auth/auth.epics.ts

+ return state$.value.auth.federatedIdentityWithUser?.provider ===
+ "peConnect"
+ ? inclusionConnectedGateway.getLogoutUrl$({
+ idToken: "",


Deconnexion de PE Connect à tester

Refacto de cette partie

✅ refacto

...ns/core/authentication/inclusion-connect/use-cases/GetInclusionConnectLogoutUrl.unit.test.ts

.../src/domains/core/authentication/inclusion-connect/use-cases/GetInclusionConnectLogoutUrl.ts

back/src/domains/core/authentication/inclusion-connect/adapters/PgUserRepository.ts

back/src/domains/convention/use-cases/UpdateConventionStatus.ts

back/src/domains/convention/use-cases/GetConvention.ts

github-actions · 2024-09-17T13:27:38Z

Review app:
https://if-dev-front-pr2161.osc-fr1.scalingo.io

- ProConnect HttpClient - handle ProConnect feature flag on business logic and integration tests Co-authored-by: ClementLmd <ClementLmd@users.noreply.github.com>

…repository methods

…n shared

JeromeBu · 2024-09-19T12:15:47Z

back/src/adapters/primary/routers/inclusionConnect/inclusionConnect.e2e.test.ts

+ new AppConfigBuilder({
+ INCLUSION_CONNECT_GATEWAY: "IN_MEMORY",
+ INCLUSION_CONNECT_CLIENT_SECRET: fakeProviderConfig.clientSecret,
+ INCLUSION_CONNECT_CLIENT_ID: fakeProviderConfig.clientId,
+ INCLUSION_CONNECT_BASE_URI: fakeProviderConfig.providerBaseUri,
+ DOMAIN: immersionDomain,


on a pas de tests avec pro connect en e2e ?

JeromeBu · 2024-09-19T12:21:07Z

back/src/config/pg/kysely/model/database.ts

+ external_id_inclusion_connect: string | null;
+ external_id_pro_connect: string | null;


vous preferez pas virer le external ? :

Suggested change

external_id_inclusion_connect: string | null;

external_id_pro_connect: string | null;

inclusion_connect_sub: string | null;

pro_connect_sub: string | null;

JeromeBu · 2024-09-19T12:21:53Z

back/src/config/pg/migrations/1726499943611_pro-connect-external-id.ts

+const newInclusionConnectExternalIdColumnName = "external_id_inclusion_connect";
+const proConnectExternalIdColumnName = "external_id_pro_connect";


idem, pour le nommage

JeromeBu · 2024-09-19T12:22:40Z

back/src/domains/convention/use-cases/GetConvention.ts

+ authPayload,
+ uow,
+ convention,
+ provider: provider,


Suggested change

provider: provider,

provider,

JeromeBu · 2024-09-19T12:22:52Z

back/src/domains/convention/use-cases/GetConvention.ts

+ authPayload,
+ uow,
+ convention,
+ provider: provider,


Suggested change

provider: provider,

provider,

JeromeBu · 2024-09-19T12:36:34Z

...src/domains/core/authentication/inclusion-connect/use-cases/AuthenticateWithInclusionCode.ts

- const existingOngoingOAuth = await uow.ongoingOAuthRepository.findByState(
- params.state,
- "inclusionConnect",
+ const mode = oAuthProviderByFeatureFlags(


Suggested change

const mode = oAuthProviderByFeatureFlags(

const provider = oAuthProviderByFeatureFlags(

JeromeBu · 2024-09-19T12:38:01Z

...src/domains/core/authentication/inclusion-connect/use-cases/AuthenticateWithInclusionCode.ts

+ const toto = this.#makeAuthenticatedUser(
+ this.#uuidGenerator.new(),
+ this.#timeGateway.now(),
+ payload,
+ );
 const newOrUpdatedAuthenticatedUser: User = {
- ...this.#makeAuthenticatedUser(
- this.#uuidGenerator.new(),
- this.#timeGateway.now(),
- icIdTokenPayload,
- ),
+ ...toto,


variable a renommer ou à in line

JeromeBu · 2024-09-19T12:38:45Z

.../src/domains/core/authentication/inclusion-connect/use-cases/GetInclusionConnectLogoutUrl.ts

 ) {
- super();
+ super(uowPerformer);


je crois que c'est pas obligatoire ça....
Une autre option est d'utiliser : createTransactionalUseCase

JeromeBu · 2024-09-19T12:42:10Z

back/src/scripts/seed.ts

+ external_id_inclusion_connect: user.externalId, // Attention ici c'est pour tester le script de mig
+ external_id_pro_connect: null, // Il faudra inverser une fois migré


commentaire toujours utile ?

JeromeBu · 2024-09-19T12:45:17Z

front/src/core-logic/domain/auth/auth.epics.ts

 map((logoutUrl) => {
- navigationGateway.goToUrl(logoutUrl);
+ if (logoutUrl) navigationGateway.goToUrl(logoutUrl);
 return authSlice.actions.loggedOutSuccessfullyFromInclusionConnect();


Suggested change

return authSlice.actions.loggedOutSuccessfullyFromInclusionConnect();

return authSlice.actions.loggedOutSuccessfullyFromProvider();

celineung force-pushed the 2035-migration-vers-proconnect-part2 branch from cfa3df7 to 710bfb3 Compare September 10, 2024 14:59

enguerranws force-pushed the 2035-migration-vers-proconnect-part2 branch from 3b79f91 to e6e054c Compare September 11, 2024 10:19

celineung force-pushed the 2035-migration-vers-proconnect branch from e1fe83d to 8e4b694 Compare September 11, 2024 14:07

celineung force-pushed the 2035-migration-vers-proconnect-part2 branch from e6e054c to 6e67aab Compare September 11, 2024 14:11

enguerranws force-pushed the 2035-migration-vers-proconnect-part2 branch from 6e67aab to 7df3a15 Compare September 12, 2024 09:56

celineung force-pushed the 2035-migration-vers-proconnect branch from 8e4b694 to 0027187 Compare September 16, 2024 12:55

celineung force-pushed the 2035-migration-vers-proconnect-part2 branch 2 times, most recently from a18ddfc to 7f79fd3 Compare September 16, 2024 13:55

celineung changed the base branch from 2035-migration-vers-proconnect to main September 16, 2024 13:57

celineung mentioned this pull request Sep 16, 2024

#2035 - Migration Pro Connect #2101

Closed

enguerranws reviewed Sep 17, 2024

View reviewed changes

enguerranws marked this pull request as ready for review September 17, 2024 13:16

enguerranws had a problem deploying to review-app September 17, 2024 13:16 — with GitHub Actions Error

enguerranws requested a review from JeromeBu September 17, 2024 13:16

enguerranws temporarily deployed to review-app September 17, 2024 13:16 — with GitHub Actions Inactive

enguerranws temporarily deployed to review-app September 17, 2024 13:27 — with GitHub Actions Inactive

celineung had a problem deploying to review-app September 17, 2024 14:39 — with GitHub Actions Error

bbohec and others added 11 commits September 17, 2024 16:40

add enableProConnect feature flag

c9938fa

move oauth login/logout implem at gateway level

721177d

- InclusionConnectGateway renamed to OAuthGateway

7fc2f91

- ProConnect HttpClient - handle ProConnect feature flag on business logic and integration tests Co-authored-by: ClementLmd <ClementLmd@users.noreply.github.com>

PgUserRepository with both inclusion/pro connect columns

3dda255

fix back business logic

75023cf

update business logic in order to provide OAuthGateway mode for user …

1e7408f

…repository methods

InclusionConnectButton to OAuthButton with mode pro/inclusion

d9c0109

rename migration files

880b723

apply check after rebase

c9b3a6e

call pro connect /authorize endpoint

36901ef

authenticate with pro connect

27d095f

celineung and others added 16 commits September 17, 2024 16:40

fix after rebase

a803e63

add idToken in localStorage to prepare logout

c62449d

wip: add query params for logout pro connect

d059095

wip: logout with propers params returns a 500

d85fd51

update react-dsfr@1.13.2, use ProConnectButton, oauth provider type i…

8a30be5

…n shared

changed logout url, login / logout flow with ProConnect is working

e62ea53

add type on feature flags

b277435

remove proConnect as provider in localStorage (it will be done later)

b449811

rename mode -> provider

7aa087a

fix typo

8301a09

throw error if attempt to logout when user is not logged in

a0edba5

rename mode -> provider

41e6851

fix migration order

bdd4dc3

remove comment

893adc0

move ProConnectLogoutQueryParams in proConnect.routes.ts

2ac352b

refacto: rename variables and types

047a5a1

celineung force-pushed the 2035-migration-vers-proconnect-part2 branch from 8ddb106 to 047a5a1 Compare September 17, 2024 14:40

celineung had a problem deploying to review-app September 17, 2024 14:41 — with GitHub Actions Failure

JeromeBu reviewed Sep 19, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#2035 - migration vers proconnect partie 2 #2161

#2035 - migration vers proconnect partie 2 #2161

celineung commented Sep 9, 2024

socket-security bot commented Sep 9, 2024 •

edited

Loading

enguerranws Sep 16, 2024

enguerranws Sep 16, 2024

enguerranws Sep 16, 2024

celineung Sep 17, 2024

github-actions bot commented Sep 17, 2024

JeromeBu Sep 19, 2024

JeromeBu Sep 19, 2024

JeromeBu Sep 19, 2024

JeromeBu Sep 19, 2024

JeromeBu Sep 19, 2024

JeromeBu Sep 19, 2024

JeromeBu Sep 19, 2024

celineung Sep 19, 2024

JeromeBu Sep 19, 2024

JeromeBu Sep 19, 2024

JeromeBu Sep 19, 2024

		external_id_inclusion_connect: string \| null;
		external_id_pro_connect: string \| null;

		const newInclusionConnectExternalIdColumnName = "external_id_inclusion_connect";
		const proConnectExternalIdColumnName = "external_id_pro_connect";

	const mode = oAuthProviderByFeatureFlags(
	const provider = oAuthProviderByFeatureFlags(

		external_id_inclusion_connect: user.externalId, // Attention ici c'est pour tester le script de mig
		external_id_pro_connect: null, // Il faudra inverser une fois migré

	return authSlice.actions.loggedOutSuccessfullyFromInclusionConnect();
	return authSlice.actions.loggedOutSuccessfullyFromProvider();

#2035 - migration vers proconnect partie 2 #2161

Are you sure you want to change the base?

#2035 - migration vers proconnect partie 2 #2161

Conversation

celineung commented Sep 9, 2024

socket-security bot commented Sep 9, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Sep 17, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

socket-security bot commented Sep 9, 2024 •

edited

Loading