refactor(admin-token): migrate from server by shikanime · Pull Request #2740 · cloud-pi-native/console

shikanime · 2026-09-17T09:59:38Z

Issues liées

Refs #1889

Quel est le comportement actuel ?

Les routes admin-tokens (/api/v1/admin/tokens) sont servies par l'ancienne application Fastify apps/server.

Quel est le nouveau comportement ?

Migration du module admin-token vers apps/server-nestjs :

AdminTokenController (UserGuard), AdminTokenService, AdminTokenModule enregistré dans main.module.ts.
CreateAdminTokenBodySchema : CoerceBooleanSchema sur withRevoked, ExpirationDateSchema réutilisant isAtLeastTomorrow de @cpn-console/shared.
admin-token-queries.utils.ts : sélections Prisma typées.
Parité des contrats et codes HTTP contre apps/server/src/resources/admin-token/ (rejet 400 « Date d'expiration trop courte », hash SHA-256 unsalted inchangé).

Cette PR introduit-elle un breaking change ?

Non.

Autres informations

Recréée pour #1889 (remplace #2442, non réouvrable après suppression de branche).

shikanime · 2026-09-17T15:13:34Z

apps/server-nestjs/src/main.module.ts:L28 🟡 risk: AdminTokenModule jamais importé dans MainModule → la route /api/v1/admin/tokens n'est jamais servie par Nest (fallback legacy). Ajouter l'import à la bascule, sinon la migration est morte-code.

shikanime · 2026-09-17T15:51:19Z

Traité dans 314416c : module câblé dans MainModule.

github-actions · 2026-09-18T08:33:20Z

🤖 Hey !

A preview of the application is available at : https://console-pr-2740.dso.cpin-hp.numerique-interieur.fr

Please be patient, deployment may take a few minutes.

shikanime

Verdict : Changements demandés

Migration fidèle du module admin-token : parité des contrats, codes HTTP et du hash SHA-256 vérifiée contre apps/server, aucune régression du pont événements → hooks (aucun hook.adminToken en amont). Point positif : les sélections Prisma typées via satisfies garantissent l'omission du hash à la source. Un seul point bloquant : la PR désenregistre AdminRoleModule de main.module.ts, ce qui ne fait pas partie de son périmètre.

Rebase #2740 onto pr/cluster-migration (#2495): keep both module registrations in main.module.ts. Signed-off-by: Shikanime Deva <22115108+shikanime@users.noreply.github.com>

#2740 rebases onto this branch; pre-register its module so the stack rebases cleanly. Signed-off-by: Shikanime Deva <22115108+shikanime@users.noreply.github.com>

… of contract alias Co-authored-by: Automata <automata@shikanime.studio>

Co-authored-by: Automata <automata@shikanime.studio>

…ce boundary Co-authored-by: Automata <automata@shikanime.studio>

Co-authored-by: Automata <automata@shikanime.studio>

…turnType aliases Co-authored-by: Automata <automata@shikanime.studio>

Co-authored-by: Automata <automata@shikanime.studio>

Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I1d8ffcb80aa787018dc4e8008ab5a84f6a6a6964

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I957c9bb79f59855521fc4cb69964dbaa6a6a6964

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Ie45ff1996f70edc312ba938d388016c96a6a6964

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I42726b788f39dbe4c6f660cb57af3c206a6a6964

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Ib0b6d8746627891c22f62875b8c2f75d6a6a6964

… site Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Ib08a0f1a001be5d0eb788b91210f81bb6a6a6964

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I17ff50ee3a67efcccaa275508067c3ac6a6a6964

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Iafe340dd1f247a0a221e39ff4c26bc946a6a6964

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I70793bd5f8f6d1991c97aa7a1e4f5bcd6a6a6964

Co-authored-by: Automata <automata@shikanime.studio>

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Ic276ad1c4e15fe04cb6f24ed522ca6b96a6a6964

…tial Co-authored-by: Automata <automata@shikanime.studio>

Co-authored-by: Automata <automata@shikanime.studio>

cloud-pi-native-sonarqube · 2026-10-02T15:29:27Z

Quality Gate passed

Issues

Measures

Project ID: cloud-pi-native_console_AYsa46O31ebDtzs-pYyZ

View in SonarQube

shikanime force-pushed the pr/admin-token-migration branch from 89babfe to 1b827e2 Compare September 17, 2026 10:21

shikanime self-assigned this Sep 17, 2026

shikanime added this to the 9.27.0 milestone Sep 17, 2026

shikanime force-pushed the pr/admin-token-migration branch from 1b827e2 to 116b610 Compare September 17, 2026 13:40

github-actions Bot added the built label Sep 17, 2026

shikanime commented Sep 17, 2026

View reviewed changes

Comment thread apps/server-nestjs/src/modules/admin-token/admin-token.controller.ts Outdated

shikanime commented Sep 17, 2026

View reviewed changes

Comment thread apps/server-nestjs/test/admin-token.e2e-spec.ts Outdated

shikanime commented Sep 17, 2026

View reviewed changes

Comment thread apps/server-nestjs/src/utils/schemas.ts Outdated

shikanime commented Sep 17, 2026

View reviewed changes

Comment thread apps/server-nestjs/src/modules/admin-token/admin-token.controller.ts Outdated

shikanime added the preview Deploy preview app with Argo-cd label Sep 18, 2026

shikanime commented Sep 18, 2026

View reviewed changes

Comment thread apps/server-nestjs/src/main.module.ts

Comment thread apps/server-nestjs/src/modules/admin-token/admin-token.service.ts

Comment thread apps/server-nestjs/src/modules/admin-token/admin-token-queries.utils.ts Outdated

shikanime commented Sep 18, 2026

View reviewed changes

Comment thread apps/server-nestjs/src/modules/admin-token/admin-token.utils.ts Outdated

shikanime mentioned this pull request Sep 18, 2026

feat(server-nestjs): consume adminRole events in keycloak and gitlab modules #2749

Merged

shikanime changed the base branch from main to pr/admin-role-event-bridge September 18, 2026 09:44

shikanime added this pull request to stack #2750 September 18, 2026 09:44

shikanime removed this pull request from stack #2750 September 18, 2026 09:44

shikanime changed the base branch from pr/admin-role-event-bridge to pr/stage-strangler September 18, 2026 09:45

shikanime changed the base branch from pr/stage-strangler to main September 18, 2026 09:45

shikanime changed the base branch from main to pr/cluster-migration September 18, 2026 09:46

shikanime added this pull request to stack #2752 September 18, 2026 09:46

shikanime force-pushed the pr/admin-token-migration branch 4 times, most recently from 410920c to 95a36ea Compare September 18, 2026 10:29

shikanime and others added 22 commits October 2, 2026 17:05

refactor(shared): drop duplicate CreateAdminTokenBody export in favor…

cc66d44

… of contract alias Co-authored-by: Automata <automata@shikanime.studio>

test(admin-token): stub list in e2e mock to return an empty page

9b4d31f

Co-authored-by: Automata <automata@shikanime.studio>

fix(admin-token): coerce contract expirationDate to Date at the servi…

8ca2a5b

…ce boundary Co-authored-by: Automata <automata@shikanime.studio>

test(admin-token): drop controller delegation specs, keep coercion guard

2ad29bf

Co-authored-by: Automata <automata@shikanime.studio>

test(admin-token): drop unused type alias after delegation-spec removal

be63f4a

Co-authored-by: Automata <automata@shikanime.studio>

refactor(admin-token): share spec factories in testing utils, drop Re…

5052d83

…turnType aliases Co-authored-by: Automata <automata@shikanime.studio>

refactor(admin-token): assemble exposed token in controller

cd1c173

Co-authored-by: Automata <automata@shikanime.studio>

chore(admin-token): drop tooling tag from test comment

1052f68

Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I1d8ffcb80aa787018dc4e8008ab5a84f6a6a6964

refactor(admin-token): inline transaction client type

1a64017

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I957c9bb79f59855521fc4cb69964dbaa6a6a6964

refactor(admin-token): extract status filter into helper

e13557e

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Ie45ff1996f70edc312ba938d388016c96a6a6964

refactor(admin-token): rename record type to AdminToken

fdab474

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I42726b788f39dbe4c6f660cb57af3c206a6a6964

refactor(admin-token): rename test factory to makeAdminToken

e9a633a

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Ib0b6d8746627891c22f62875b8c2f75d6a6a6964

refactor(admin-token): inline listed-token fixture at its single call…

56a8d37

… site Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Ib08a0f1a001be5d0eb788b91210f81bb6a6a6964

fix(admin-token): update fixture import after inlining

3a60976

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I17ff50ee3a67efcccaa275508067c3ac6a6a6964

refactor(admin-token): split row and selected-payload token fixtures

7dd88b9

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Iafe340dd1f247a0a221e39ff4c26bc946a6a6964

refactor(admin-token): name the token row fixture type

2098928

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: I70793bd5f8f6d1991c97aa7a1e4f5bcd6a6a6964

refactor(admin-token): extract makeAdminTokenOwner from makeAdminToken

b4e5850

Co-authored-by: Automata <automata@shikanime.studio>

refactor(admin-token): accept owner overrides in makeAdminToken

5c5e483

Co-authored-by: Automata <automata@shikanime.studio>

refactor(admin-token): extract makeAdminTokenOwner from makeAdminToken

225ee62

Co-authored-by: Automata <automata@shikanime.studio>

refactor(admin-token): align queries types with Record naming

a4b0fa4

Co-authored-by: Automata <automata@shikanime.studio> Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr> Change-Id: Ic276ad1c4e15fe04cb6f24ed522ca6b96a6a6964

refactor(admin-token): simplify makeAdminTokenRecord overrides to Par…

f530b9e

…tial Co-authored-by: Automata <automata@shikanime.studio>

refactor(admin-token): rename AdminTokenRow to AdminTokenRecordWithHash

a1d29e6

Co-authored-by: Automata <automata@shikanime.studio>

shikanime force-pushed the pr/admin-token-migration branch from cf10952 to a1d29e6 Compare October 2, 2026 15:06

shikanime enabled auto-merge October 2, 2026 15:17

shikanime disabled auto-merge October 2, 2026 15:55

shikanime added this pull request to the merge queue Oct 2, 2026

Merged via the queue into main with commit 7af2fee Oct 2, 2026
34 checks passed

shikanime deleted the pr/admin-token-migration branch October 2, 2026 16:35

Navigation Menu

Repository navigation

refactor(admin-token): migrate from server - #2740

refactor(admin-token): migrate from server#2740
shikanime merged 27 commits into
mainfrom
pr/admin-token-migration

shikanime commented Sep 17, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

shikanime commented Sep 17, 2026

Uh oh!

Uh oh!

Uh oh!

shikanime commented Sep 17, 2026

Uh oh!

github-actions Bot commented Sep 18, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shikanime left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cloud-pi-native-sonarqube Bot commented Oct 2, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

shikanime commented Sep 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issues liées

Quel est le comportement actuel ?

Quel est le nouveau comportement ?

Cette PR introduit-elle un breaking change ?

Autres informations

Uh oh!

Uh oh!

Uh oh!

shikanime commented Sep 17, 2026

Uh oh!

Uh oh!

Uh oh!

shikanime commented Sep 17, 2026

Uh oh!

github-actions Bot commented Sep 18, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shikanime left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cloud-pi-native-sonarqube Bot commented Oct 2, 2026

Quality Gate passed

Issues

Measures

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

shikanime commented Sep 17, 2026 •

edited

Loading