Format account creation attempt notifications

quentinovega · quentinovega · commit e23354a39d6d · 2025-09-19T10:52:42.000+02:00
diff --git a/daikoku/app/controllers/LoginController.scala b/daikoku/app/controllers/LoginController.scala
@@ -518,7 +518,7 @@ class LoginController(
                 )
               ),
               state = SubscriptionDemandState.Waiting,
-              value = body,
+              value = body - "confirmPassword" - "password",
               fromTenant = ctx.tenant.id
             )
           )
diff --git a/daikoku/app/domain/SchemaDefinition.scala b/daikoku/app/domain/SchemaDefinition.scala
@@ -646,6 +646,14 @@ object SchemaDefinition {
             ListType(StringType),
             resolve = ctx => ctx.value.emails
           )
+        ),
+        AddFields(
+          Field(
+            "type",
+            StringType,
+            description = Some("Type of the validation step"),
+            resolve = ctx => ctx.value.name
+          )
         )
       )
     )
@@ -667,6 +675,14 @@ object SchemaDefinition {
         ReplaceField(
           "team",
           Field("team", StringType, resolve = ctx => ctx.value.team.value)
+        ),
+        AddFields(
+          Field(
+            "type",
+            StringType,
+            description = Some("Type of the validation step"),
+            resolve = ctx => ctx.value.name
+          )
         )
       )
     )
@@ -700,6 +716,14 @@ object SchemaDefinition {
             OptionType(StringType),
             resolve = ctx => ctx.value.formatter
           )
+        ),
+        AddFields(
+          Field(
+            "type",
+            StringType,
+            description = Some("Type of the validation step"),
+            resolve = ctx => ctx.value.name
+          )
         )
       )
     )
@@ -725,6 +749,14 @@ object SchemaDefinition {
         ReplaceField(
           "headers",
           Field("headers", MapType, resolve = _.value.headers)
+        ),
+        AddFields(
+          Field(
+            "type",
+            StringType,
+            description = Some("Type of the validation step"),
+            resolve = ctx => ctx.value.name
+          )
         )
       )
     )
@@ -750,6 +782,14 @@ object SchemaDefinition {
             StringType,
             resolve = ctx => ctx.value.thirdPartyPaymentSettingsId.value
           )
+        ),
+        AddFields(
+          Field(
+            "type",
+            StringType,
+            description = Some("Type of the validation step"),
+            resolve = ctx => ctx.value.name
+          )
         )
       )
     )
@@ -2976,7 +3016,7 @@ object SchemaDefinition {
       ),
       ReplaceField("state", Field("state", StringType, resolve = _.value.state.name)),
       ReplaceField("fromTenant", Field("fromTenant", StringType, resolve = _.value.fromTenant.value)),
-      ReplaceField("value", Field("value", JsonType, resolve = _.value.value)),
+      ReplaceField("value", Field("value", JsonType, resolve = _.value.value - "password" - "confirmPassword")),
       ReplaceField("metadata", Field("metadata", MapType, resolve = _.value.metadata)),
     )
     lazy val AccountCreationAttemptType = new PossibleObject(
diff --git a/daikoku/javascript/src/components/backoffice/apis/SubscriptionProcessEditor.tsx b/daikoku/javascript/src/components/backoffice/apis/SubscriptionProcessEditor.tsx
@@ -149,6 +149,7 @@ type ValidationStepProps = {
 
 const ValidationStep = (props: ValidationStepProps) => {
   const step = props.step;
+  console.debug(step)
 
   switch (step.type) {
     case 'payment':
diff --git a/daikoku/javascript/src/components/backoffice/notifications/NotificationList.tsx b/daikoku/javascript/src/components/backoffice/notifications/NotificationList.tsx
@@ -1,22 +1,21 @@
 import { useInfiniteQuery, useQuery, useQueryClient } from '@tanstack/react-query';
-import { ColumnFiltersState, createColumnHelper, flexRender, getCoreRowModel, getSortedRowModel, PaginationState, SortingState, useReactTable } from '@tanstack/react-table';
+import { ColumnFiltersState, createColumnHelper, flexRender, getCoreRowModel, getSortedRowModel, PaginationState, useReactTable } from '@tanstack/react-table';
 import classNames from 'classnames';
 import { formatDistanceToNow } from 'date-fns';
 import { useContext, useEffect, useMemo, useState } from 'react';
 import Select, { components, MultiValue, OptionProps, ValueContainerProps } from 'react-select';
 
 import { constraints, format, type } from '@maif/react-forms';
-import { Link, useNavigate, useSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router-dom';
 import { I18nContext, ModalContext, TranslateParams } from '../../../contexts';
 import { GlobalContext } from '../../../contexts/globalContext';
 import { CustomSubscriptionData } from '../../../contexts/modals/SubscriptionMetadataModal';
 import * as Services from '../../../services';
-import { DaikokuMode, Display, IAccountCreationGQL, IApi, IApiGQL, IApiPost, IIssuesTag, isError, Issue, ISubscription, ISubscriptionDemand, ISubscriptionDemandGQL, ITeamFullGql, ITeamSimple, ITenant, ITesting, IUsagePlan, IUser, IValidationStepPayment } from '../../../types';
+import { IAccountCreationGQL, IApiGQL, IApiPost, isError, Issue, ISubscription, ISubscriptionDemandGQL, ITeamFullGql, ITeamSimple, ITenant, IUsagePlan, IUser, IValidationStep } from '../../../types';
 import { getLanguageFns, Spinner } from '../../utils';
 import { FeedbackButton } from '../../utils/FeedbackButton';
-import { Option as opt } from '../../utils';
-import { IApiSubscriptionGql } from '../apis';
 import { SimpleApiKeyCard } from '../apikeys/TeamApiKeysForApi';
+import { IApiSubscriptionGql } from '../apis';
 declare module '@tanstack/react-table' {
   interface ColumnMeta<TData extends unknown, TValue> extends NotificationColumnMeta { }
 }
@@ -170,7 +169,7 @@ type NotificationActionGQL =
   | {
     __typename: 'CheckoutForSubscription';
     plan: IUsagePlan;
-    step: IValidationStepPayment;
+    step: IValidationStep & { type: 'payment' };
     demand: ISubscriptionDemandGQL;
     api: IApiGQL;
   }
@@ -779,7 +778,7 @@ export const NotificationList = () => {
         return translate({ key: 'notif.apikey.deletion' })
       case 'ApiKeyDeletionInformationV2': {
         const apiKeyDeletionInformationDescription = translate({ key: 'notif.apikey.deletion' })
-        const __subscription = notification.action.subscription        
+        const __subscription = notification.action.subscription
         return (
           <>
             {apiKeyDeletionInformationDescription}
@@ -810,7 +809,7 @@ export const NotificationList = () => {
         const __api = notification.action.api
         const __plan = notification.action.plan
         const __team = notification.action.api.team
-        const __subscription = notification.action.subscription 
+        const __subscription = notification.action.subscription
         return (
           <>
             {apiKeyRotationInProgressDescription}
@@ -836,11 +835,11 @@ export const NotificationList = () => {
       case 'ApiKeyRotationEnded':
         return translate('notif.apikey.rotation.ended')
       case 'ApiKeyRotationEndedV2': {
-        const apiKeyRotationEndedV2Description =  translate('notif.apikey.rotation.ended')
+        const apiKeyRotationEndedV2Description = translate('notif.apikey.rotation.ended')
         const __api = notification.action.api
         const __plan = notification.action.plan
         const __team = notification.action.api.team
-        const __subscription = notification.action.subscription 
+        const __subscription = notification.action.subscription
         return <>
           {apiKeyRotationEndedV2Description}
           <a
@@ -868,7 +867,7 @@ export const NotificationList = () => {
         const __api = notification.action.api
         const __plan = notification.action.plan
         const __team = notification.action.api.team
-        const __subscription = notification.action.subscription 
+        const __subscription = notification.action.subscription
         return <>
           {apiKeyRefreshV2Description}
           <a
@@ -920,11 +919,42 @@ export const NotificationList = () => {
         return translate('notif.issues.comment')
       case 'ApiSubscriptionTransferSuccess':
         return translate('notif.subscription.transfer.success')
-      case 'AccountCreationAttempt': 
-        return translate('notif.account.creation.attempt');
+      case 'AccountCreationAttempt':
+        const description = translate('notif.account.creation.attempt');
+        const value = notification.action.demand.value
+        const formStep = notification.action.demand.steps.map(s => s.step).find(s => s.type === 'form')
+
+        const regexp = /\[\[(.+?)\]\]/g;
+        const matches = formStep?.formatter.match(regexp);
+
+        const formattedValue = matches?.reduce((acc, match) => {
+          const key = match.replace('[[', '').replace(']]', '');
+          return acc.replace(match, value[key] || match);
+        }, formStep?.formatter ?? "");
+
+        return (
+          <>
+            {description}
+            <a
+              href='#'
+              className='underline'
+              aria-label={translate('notifications.page.account.creation.attempt.detail.button.label')}
+              title={translate('notifications.page.account.creation.attempt.detail.button.label')}
+              onClick={() => alert({
+                title: translate('notifications.page.account.creation.attempt.detail.modal.title'),
+                message: <div>
+                  {!!formattedValue && <em>{formattedValue}</em>}
+                  <pre>
+                    {JSON.stringify(value, null, 2)}
+                  </pre>
+                </div>
+              })}>
+              <span className='ms-2'>[{translate('notifications.page.account.creation.attempt.detail.button.label')}]</span>
+            </a>
+          </>
+        )
       default:
         return '';
-
     }
   }
 
@@ -1024,10 +1054,8 @@ export const NotificationList = () => {
       meta: { className: "description-cell" },
       cell: (info) => {
         return <div className='notification d-flex align-items-center gap-3'>
-          <div>
-            <div className='notification__description'>
-              {notificationFormatter(info.row.original, translate, tenant)}
-            </div>
+          <div className='notification__description'>
+            {notificationFormatter(info.row.original, translate, tenant)}
           </div>
         </div>;
       },
diff --git a/daikoku/javascript/src/locales/en/translation.json b/daikoku/javascript/src/locales/en/translation.json
@@ -1648,6 +1648,8 @@
     "notifications.page.table.header.label.sender": "Sender",
     "notifications.page.table.header.label.date": "Date",
     "notifications.page.table.header.label.actions": "Actions",
+    "notifications.page.account.creation.attempt.detail.button.label": "Show more",
+    "notifications.page.account.creation.attempt.detail.modal.title": "Account creation attempt details",
     "tenant.edit.clientNamePattern.label": "Custom client name pattern",
     "tenant.edit.clientNamePattern.help": "This pattern is used to customize the client name when creating an API key. The string can include dynamic values using the ${my.value} syntax.",
     "tenant.edit.clientNamePattern.help2": "The following values are available:",
diff --git a/daikoku/javascript/src/locales/fr/translation.json b/daikoku/javascript/src/locales/fr/translation.json
@@ -1649,7 +1649,9 @@
   "notifications.page.table.header.label.sender": "Source",
   "notifications.page.table.header.label.date": "Date",
   "notifications.page.table.header.label.actions": "Actions",
-  "tenant.edit.clientNamePattern.label": "Modèle de nom de client personnalisé",
+  "notifications.page.account.creation.attempt.detail.button.label": "Voir plus",
+  "notifications.page.account.creation.attempt.detail.modal.title": "Détail de la demande de création de compte",
+  "tenant.edit.clientNamePattern.label" : "Modèle de nom de client personnalisé",
   "tenant.edit.clientNamePattern.help": "Ce modèle est utilisé pour personnaliser le nom du client lors de la création d'une clé d'API. La chaîne de caractères peut contenir des valeurs dynamiques en utilisant la syntaxe ${ma.valeur}.",
   "tenant.edit.clientNamePattern.help2": "Les valeurs disponibles sont les suivantes :",
   "tenant.security.account.creation.process.button.label": "Personnaliser le processus de création de comptes",
diff --git a/daikoku/javascript/src/services/index.ts b/daikoku/javascript/src/services/index.ts
@@ -2038,6 +2038,32 @@ export const graphql = {
                 _id
                 email
                 name
+                value
+                steps {
+                  step {
+                    ... on Form {
+                      __typename
+                      formatter
+                      type
+                    }
+                    ... on Email {
+                      __typename
+                      type
+                    }
+                    ... on TeamAdmin {
+                      __typename
+                      type
+                    }
+                    ... on Payment {
+                      __typename
+                      type
+                    }
+                    ... on HttpRequest {
+                      __typename
+                      type
+                    }
+                  }
+                }
               }
               motivation
             }

Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ class LoginController(`
`518`	`518`	`)`
`519`	`519`	`),`
`520`	`520`	`state = SubscriptionDemandState.Waiting,`
`521`		`- value = body,`
	`521`	`+ value = body - "confirmPassword" - "password",`
`522`	`522`	`fromTenant = ctx.tenant.id`
`523`	`523`	`)`
`524`	`524`	`)`
Original file line number	Diff line number	Diff line change
`@@ -646,6 +646,14 @@ object SchemaDefinition {`
`646`	`646`	`ListType(StringType),`
`647`	`647`	`resolve = ctx => ctx.value.emails`
`648`	`648`	`)`
	`649`	`+ ),`
	`650`	`+ AddFields(`
	`651`	`+ Field(`
	`652`	`+ "type",`
	`653`	`+ StringType,`
	`654`	`+ description = Some("Type of the validation step"),`
	`655`	`+ resolve = ctx => ctx.value.name`
	`656`	`+ )`
`649`	`657`	`)`
`650`	`658`	`)`
`651`	`659`	`)`
`@@ -667,6 +675,14 @@ object SchemaDefinition {`
`667`	`675`	`ReplaceField(`
`668`	`676`	`"team",`
`669`	`677`	`Field("team", StringType, resolve = ctx => ctx.value.team.value)`
	`678`	`+ ),`
	`679`	`+ AddFields(`
	`680`	`+ Field(`
	`681`	`+ "type",`
	`682`	`+ StringType,`
	`683`	`+ description = Some("Type of the validation step"),`
	`684`	`+ resolve = ctx => ctx.value.name`
	`685`	`+ )`
`670`	`686`	`)`
`671`	`687`	`)`
`672`	`688`	`)`
`@@ -700,6 +716,14 @@ object SchemaDefinition {`
`700`	`716`	`OptionType(StringType),`
`701`	`717`	`resolve = ctx => ctx.value.formatter`
`702`	`718`	`)`
	`719`	`+ ),`
	`720`	`+ AddFields(`
	`721`	`+ Field(`
	`722`	`+ "type",`
	`723`	`+ StringType,`
	`724`	`+ description = Some("Type of the validation step"),`
	`725`	`+ resolve = ctx => ctx.value.name`
	`726`	`+ )`
`703`	`727`	`)`
`704`	`728`	`)`
`705`	`729`	`)`
`@@ -725,6 +749,14 @@ object SchemaDefinition {`
`725`	`749`	`ReplaceField(`
`726`	`750`	`"headers",`
`727`	`751`	`Field("headers", MapType, resolve = _.value.headers)`
	`752`	`+ ),`
	`753`	`+ AddFields(`
	`754`	`+ Field(`
	`755`	`+ "type",`
	`756`	`+ StringType,`
	`757`	`+ description = Some("Type of the validation step"),`
	`758`	`+ resolve = ctx => ctx.value.name`
	`759`	`+ )`
`728`	`760`	`)`
`729`	`761`	`)`
`730`	`762`	`)`
`@@ -750,6 +782,14 @@ object SchemaDefinition {`
`750`	`782`	`StringType,`
`751`	`783`	`resolve = ctx => ctx.value.thirdPartyPaymentSettingsId.value`
`752`	`784`	`)`
	`785`	`+ ),`
	`786`	`+ AddFields(`
	`787`	`+ Field(`
	`788`	`+ "type",`
	`789`	`+ StringType,`
	`790`	`+ description = Some("Type of the validation step"),`
	`791`	`+ resolve = ctx => ctx.value.name`
	`792`	`+ )`
`753`	`793`	`)`
`754`	`794`	`)`
`755`	`795`	`)`
`@@ -2976,7 +3016,7 @@ object SchemaDefinition {`
`2976`	`3016`	`),`
`2977`	`3017`	`ReplaceField("state", Field("state", StringType, resolve = _.value.state.name)),`
`2978`	`3018`	`ReplaceField("fromTenant", Field("fromTenant", StringType, resolve = _.value.fromTenant.value)),`
`2979`		`- ReplaceField("value", Field("value", JsonType, resolve = _.value.value)),`
	`3019`	`+ ReplaceField("value", Field("value", JsonType, resolve = _.value.value - "password" - "confirmPassword")),`
`2980`	`3020`	`ReplaceField("metadata", Field("metadata", MapType, resolve = _.value.metadata)),`
`2981`	`3021`	`)`
`2982`	`3022`	`lazy val AccountCreationAttemptType = new PossibleObject(`