diff --git a/apps/client/src/App.vue b/apps/client/src/App.vue
index 65d86f56f0..02fa047bc0 100644
--- a/apps/client/src/App.vue
+++ b/apps/client/src/App.vue
@@ -1,4 +1,5 @@
diff --git a/apps/client/src/router/index.ts b/apps/client/src/router/index.ts
index c9a7ef7ed3..ef28e203f8 100644
--- a/apps/client/src/router/index.ts
+++ b/apps/client/src/router/index.ts
@@ -260,7 +260,7 @@ router.beforeEach(async (to, _from, next) => {
&& userStore.isLoggedIn
) {
await systemStore.listSystemSettings('maintenance')
- if (systemStore.systemSettingsByKey.maintenance?.value === 'on' && userStore.adminPerms === 0n) return next('/maintenance')
+ if (systemStore.systemSettings?.maintenance === 'on' && userStore.adminPerms === 0n) return next('/maintenance')
}
next()
diff --git a/apps/client/src/stores/system-settings.ts b/apps/client/src/stores/system-settings.ts
index 3ffb31e244..6fb9e34394 100644
--- a/apps/client/src/stores/system-settings.ts
+++ b/apps/client/src/stores/system-settings.ts
@@ -1,34 +1,29 @@
import { defineStore } from 'pinia'
-import {
- type SystemSetting,
- type SystemSettings,
- type UpsertSystemSettingBody,
- resourceListToDictByKey,
+import type {
+ SystemSettings,
} from '@cpn-console/shared'
import { apiClient, extractData } from '@/api/xhr-client.js'
export const useSystemSettingsStore = defineStore('systemSettings', () => {
- const systemSettings = ref([])
- const systemSettingsByKey = computed(() => resourceListToDictByKey(systemSettings.value))
+ const systemSettings = ref()
- const listSystemSettings = async (key?: SystemSetting['key']) => {
+ const listSystemSettings = async (key?: keyof SystemSettings) => {
systemSettings.value = await apiClient.SystemSettings.listSystemSettings({ query: { key } })
.then(response => extractData(response, 200))
}
- const upsertSystemSetting = async (newSystemSetting: UpsertSystemSettingBody) => {
- const res = await apiClient.SystemSettings.upsertSystemSetting({ body: newSystemSetting })
- .then(response => extractData(response, 201))
- systemSettings.value = systemSettings.value
- .toSpliced(systemSettings.value
- .findIndex(systemSetting => systemSetting.key === res.key), 1, res)
- return res
- }
+ // const upsertSystemSetting = async (newSystemSetting: UpsertSystemSettingBody) => {
+ // const res = await apiClient.SystemSettings.upsertSystemSetting({ body: newSystemSetting })
+ // .then(response => extractData(response, 201))
+ // systemSettings.value = systemSettings.value
+ // .toSpliced(systemSettings.value
+ // .findIndex(systemSetting => systemSetting.key === res.key), 1, res)
+ // return res
+ // }
return {
systemSettings,
- systemSettingsByKey,
listSystemSettings,
- upsertSystemSetting,
+ // upsertSystemSetting,
}
})
diff --git a/apps/client/src/views/admin/SystemSettings.vue b/apps/client/src/views/admin/SystemSettings.vue
index 8054ef29f5..c24d3d3930 100644
--- a/apps/client/src/views/admin/SystemSettings.vue
+++ b/apps/client/src/views/admin/SystemSettings.vue
@@ -1,29 +1,85 @@
Réglages de la console Cloud π Native
+
+
+
+
+
+
+
+
+
diff --git a/apps/server/package.json b/apps/server/package.json
index f14ea08d12..27d3d2227f 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -67,7 +67,8 @@
"node-vault-client": "^1.0.1",
"prisma": "^5.19.1",
"undici": "^6.19.2",
- "vitest-mock-extended": "^1.3.1"
+ "vitest-mock-extended": "^1.3.1",
+ "zod": "^3.23.8"
},
"devDependencies": {
"@cpn-console/eslint-config": "workspace:^",
diff --git a/apps/server/src/resources/system/settings/business.ts b/apps/server/src/resources/system/settings/business.ts
index 5e562353b0..2efc8d6d63 100644
--- a/apps/server/src/resources/system/settings/business.ts
+++ b/apps/server/src/resources/system/settings/business.ts
@@ -1,9 +1,14 @@
-import type { UpsertSystemSettingBody } from '@cpn-console/shared'
-import {
- getSystemSettings as getSystemSettingsQuery,
- upsertSystemSetting as upsertSystemSettingQuery,
-} from './queries.js'
+import type { UpsertSystemSettingsBody } from '@cpn-console/shared'
+import { upsertSystemSetting as upsertSystemSettingQuery } from './queries.js'
-export const getSystemSettings = (key?: string) => getSystemSettingsQuery({ key })
+import { config } from '@/utils/config.js'
-export const upsertSystemSetting = (newSystemSetting: UpsertSystemSettingBody) => upsertSystemSettingQuery(newSystemSetting)
+export function getSystemSettings(key?: keyof typeof config) {
+ if (key) {
+ return { [key]: config[key] }
+ } else {
+ return config
+ }
+}
+
+export const upsertSystemSettings = (newSystemSetting: UpsertSystemSettingsBody) => upsertSystemSettingQuery(newSystemSetting)
diff --git a/apps/server/src/resources/system/settings/router.ts b/apps/server/src/resources/system/settings/router.ts
index baa0765b6c..7b5bf3c565 100644
--- a/apps/server/src/resources/system/settings/router.ts
+++ b/apps/server/src/resources/system/settings/router.ts
@@ -1,5 +1,5 @@
import { AdminAuthorized, systemSettingsContract } from '@cpn-console/shared'
-import { getSystemSettings, upsertSystemSetting } from './business.js'
+import { getSystemSettings, upsertSystemSettings } from './business.js'
import { serverInstance } from '@/app.js'
import { authUser } from '@/utils/controller.js'
import { Forbidden403 } from '@/utils/errors.js'
@@ -9,6 +9,12 @@ export function systemSettingsRouter() {
listSystemSettings: async ({ query }) => {
const systemSettings = await getSystemSettings(query.key)
+ if (!systemSettings) {
+ return {
+ status: 500,
+ body: { error: 'System settings not found' },
+ }
+ }
return {
status: 200,
body: systemSettings,
@@ -19,7 +25,7 @@ export function systemSettingsRouter() {
const perms = await authUser(req)
if (!AdminAuthorized.isAdmin(perms.adminPermissions)) return new Forbidden403()
- const systemSetting = await upsertSystemSetting(data)
+ const systemSetting = await upsertSystemSettings(data)
return {
status: 201,
diff --git a/apps/server/src/utils/config.ts b/apps/server/src/utils/config.ts
new file mode 100644
index 0000000000..484e082621
--- /dev/null
+++ b/apps/server/src/utils/config.ts
@@ -0,0 +1,133 @@
+import path from 'node:path'
+import { SystemSettingSchema as ConfigSchema } from '@cpn-console/shared'
+
+const getNodeEnv: () => 'development' | 'test' | 'production' = () => {
+ if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
+ return process.env.NODE_ENV
+ }
+ return 'production'
+}
+
+function snakeCaseToCamelCase(input: string) {
+ return input
+ .split('_')
+ .reduce((acc, cur, i) => {
+ if (!i) {
+ return cur.toLowerCase()
+ }
+ return acc + cur.charAt(0).toUpperCase() + cur.substring(1).toLowerCase()
+ }, '')
+}
+
+function deepMerge(target: any, source: any) {
+ const result = { ...target, ...source }
+ for (const key of Object.keys(result)) {
+ if (Array.isArray(target[key]) && Array.isArray(source[key])) {
+ result[key] = result[key].map((value: unknown, idx: number) => {
+ return typeof value === 'object'
+ ? deepMerge(target[key][idx], source[key][idx])
+ : structuredClone(result[key][idx])
+ })
+ } else if (typeof target[key] === 'object' && typeof source[key] === 'object') {
+ result[key] = deepMerge(target[key], source[key])
+ } else {
+ result[key] = structuredClone(result[key])
+ }
+ }
+ return result
+}
+
+const configPaths = {
+ development: path.resolve(__dirname, '../../config-example.json'),
+ production: '/app/config.json',
+ test: path.resolve(__dirname, './configs/config.valid.spec.json'),
+}
+
+const CONFIG_PATH = configPaths[getNodeEnv()]
+const ENV_PREFIX = ['API__', 'DOC__']
+
+// export const ConfigSchema = z.object({
+// maintenance: z.string().default('off'),
+// appName: z.string().default('Console Cloud Pi Native TEST DE FOU'),
+// contactMail: z.string().default('cloudpinative-relations@interieur.gouv.fr'),
+// appSubTitle: z.array(z.string()).default(['Ministère 2', 'de l’intérieur 3', 'et des outre-mer 4']),
+// // appLogoUrl: z.string().default(''), // pas sur de la faisabilité
+// }).strict()
+
+export type Config = Zod.infer
+
+// maybe a modifié ? ?
+export function parseEnv(obj: Record): Config | Record {
+ return Object
+ .entries(obj)
+ .map(([key, value]) => key
+ .split('__')
+ .toReversed()
+ .reduce((acc, val, idx) => {
+ if (!idx) {
+ try {
+ return { [snakeCaseToCamelCase(val)]: JSON.parse(value) }
+ } catch (_e) {
+ return { [snakeCaseToCamelCase(val)]: value }
+ }
+ } else {
+ return { [snakeCaseToCamelCase(val)]: acc }
+ }
+ }, {}))
+ .reduce((acc, val) => deepMerge(acc, val), {})
+}
+
+// pour recup l'env
+export function getEnv(prefix: string | string[] = ENV_PREFIX): Record {
+ return Object
+ .entries(process.env)
+ .filter(([key, _value]) => Array.isArray(prefix) ? prefix.some(p => key.startsWith(p)) : key.startsWith(prefix))
+ .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
+}
+
+export async function getConfig(opts?: { fileConfigPath?: string, envPrefix?: string | string[] }) {
+ const fileConfigPath = opts?.fileConfigPath ?? CONFIG_PATH
+ const envPrefix = opts?.envPrefix ?? ENV_PREFIX
+
+ const defaultConfig = ConfigSchema.parse({})
+ let envConfig: Config | Record = {}
+ let fileConfig: Config | Record = {}
+ // const dbConfig: Config | Record = {}
+
+ try {
+ envConfig = parseEnv(getEnv(envPrefix))
+ ConfigSchema.partial().parse(envConfig)
+ } catch (error) {
+ const errorMessage = { description: 'invalid config environment variables', error }
+ throw new Error(JSON.stringify(errorMessage))
+ }
+
+ try {
+ const file = await import(fileConfigPath, { assert: { type: 'json' } })
+
+ .catch(_e => console.log(`no config file detected "${fileConfigPath}"`))
+ if (file) {
+ fileConfig = file.default
+ ConfigSchema.partial().parse(fileConfig)
+ }
+ } catch (error) {
+ const errorMessage = { description: `invalid config file "${fileConfigPath}"`, error }
+ throw new Error(JSON.stringify(errorMessage))
+ }
+
+ // try {
+ // dbConfig = JSON.parse(await getSystemSettings())
+ // } catch (error) {
+ // const errorMessage = { description: `invalid config env`, error }
+ // throw new Error(JSON.stringify(errorMessage))
+ // }
+
+ return {
+ ...defaultConfig,
+ ...fileConfig,
+ ...envConfig,
+ // ...dbConfig,
+ }
+}
+
+export const config = await getConfig()
diff --git a/apps/server/src/utils/fastify.ts b/apps/server/src/utils/fastify.ts
index 880f06e66c..f8f5c0dfc0 100644
--- a/apps/server/src/utils/fastify.ts
+++ b/apps/server/src/utils/fastify.ts
@@ -6,6 +6,7 @@ import { apiPrefix } from '@cpn-console/shared'
import type { generateOpenApi } from '@ts-rest/open-api'
import { loggerConf } from './logger.js'
import { NODE_ENV } from './env.js'
+import { config } from './config.js'
export const fastifyConf: FastifyServerOptions = {
maxParamLength: 5000,
@@ -20,7 +21,8 @@ const externalDocs = {
export const swaggerConf: Parameters[1] = {
info: {
- title: 'Console Cloud Pi Native',
+ // title: 'Console Cloud Pi Native',
+ title: config.appName,
description: 'API de gestion des ressources Cloud Pi Native.',
version: process.env.APP_VERSION || 'dev',
},
diff --git a/packages/shared/src/contracts/system.ts b/packages/shared/src/contracts/system.ts
index 85bd6fd89a..b5b9591d88 100644
--- a/packages/shared/src/contracts/system.ts
+++ b/packages/shared/src/contracts/system.ts
@@ -76,6 +76,4 @@ export const systemSettingsContract = contractInstance.router({
export type SystemSettings = ClientInferResponseBody
-export type SystemSetting = SystemSettings[number]
-
export type UpsertSystemSettingBody = ClientInferRequest['body']
diff --git a/packages/shared/src/schemas/system.ts b/packages/shared/src/schemas/system.ts
index 21e1f62afc..147bdc4ef9 100644
--- a/packages/shared/src/schemas/system.ts
+++ b/packages/shared/src/schemas/system.ts
@@ -15,9 +15,11 @@ export const pluginSchema = z.object({
export type PluginSchema = Zod.infer
export const SystemSettingSchema = z.object({
- key: z.string(),
- value: z.string(),
-})
+ maintenance: z.string().default('off'),
+ appName: z.string().default('Console Cloud Pi Native TEST DE FOU'),
+ contactMail: z.string().default('cloudpinative-relations@interieur.gouv.fr'),
+ appSubTitle: z.array(z.string()).default(['Ministère 1', 'de l’intérieur 2', 'et des outre-mer 3']),
+}).strict()
export const GetVersionSchema = {
responses: {
@@ -58,10 +60,12 @@ export const UpdateSystemPluginSchema = {
}
export const ListSystemSettingsSchema = {
- query: SystemSettingSchema.pick({ key: true })
+ query: z.object({
+ key: SystemSettingSchema.keyof(),
+ })
.partial().strict(),
responses: {
- 200: SystemSettingSchema.array(),
+ 200: SystemSettingSchema,
500: ErrorSchema,
},
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 03d32ddc10..5f0900527b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -291,6 +291,9 @@ importers:
vitest-mock-extended:
specifier: ^1.3.1
version: 1.3.1(typescript@5.5.3)(vitest@1.6.0(@types/node@20.14.10)(jsdom@24.1.3))
+ zod:
+ specifier: ^3.23.8
+ version: 3.23.8
devDependencies:
'@cpn-console/eslint-config':
specifier: workspace:^