chore: domain migration (#856)

* chore: domain migration

* feat: disabled tmp delete account

.env.exemple

@@ -14,5 +14,6 @@ EXPO_PUBLIC_CAMPAIGN_DOMAIN=
 EXPO_PUBLIC_APP_RENAISSANCE_HOST=
 EXPO_PUBLIC_MAP_BOX_ACCESS_TOKEN=
 EXPO_PUBLIC_CAMPAIGN_DOMAIN=
+EXPO_PUBLIC_ADMIN_HOST=
 APPLE_TEAM_ID=
 SENTRY_AUTH_TOKEN=

.github/workflows/build-web-develop.yml

@@ -24,6 +24,7 @@ env:
   EXPO_PUBLIC_FB_MEASUREMENT_ID: ${{secrets.EXPO_PUBLIC_FB_MEASUREMENT_ID}}
   EXPO_PUBLIC_ENVIRONMENT: ${{secrets.EXPO_PUBLIC_ENVIRONMENT}}
   EXPO_PUBLIC_ASSOCIATED_DOMAIN: ${{secrets.EXPO_PUBLIC_ASSOCIATED_DOMAIN}}
+  EXPO_PUBLIC_ADMIN_HOST: ${{secrets.EXPO_PUBLIC_ADMIN_HOST}}
   EXPO_PUBLIC_MAP_BOX_ACCESS_TOKEN: ${{ secrets.EXPO_PUBLIC_MAP_BOX_ACCESS_TOKEN }}
   EXPO_PUBLIC_APP_NAME: ${{ secrets.EXPO_PUBLIC_APP_NAME }}
   EXPO_PUBLIC_CAMPAIGN_DOMAIN: ${{ secrets.EXPO_PUBLIC_CAMPAIGN_DOMAIN }}

.github/workflows/build-web-production-release.yml

@@ -25,6 +25,7 @@ env:
   EXPO_PUBLIC_FB_MEASUREMENT_ID: ${{secrets.EXPO_PUBLIC_FB_MEASUREMENT_ID}}
   EXPO_PUBLIC_ENVIRONMENT: ${{secrets.EXPO_PUBLIC_ENVIRONMENT}}
   EXPO_PUBLIC_ASSOCIATED_DOMAIN: ${{secrets.EXPO_PUBLIC_ASSOCIATED_DOMAIN}}
+  EXPO_PUBLIC_ADMIN_HOST: ${{secrets.EXPO_PUBLIC_ADMIN_HOST}}
   EXPO_PUBLIC_MAP_BOX_ACCESS_TOKEN: ${{ secrets.EXPO_PUBLIC_MAP_BOX_ACCESS_TOKEN }}
   EXPO_PUBLIC_APP_NAME: ${{ secrets.EXPO_PUBLIC_APP_NAME }}
   EXPO_PUBLIC_CAMPAIGN_DOMAIN: ${{ secrets.EXPO_PUBLIC_CAMPAIGN_DOMAIN }}

.github/workflows/build-web-release-candidates.yml

@@ -25,6 +25,7 @@ env:
   EXPO_PUBLIC_FB_MEASUREMENT_ID: ${{secrets.EXPO_PUBLIC_FB_MEASUREMENT_ID}}
   EXPO_PUBLIC_ENVIRONMENT: ${{secrets.EXPO_PUBLIC_ENVIRONMENT}}
   EXPO_PUBLIC_ASSOCIATED_DOMAIN: ${{secrets.EXPO_PUBLIC_ASSOCIATED_DOMAIN}}
+  EXPO_PUBLIC_ADMIN_HOST: ${{secrets.EXPO_PUBLIC_ADMIN_HOST}}
   EXPO_PUBLIC_MAP_BOX_ACCESS_TOKEN: ${{ secrets.EXPO_PUBLIC_MAP_BOX_ACCESS_TOKEN }}
   EXPO_PUBLIC_APP_NAME: ${{ secrets.EXPO_PUBLIC_APP_NAME }}
   EXPO_PUBLIC_CAMPAIGN_DOMAIN: ${{ secrets.EXPO_PUBLIC_CAMPAIGN_DOMAIN }}

.github/workflows/build-web-staging-ephemeral.yml

@@ -25,6 +25,7 @@ env:
   EXPO_PUBLIC_FB_MEASUREMENT_ID: ${{secrets.EXPO_PUBLIC_FB_MEASUREMENT_ID}}
   EXPO_PUBLIC_ENVIRONMENT: ${{secrets.EXPO_PUBLIC_ENVIRONMENT}}
   EXPO_PUBLIC_ASSOCIATED_DOMAIN: ${{secrets.EXPO_PUBLIC_ASSOCIATED_DOMAIN}}
+  EXPO_PUBLIC_ADMIN_HOST: ${{secrets.EXPO_PUBLIC_ADMIN_HOST}}
   EXPO_PUBLIC_APP_NAME: ${{ secrets.EXPO_PUBLIC_APP_NAME }}
   EXPO_PUBLIC_CAMPAIGN_DOMAIN: ${{ secrets.EXPO_PUBLIC_CAMPAIGN_DOMAIN }}
   SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

app.json

@@ -3,7 +3,7 @@
     "name": "Renaissance",
     "slug": "vox",
     "scheme": "vox",
-    "version": "5.6.1",
+    "version": "5.6.0",
     "owner": "parti-renaissance",
     "runtimeVersion": {
       "policy": "appVersion"

client-env-schema.ts

@@ -3,6 +3,7 @@ import { z } from 'zod'
 const envClientSchema = z.object({
   API_BASE_URL: z.string().url(),
   APP_RENAISSANCE_HOST: z.string(),
+  ADMIN_HOST: z.string(),
   ASSOCIATED_DOMAIN: z.string(),
   ENVIRONMENT: z.enum(['staging', 'production']),
   FB_API_KEY: z.string(),

src/screens/actions/form/ActionForm.tsx

@@ -13,7 +13,7 @@ import { useAction } from '@/services/actions/hook/useActions'
 import { useCreateOrEditAction } from '@/services/actions/hook/useCreateOrEditAction'
 import { ActionType, ActionTypeIcon, isFullAction, ReadableActionType } from '@/services/actions/schema'
 import { zodResolver } from '@hookform/resolvers/zod'
-import { addHours } from 'date-fns'
+import { addHours, formatISO } from 'date-fns'
 import { Controller, useForm } from 'react-hook-form'
 import { Spinner, useMedia, View } from 'tamagui'
 import { validateActionFormSchema } from './schema'
@@ -54,7 +54,7 @@ export default function ActionForm({ onCancel, onClose, uuid, scope }: Props) {
 
   const onSubmit = handleSubmit((data) => {
     $postAction
-      .mutateAsync(data)
+      .mutateAsync({ ...data, date: formatISO(data.date) })
       .then(() => {
         reset(data)
         onClose?.()

src/screens/profil/account/page.tsx

@@ -27,20 +27,14 @@ const EditInformations = () => {
   const { mutateAsync } = useDeleteProfil()
 
   const onRemoveAccountConfirmed = async () => {
-    if (!isAdherent) return mutateAsync().then(() => signOut())
-    const ACCOUNT_ROUTE_RE = `https://${clientEnv.APP_RENAISSANCE_HOST}/parametres/mon-compte`
-    if (isWeb && window) {
-      window.location.href = ACCOUNT_ROUTE_RE
-    } else {
-      await WebBrowser.openAuthSessionAsync(ACCOUNT_ROUTE_RE, null, { createTask: false })
-    }
+    return mutateAsync().then(() => signOut())
   }
 
   const removeAccount = () => {
     AlertUtils.showDestructiveAlert(
-      isAdherent ? 'Désadhérer' : 'Suppression du compte',
-      isAdherent ? 'Êtes-vous sûr de vouloir désadhérer ?' : 'Êtes-vous sûr de vouloir supprimer votre compte ?',
-      isAdherent ? 'Désadhérer' : 'Supprimer',
+      'Suppression du compte',
+      'Êtes-vous sûr de vouloir supprimer votre compte ?',
+      'Supprimer',
       'Annuler',
       onRemoveAccountConfirmed,
     )
@@ -71,7 +65,7 @@ const EditInformations = () => {
                   <Button.Text>{credentials?.isAdmin ? 'Quitter l’impersonnification' : 'Me déconnecter'}</Button.Text>
                 </Button>
                 <Button variant="outlined" size="lg" width="100%" onPress={removeAccount}>
-                  <Button.Text>{isAdherent ? 'Désadhérer' : 'Supprimer mon compte'}</Button.Text>
+                  <Button.Text>{isAdherent ? 'Supprimer mon compte' : 'Supprimer mon compte'}</Button.Text>
                 </Button>
               </YStack>
             </VoxCard.Content>

src/services/actions/schema.ts

@@ -94,7 +94,7 @@ export const ActionFullSchema = ActionSchema.omit({ first_participants: true, pa
 
 export const ActionCreateSchema = z.object({
   type: ActionTypeSchema,
-  date: z.date(),
+  date: z.string(),
   description: z.string(),
   post_address: z.object({
     address: z.string(),

src/services/logout/api.ts

@@ -18,7 +18,7 @@ export function useLogOut() {
       await queryClient.invalidateQueries()
 
       if (user?.isAdmin) {
-        window.location.href = `//${clientEnv.APP_RENAISSANCE_HOST}/admin/app/adherent/list?_switch_user=_exit`
+        window.location.href = `//${clientEnv.ADMIN_HOST}/app/adherent/list?_switch_user=_exit`
         return
       }
 

src/services/matomo/api.ts

@@ -1,3 +1,4 @@
+import clientEnv from '@/config/clientEnv'
 import { createApi } from '@/utils/constructApi'
 import axios, { CreateAxiosDefaults } from 'axios'
 import { z } from 'zod'
@@ -39,7 +40,7 @@ export const trackScreenView = (data: { pathname: string; userData?: Record<stri
   const screenName = data.pathname.split('/')[1]?.trim() ?? ''
   return trackAction({
     name: `Screen / ${screenName.length > 0 ? screenName : 'home'}`,
-    url: 'https://app.ensemble-2024.fr' + data.pathname,
+    url: `https://${clientEnv.ASSOCIATED_DOMAIN}` + data.pathname,
     userData: data.userData,
   })
 }

src/services/profile/api.ts

@@ -39,7 +39,7 @@ export const updateProfile = (userUuid: string, request: Types.RestUpdateProfile
 
 export const removeProfile = api({
   method: 'post',
-  path: '/api/v3/profile/me/remove',
+  path: '/api/v3/profile/unregister',
   requestSchema: schemas.RestRemoveProfileRequestSchema,
   responseSchema: schemas.RestRemoveProfileResponseSchema,
   type: 'private',

web/index.html

@@ -14,21 +14,21 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1.00001, viewport-fit=cover" />
     <meta name="apple-itunes-app" content="app-id=1441973895" />
     <meta property="og:type" content="website" />
-    <meta property="og:title" content="Ensemble pour les législatives 2024" />
+    <meta property="og:title" content="RENAISSANCE" />
     <meta property="og:url" content="" />
     <meta property="og:image" content="https://en-marche-prod.web.app/og-inscription-bde.png" />
-    <meta property="og:description" content="Engagez-vous pour la campagne législative de 2024" />
+    <meta property="og:description" content="Faites la différence : engagez-vous !" />
 
     <meta name="twitter:card" content="app" />
     <meta name="twitter:site" content="@renaissance" />
-    <meta name="twitter:description" content="Ensemble pour les législatives 2024" />
-    <meta name="twitter:app:name:googleplay" content="Ensemble" />
+    <meta name="twitter:description" content="Faites la différence : engagez-vous !" />
+    <meta name="twitter:app:name:googleplay" content="RENAISSANCE" />
     <meta name="twitter:app:url:googleplay" content="vox://" />
     <meta name="twitter:app:id:googleplay" content="fr.en_marche.jecoute" />
-    <meta name="twitter:app:name:iphone" content="Ensemble" />
+    <meta name="twitter:app:name:iphone" content="RENAISSANCE" />
     <meta name="twitter:app:url:iphone" content="vox://" />
     <meta name="twitter:app:id:iphone" content="1441973895" />
-    <meta name="twitter:app:name:ipad" content="Ensemble" />
+    <meta name="twitter:app:name:ipad" content="RENAISSANCE" />
     <meta name="twitter:app:url:ipad" content="vox://" />
     <meta name="twitter:app:id:ipad" content="1441973895" />