From 09971b7166fe2beee636cc0591b61d953217547d Mon Sep 17 00:00:00 2001 From: jonathanbataire Date: Mon, 13 Jan 2025 17:45:17 +0300 Subject: [PATCH 01/11] v1 --- src/config/chis-ug/config.json | 110 ++++++++++++++++++++++++------ src/lib/cht-session.ts | 6 +- src/liquid/app/config_upload.html | 67 ++++++++++++++++++ src/liquid/app/form_switch.html | 3 + src/liquid/app/nav.html | 8 ++- src/routes/app.ts | 45 +++++++++++- src/server.ts | 4 ++ 7 files changed, 216 insertions(+), 27 deletions(-) create mode 100644 src/liquid/app/config_upload.html diff --git a/src/config/chis-ug/config.json b/src/config/chis-ug/config.json index 0dd1e1a7..f5dd055d 100644 --- a/src/config/chis-ug/config.json +++ b/src/config/chis-ug/config.json @@ -16,7 +16,94 @@ ], "contact_types": [ { - "name": "health_center", + "name": "c40-parish", + "friendly": "Parish", + "contact_type": "person", + "user_role": ["chew"], + "username_from_place": true, + "deactivate_users_on_replace": true, + "hierarchy": [ + { + "friendly_name": "Health Facility", + "property_name": "HEALTHFACILITY", + "contact_type": "c30-district_hospital", + "type": "name", + "required": true, + "parameter": ["\\sH[ /]*F\\s"], + "level": 1 + } + ], + "replacement_property": { + "friendly_name": "Outgoing CHEW", + "property_name": "REPLACEMENT", + "type": "name", + "required": true + }, + "place_properties": [ + { + "friendly_name": "Parish Name", + "property_name": "name", + "type": "name", + "required": true, + "unique": "parent" + }, + { + "friendly_name": "Sub District", + "property_name": "sub_district", + "parameter": ["\\ssub\\s", "\\sdistrict\\s"], + "type": "name", + "required": false + }, + { + "friendly_name": "County", + "property_name": "county", + "type": "name", + "parameter": ["\\scounty\\s"], + "required": true + }, + { + "friendly_name": "Sub County", + "property_name": "sub_county", + "type": "name", + "parameter": ["\\ssub\\s", "\\scounty\\s"], + "required": true + } + ], + "contact_properties": [ + { + "friendly_name": "CHEW Name", + "property_name": "name", + "type": "name", + "required": true + }, + { + "friendly_name": "Phone Number", + "property_name": "phone", + "type": "phone", + "parameter": "UG", + "required": true, + "unique": "all" + }, + { + "friendly_name": "Date of Birth", + "property_name": "date_of_birth", + "type": "dob", + "required": true + }, + { + "friendly_name": "Sex", + "property_name": "sex", + "type": "select_one", + "parameter": { + "male": "Male", + "female": "Female" + }, + "required": true + } + ] + }, + { + "name": "c50-health_center", "friendly": "VHT Area", "contact_type": "person", "user_role": ["vht"], @@ -24,9 +111,9 @@ "deactivate_users_on_replace": true, "hierarchy": [ { - "friendly_name": "Health Center", - "property_name": "HEALTHCENTER", - "contact_type": "district_hospital", + "friendly_name": "Parish", + "property_name": "PARISH", + "contact_type": "c40-parish", "type": "name", "required": true, "parameter": ["\\sH[ /]*C\\s"], @@ -49,14 +136,6 @@ "required": true, "unique": "parent" }, - - { - "friendly_name": "District", - "property_name": "district", - "type": "name", - "parameter": ["\\sdistrict\\s"], - "required": true - }, { "friendly_name": "Sub District", "property_name": "sub_district", @@ -78,13 +157,6 @@ "parameter": ["\\ssub\\s", "\\scounty\\s"], "required": true }, - { - "friendly_name": "Parish", - "property_name": "parish", - "parameter": ["\\sparish\\s"], - "type": "name", - "required": true - }, { "friendly_name": "Village", "property_name": "village", diff --git a/src/lib/cht-session.ts b/src/lib/cht-session.ts index ae98e694..e542cbe5 100644 --- a/src/lib/cht-session.ts +++ b/src/lib/cht-session.ts @@ -29,6 +29,7 @@ export default class ChtSession { public readonly axiosInstance: AxiosInstance; public readonly sessionToken: string; public readonly chtCoreVersion: string; + public readonly isAdmin: boolean; private constructor(creationDetails: SessionCreationDetails) { this.authInfo = creationDetails.authInfo; @@ -36,6 +37,7 @@ export default class ChtSession { this.facilityIds = creationDetails.facilityIds; this.sessionToken = creationDetails.sessionToken; this.chtCoreVersion = creationDetails.chtCoreVersion; + this.isAdmin = this.facilityIds.includes(ADMIN_FACILITY_ID); this.axiosInstance = axios.create({ baseURL: ChtSession.createUrl(creationDetails.authInfo, ''), @@ -47,10 +49,6 @@ export default class ChtSession { } } - public get isAdmin(): boolean { - return this.facilityIds.includes(ADMIN_FACILITY_ID); - } - public static async create(authInfo: AuthenticationInfo, username : string, password: string): Promise { const sessionToken = await ChtSession.createSessionToken(authInfo, username, password); diff --git a/src/liquid/app/config_upload.html b/src/liquid/app/config_upload.html new file mode 100644 index 00000000..7d61e8ea --- /dev/null +++ b/src/liquid/app/config_upload.html @@ -0,0 +1,67 @@ +
+
+
+ + {% if errors %} +
+ {{errors.message}} +
+ {% endif %} + +
+ +

+
+
+ +
+
+ Cancel +
+
+
+ +
+ +
+
+ This action will override the current configuration. + For more infomation on how to create a configuration file see + documentation +
+
+ + +
+
+
\ No newline at end of file diff --git a/src/liquid/app/form_switch.html b/src/liquid/app/form_switch.html index bb7d5a0c..e2f13094 100644 --- a/src/liquid/app/form_switch.html +++ b/src/liquid/app/form_switch.html @@ -6,6 +6,7 @@ {% elsif op == "merge" %} Merge Two {% elsif op == "delete" %} Delete a {% elsif op == "edit" %} Edit + {% elsif op == "config" %} Upload Configuration file {% else %} New {% endif %} {% endcapture %} @@ -40,6 +41,8 @@ {% include "place/bulk_create_form.html" %} {% elsif op == "move" or op == "merge" or op == "delete" %} {% include "place/manage_hierarchy_form.html" %} + {% elsif op == "config" %} + {% include "app/config_upload.html" %} {% else %} {% include "place/create_form.html" %} {% endif %} diff --git a/src/liquid/app/nav.html b/src/liquid/app/nav.html index 802e88d4..76e1bcbc 100644 --- a/src/liquid/app/nav.html +++ b/src/liquid/app/nav.html @@ -77,7 +77,13 @@
{% include "components/button_upload.html" className="navbar-item" %} - {% include "components/button_save_credentials.html" className="navbar-item" %} + {% include "components/button_save_credentials.html" className="navbar-item" %} +
+ {% if session.isAdmin %} + + settings Upload Config + + {% endif %} logout Logout diff --git a/src/routes/app.ts b/src/routes/app.ts index 96411dd2..d42c7c0a 100644 --- a/src/routes/app.ts +++ b/src/routes/app.ts @@ -41,7 +41,7 @@ export default async function sessionCache(fastify: FastifyInstance) { return resp.view('src/liquid/app/view.html', tmplData); }); - + fastify.get('/app/list', async (req, resp) => { const contactTypes = Config.contactTypes(); const sessionCache: SessionCache = req.sessionCache; @@ -111,9 +111,48 @@ export default async function sessionCache(fastify: FastifyInstance) { expires: Auth.cookieExpiry(), path: '/', secure: true, - + }); - + resp.header('HX-Redirect', '/'); }); + + fastify.get('/app/config', async (req, resp) => { + const contactTypes = Config.contactTypes(); + const placeData = contactTypes.map((item) => { + return { + ...item, + hierarchy: Config.getHierarchyWithReplacement(item, 'desc'), + userRoleProperty: Config.getUserRoleConfig(item), + }; + }); + const tmplData = { + view: 'add', + logo: Config.getLogoBase64(), + session: req.chtSession, + op: 'config', + contactTypes, + }; + + return resp.view('src/liquid/app/view.html', tmplData); + }); + + fastify.post('/app/config', async (req, res) => { + try { + const fileData = await req.file(); + if (!fileData) { + throw Error('no file data'); + } + + //const csvBuf = await fileData.toBuffer(); + //await PlaceFactory.createFromCsv(csvBuf, contactType, sessionCache, chtApi); + res.header('HX-Redirect', '/'); + } catch (error) { + return fastify.view('src/liquid/app/config_upload.html', { + errors: { + message: error, + }, + }); + } + }); } diff --git a/src/server.ts b/src/server.ts index 75790858..f16025f2 100644 --- a/src/server.ts +++ b/src/server.ts @@ -71,6 +71,10 @@ const build = (opts: FastifyServerOptions): FastifyInstance => { try { const chtSession = Auth.createCookieSession(cookieToken); + if (!chtSession?.isAdmin && req.routeOptions.url === '/app/config') { + reply.status(401).send({ error: 'unauthorized' }); + throw new Error('Unauthorized access to config. User must be admin'); + } req.chtSession = chtSession; req.sessionCache = SessionCache.getForSession(chtSession); } catch (e) { From 8c4f3c808cf5ad607ecf4a37368d5dd075014c9c Mon Sep 17 00:00:00 2001 From: jonathanbataire Date: Tue, 14 Jan 2025 10:01:46 +0300 Subject: [PATCH 02/11] working version --- package-lock.json | 21 ++++---- package.json | 2 +- src/config/chis-ke/gross.ts | 2 +- src/config/chis-ug/config.json | 87 ---------------------------------- src/config/config-factory.ts | 51 ++++++++++++++++++-- src/config/index.ts | 39 ++++++++++----- src/lib/remote-place-cache.ts | 2 +- src/liquid/app/nav.html | 2 +- src/routes/add-place.ts | 9 ++-- src/routes/app.ts | 45 ++++++++++-------- src/routes/authentication.ts | 2 +- src/routes/files.ts | 6 +-- src/routes/manage-hierarchy.ts | 4 +- src/routes/search.ts | 4 +- 14 files changed, 122 insertions(+), 154 deletions(-) diff --git a/package-lock.json b/package-lock.json index ecefb0a6..8c677317 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@fastify/cookie": "^9.2.0", "@fastify/env": "^4.2.0", "@fastify/formbody": "^7.4.0", - "@fastify/multipart": "^8.0.0", + "@fastify/multipart": "^8.3.0", "@fastify/static": "^7.0.1", "@fastify/view": "^8.2.0", "@types/html-minifier": "^4.0.5", @@ -266,11 +266,9 @@ "license": "MIT" }, "node_modules/@fastify/busboy": { - "version": "1.2.1", - "license": "MIT", - "dependencies": { - "text-decoding": "^1.0.0" - }, + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz", + "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==", "engines": { "node": ">=14" } @@ -343,10 +341,11 @@ } }, "node_modules/@fastify/multipart": { - "version": "8.1.0", - "license": "MIT", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@fastify/multipart/-/multipart-8.3.0.tgz", + "integrity": "sha512-A8h80TTyqUzaMVH0Cr9Qcm6RxSkVqmhK/MVBYHYeRRSUbUYv08WecjWKSlG2aSnD4aGI841pVxAjC+G1GafUeQ==", "dependencies": { - "@fastify/busboy": "^1.0.0", + "@fastify/busboy": "^2.1.0", "@fastify/deepmerge": "^1.0.0", "@fastify/error": "^3.0.0", "fastify-plugin": "^4.0.0", @@ -6682,10 +6681,6 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, - "node_modules/text-decoding": { - "version": "1.0.0", - "license": "MIT" - }, "node_modules/text-table": { "version": "0.2.0", "license": "MIT" diff --git a/package.json b/package.json index 462b7415..8ddfe11f 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@fastify/cookie": "^9.2.0", "@fastify/env": "^4.2.0", "@fastify/formbody": "^7.4.0", - "@fastify/multipart": "^8.0.0", + "@fastify/multipart": "^8.3.0", "@fastify/static": "^7.0.1", "@fastify/view": "^8.2.0", "@types/html-minifier": "^4.0.5", diff --git a/src/config/chis-ke/gross.ts b/src/config/chis-ke/gross.ts index 41a20f2a..cafc13f1 100644 --- a/src/config/chis-ke/gross.ts +++ b/src/config/chis-ke/gross.ts @@ -30,7 +30,7 @@ export default async function mutate(payload: PlacePayload, chtApi: ChtApi, isRe payload[chpKey] = result; }; - const contactType = Config.getContactType(payload.contact_type); + const contactType = await Config.getContactType(payload.contact_type); const { parent: chu, sibling } = await chtApi.getParentAndSibling(payload.parent, contactType); if (!chu && !sibling) { throw Error(`CHU does not exist`); diff --git a/src/config/chis-ug/config.json b/src/config/chis-ug/config.json index f5dd055d..fbbfd50e 100644 --- a/src/config/chis-ug/config.json +++ b/src/config/chis-ug/config.json @@ -15,93 +15,6 @@ } ], "contact_types": [ - { - "name": "c40-parish", - "friendly": "Parish", - "contact_type": "person", - "user_role": ["chew"], - "username_from_place": true, - "deactivate_users_on_replace": true, - "hierarchy": [ - { - "friendly_name": "Health Facility", - "property_name": "HEALTHFACILITY", - "contact_type": "c30-district_hospital", - "type": "name", - "required": true, - "parameter": ["\\sH[ /]*F\\s"], - "level": 1 - } - ], - "replacement_property": { - "friendly_name": "Outgoing CHEW", - "property_name": "REPLACEMENT", - "type": "name", - "required": true - }, - "place_properties": [ - { - "friendly_name": "Parish Name", - "property_name": "name", - "type": "name", - "required": true, - "unique": "parent" - }, - { - "friendly_name": "Sub District", - "property_name": "sub_district", - "parameter": ["\\ssub\\s", "\\sdistrict\\s"], - "type": "name", - "required": false - }, - { - "friendly_name": "County", - "property_name": "county", - "type": "name", - "parameter": ["\\scounty\\s"], - "required": true - }, - { - "friendly_name": "Sub County", - "property_name": "sub_county", - "type": "name", - "parameter": ["\\ssub\\s", "\\scounty\\s"], - "required": true - } - ], - "contact_properties": [ - { - "friendly_name": "CHEW Name", - "property_name": "name", - "type": "name", - "required": true - }, - { - "friendly_name": "Phone Number", - "property_name": "phone", - "type": "phone", - "parameter": "UG", - "required": true, - "unique": "all" - }, - { - "friendly_name": "Date of Birth", - "property_name": "date_of_birth", - "type": "dob", - "required": true - }, - { - "friendly_name": "Sex", - "property_name": "sex", - "type": "select_one", - "parameter": { - "male": "Male", - "female": "Female" - }, - "required": true - } - ] - }, { "name": "c50-health_center", "friendly": "VHT Area", diff --git a/src/config/config-factory.ts b/src/config/config-factory.ts index 243b865b..e1d1fbf4 100644 --- a/src/config/config-factory.ts +++ b/src/config/config-factory.ts @@ -1,24 +1,65 @@ -import { PartnerConfig } from '.'; +import { Config, ConfigSystem, PartnerConfig } from '.'; import ugandaConfig from './chis-ug'; import kenyaConfig from './chis-ke'; import togoConfig from './chis-tg'; import civConfig from './chis-civ'; +import path from 'path'; +import fs from 'fs'; -export const CONFIG_MAP: { [key: string]: PartnerConfig } = { +export const uploadedConfigFilePath: string = path.join(getConfigUploadDirectory(), 'config.json'); + + +export const DEFAULT_CONFIG_MAP: { [key: string]: PartnerConfig } = { 'CHIS-KE': kenyaConfig, 'CHIS-UG': ugandaConfig, 'CHIS-TG': togoConfig, 'CHIS-CIV': civConfig }; -export default function getConfigByKey(key: string = 'CHIS-KE'): PartnerConfig { +export default async function getConfigByKey(key: string = 'CHIS-KE'): Promise { + if (fs.existsSync(uploadedConfigFilePath)) { + const uploadedConfig = await readConfig(); + await Config.assertValid(uploadedConfig); + console.log(`Using uploaded configuration: ${uploadedConfigFilePath}`); + return uploadedConfig; + } + const usingKey = key.toUpperCase(); console.log(`Using configuration: ${key}`); - const result = CONFIG_MAP[usingKey]; + const result = DEFAULT_CONFIG_MAP[usingKey]; if (!result) { - const available = JSON.stringify(Object.keys(CONFIG_MAP)); + const available = JSON.stringify(Object.keys(DEFAULT_CONFIG_MAP)); throw Error(`Failed to start: Cannot find configuration "${usingKey}". Configurations available are ${available}`); } return result; } + +export function getConfigUploadDirectory (): string { + const configDir = path.join(__dirname,'..', 'config_uploads'); + if(!fs.existsSync(configDir)) { + fs.mkdirSync(configDir); + } + return configDir; +} + +export async function writeConfig(jsonConfigData: ConfigSystem): Promise { + try { + const jsonString: string = JSON.stringify(jsonConfigData, null, 2); + await fs.promises.writeFile(uploadedConfigFilePath, jsonString); + } catch (error) { + throw new Error('writeConfig: Failed to write file'); + } +} + +export async function readConfig(): Promise { + try { + const fileContent = await fs.promises.readFile(uploadedConfigFilePath, 'utf-8'); + + const config = JSON.parse(fileContent); + return { config }; + } catch (error) { + console.error('readConfig:Failed to read config file:', error); + throw error; + } +} diff --git a/src/config/index.ts b/src/config/index.ts index 5b2bd4de..e17fb556 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -69,18 +69,21 @@ const { CHT_DEV_HTTP } = process.env; -const partnerConfig = getConfigByKey(CONFIG_NAME); -const { config } = partnerConfig; +async function init(): Promise { + return await getConfigByKey(CONFIG_NAME); +} export class Config { private constructor() {} - public static contactTypes(): ContactType[] { + public static async contactTypes(): Promise { + const {config} = await init(); return config.contact_types; } - public static getContactType(name: string) : ContactType { - const contactMatch = config.contact_types.find(c => c.name === name); + public static async getContactType(name: string) : Promise { + const {config} = await init(); + const contactMatch = config.contact_types.find(c => c?.name === name); if (!contactMatch) { throw new Error(`unrecognized contact type: "${name}"`); } @@ -90,7 +93,7 @@ export class Config { public static getParentProperty(contactType: ContactType): HierarchyConstraint { const parentMatch = contactType.hierarchy.find(c => c.level === 1); if (!parentMatch) { - throw new Error(`hierarchy at level 1 is required: "${contactType.name}"`); + throw new Error(`hierarchy at level 1 is required: "${contactType?.name}"`); } return parentMatch; @@ -136,18 +139,20 @@ export class Config { } public static async mutate(payload: PlacePayload, chtApi: ChtApi, isReplacement: boolean): Promise { + const partnerConfig = await init(); return partnerConfig.mutate && partnerConfig.mutate(payload, chtApi, isReplacement); } - public static getAuthenticationInfo(domain: string) : AuthenticationInfo { - const domainMatch = Config.getDomains().find(c => c.domain === domain); + public static async getAuthenticationInfo(domain: string) : Promise { + const domainMatch = (await Config.getDomains()).find(c => c.domain === domain); if (!domainMatch) { throw new Error(`unrecognized domain: "${domain}"`); } return domainMatch; } - public static getLogoBase64() : string { + public static async getLogoBase64() : Promise { + const {config} = await init(); return config.logoBase64; } @@ -174,7 +179,8 @@ export class Config { ]; } - public static getDomains() : AuthenticationInfo[] { + public static async getDomains() : Promise { + const {config} = await init(); const domains = [...config.domains]; // because all .env vars imported as strings, let's get the AuthenticationInfo object a boolean @@ -194,15 +200,22 @@ export class Config { return _.sortBy(domains, 'friendly'); } - public static getUniqueProperties(contactTypeName: string): ContactProperty[] { + public static async getUniqueProperties(contactTypeName: string): Promise { + const {config} = await init(); const contactMatch = config.contact_types.find(c => c.name === contactTypeName); const uniqueProperties = contactMatch?.place_properties.filter(prop => prop.unique); return uniqueProperties || []; } // TODO: Joi? Chai? - public static assertValid({ config }: PartnerConfig = partnerConfig) { - for (const contactType of config.contact_types) { + public static async assertValid(config?: PartnerConfig) { + const { config: assertionConfig } = config || await init(); + + if (!assertionConfig.contact_types || assertionConfig.contact_types.length === 0) { + throw Error(`invalid configuration: 'contact_types' property is empty`); + } + + for (const contactType of assertionConfig.contact_types) { const allHierarchyProperties = [...contactType.hierarchy, contactType.replacement_property]; const allProperties = [ ...contactType.place_properties, diff --git a/src/lib/remote-place-cache.ts b/src/lib/remote-place-cache.ts index 90d4ee52..e730e14d 100644 --- a/src/lib/remote-place-cache.ts +++ b/src/lib/remote-place-cache.ts @@ -87,7 +87,7 @@ export default class RemotePlaceCache { // fetch docs of type and convert to RemotePlace private static async fetchRemotePlacesAtLevel(chtApi: ChtApi, hierarchyLevel: HierarchyConstraint): Promise { - const uniqueKeyProperties = Config.getUniqueProperties(hierarchyLevel.contact_type); + const uniqueKeyProperties = await Config.getUniqueProperties(hierarchyLevel.contact_type); const docs = await chtApi.getPlacesWithType(hierarchyLevel.contact_type); return docs.map((doc: any) => this.convertContactToRemotePlace(doc, uniqueKeyProperties, hierarchyLevel)); } diff --git a/src/liquid/app/nav.html b/src/liquid/app/nav.html index 76e1bcbc..64771de6 100644 --- a/src/liquid/app/nav.html +++ b/src/liquid/app/nav.html @@ -81,7 +81,7 @@
{% if session.isAdmin %} - settings Upload Config + settings Upload Configuration {% endif %} diff --git a/src/routes/add-place.ts b/src/routes/add-place.ts index 6f228ab0..aaff1a4b 100644 --- a/src/routes/add-place.ts +++ b/src/routes/add-place.ts @@ -13,9 +13,9 @@ export default async function addPlace(fastify: FastifyInstance) { fastify.get('/add-place', async (req, resp) => { const queryParams: any = req.query; - const contactTypes = Config.contactTypes(); + const contactTypes = await Config.contactTypes(); const contactType = queryParams.type - ? Config.getContactType(queryParams.type) + ? await Config.getContactType(queryParams.type) : contactTypes[contactTypes.length - 1]; const op = queryParams.op || 'new'; const tmplData = { @@ -34,7 +34,8 @@ export default async function addPlace(fastify: FastifyInstance) { fastify.post('/place/dob', async (req, resp) => { const { place_type, prefix, prop_type } = req.query as any; - const contactType = Config.getContactType(place_type).contact_properties.find(prop => prop.type === prop_type); + const config = await Config.getContactType(place_type); + const contactType = config.contact_properties.find(prop => prop.type === prop_type); return resp.view('src/liquid/components/contact_type_property.html', { data: req.body, include: { @@ -49,7 +50,7 @@ export default async function addPlace(fastify: FastifyInstance) { fastify.post('/place', async (req, resp) => { const { op, type: placeType } = req.query as any; - const contactType = Config.getContactType(placeType); + const contactType = await Config.getContactType(placeType); const sessionCache: SessionCache = req.sessionCache; const chtApi = new ChtApi(req.chtSession); if (op === 'new' || op === 'replace') { diff --git a/src/routes/app.ts b/src/routes/app.ts index d42c7c0a..ee3a1681 100644 --- a/src/routes/app.ts +++ b/src/routes/app.ts @@ -1,18 +1,19 @@ -import { FastifyInstance } from 'fastify'; +import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify'; import Auth from '../lib/authentication'; import { ChtApi } from '../lib/cht-api'; -import { Config } from '../config'; +import { Config, ConfigSystem, PartnerConfig } from '../config'; import DirectiveModel from '../services/directive-model'; import RemotePlaceCache from '../lib/remote-place-cache'; import RemotePlaceResolver from '../lib/remote-place-resolver'; import SessionCache from '../services/session-cache'; import { UploadManager } from '../services/upload-manager'; import WarningSystem from '../warnings'; +import { writeConfig } from '../config/config-factory'; export default async function sessionCache(fastify: FastifyInstance) { fastify.get('/', async (req, resp) => { - const contactTypes = Config.contactTypes(); + const contactTypes = await Config.contactTypes(); const { op = 'table', type: placeTypeName = contactTypes[0].name, @@ -43,7 +44,7 @@ export default async function sessionCache(fastify: FastifyInstance) { }); fastify.get('/app/list', async (req, resp) => { - const contactTypes = Config.contactTypes(); + const contactTypes = await Config.contactTypes(); const sessionCache: SessionCache = req.sessionCache; const directiveModel = new DirectiveModel(sessionCache, req.cookies.filter); const placeData = contactTypes.map((item) => { @@ -80,7 +81,7 @@ export default async function sessionCache(fastify: FastifyInstance) { await RemotePlaceResolver.resolve(places, sessionCache, chtApi, { fuzz: true }); places.forEach(p => p.validate()); - for (const contactType of Config.contactTypes()) { + for (const contactType of await Config.contactTypes()) { await WarningSystem.setWarnings(contactType, chtApi, sessionCache); } @@ -117,15 +118,8 @@ export default async function sessionCache(fastify: FastifyInstance) { resp.header('HX-Redirect', '/'); }); - fastify.get('/app/config', async (req, resp) => { - const contactTypes = Config.contactTypes(); - const placeData = contactTypes.map((item) => { - return { - ...item, - hierarchy: Config.getHierarchyWithReplacement(item, 'desc'), - userRoleProperty: Config.getUserRoleConfig(item), - }; - }); + fastify.get('/app/config', async (req: FastifyRequest, resp: FastifyReply) => { + const contactTypes = await Config.contactTypes(); const tmplData = { view: 'add', logo: Config.getLogoBase64(), @@ -137,17 +131,28 @@ export default async function sessionCache(fastify: FastifyInstance) { return resp.view('src/liquid/app/view.html', tmplData); }); - fastify.post('/app/config', async (req, res) => { + fastify.post('/app/config', async (req: FastifyRequest, res: FastifyReply) => { try { - const fileData = await req.file(); - if (!fileData) { - throw Error('no file data'); + const data = await req.file(); + if (!data) { + res.status(400).send('No file uploaded'); + throw new Error('No file uploaded'); + } + + if (data.mimetype !== 'application/json') { + res.status(400).send('Invalid file type'); + throw new Error('Invalid file type'); } - //const csvBuf = await fileData.toBuffer(); - //await PlaceFactory.createFromCsv(csvBuf, contactType, sessionCache, chtApi); + const fileBuffer = await data.toBuffer(); + const config = JSON.parse(fileBuffer.toString('utf-8')) as ConfigSystem; + + await Config.assertValid({ config }); + await writeConfig(config); + res.header('HX-Redirect', '/'); } catch (error) { + console.error('Route app/config: ', error); return fastify.view('src/liquid/app/config_upload.html', { errors: { message: error, diff --git a/src/routes/authentication.ts b/src/routes/authentication.ts index 6b2f633c..02163f8d 100644 --- a/src/routes/authentication.ts +++ b/src/routes/authentication.ts @@ -30,7 +30,7 @@ export default async function authentication(fastify: FastifyInstance) { const data: any = req.body; const { username, password, domain } = data; - const authInfo = Config.getAuthenticationInfo(domain); + const authInfo = await Config.getAuthenticationInfo(domain); let chtSession; try { chtSession = await ChtSession.create(authInfo, username, password); diff --git a/src/routes/files.ts b/src/routes/files.ts index 73ed7988..d00636df 100644 --- a/src/routes/files.ts +++ b/src/routes/files.ts @@ -20,7 +20,7 @@ export default async function files(fastify: FastifyInstance) { const sessionCache: SessionCache = req.sessionCache; const zip = new JSZip(); - const files = getCredentialsFiles(sessionCache, Config.contactTypes()); + const files = getCredentialsFiles(sessionCache, await Config.contactTypes()); for (const file of files) { zip.file(file.filename, file.content); } @@ -30,8 +30,8 @@ export default async function files(fastify: FastifyInstance) { }); } -function getCsvTemplateColumns(placeType: string) { - const placeTypeConfig = Config.getContactType(placeType); +async function getCsvTemplateColumns(placeType: string) { + const placeTypeConfig = await Config.getContactType(placeType); const hierarchy = Config.getHierarchyWithReplacement(placeTypeConfig); const userRoleConfig = Config.getUserRoleConfig(placeTypeConfig); diff --git a/src/routes/manage-hierarchy.ts b/src/routes/manage-hierarchy.ts index 7dec55f5..ce7e8448 100644 --- a/src/routes/manage-hierarchy.ts +++ b/src/routes/manage-hierarchy.ts @@ -11,7 +11,7 @@ export default async function sessionCache(fastify: FastifyInstance) { const placeType = params.placeType; const contactTypes = Config.contactTypes(); - const contactType = Config.getContactType(placeType); + const contactType = await Config.getContactType(placeType); const tmplData = { view: 'manage-hierarchy', op: params.action, @@ -29,7 +29,7 @@ export default async function sessionCache(fastify: FastifyInstance) { const formData:any = req.body; const sessionCache: SessionCache = req.sessionCache; - const contactType = Config.getContactType(formData.place_type); + const contactType = await Config.getContactType(formData.place_type); const chtApi = new ChtApi(req.chtSession); const tmplData: any = { diff --git a/src/routes/search.ts b/src/routes/search.ts index c39c92b1..3e6557d7 100644 --- a/src/routes/search.ts +++ b/src/routes/search.ts @@ -23,7 +23,7 @@ export default async function place(fastify: FastifyInstance) { const data: any = req.body; - const contactType = Config.getContactType(type); + const contactType = await Config.getContactType(type); const sessionCache: SessionCache = req.sessionCache; const place = sessionCache.getPlace(placeId); if (!place && op === 'edit') { @@ -64,7 +64,7 @@ export default async function place(fastify: FastifyInstance) { throw new Error('result must be known'); } - const contactType = Config.getContactType(data.place_type); + const contactType = await Config.getContactType(data.place_type); let moveModel; if (HIERARCHY_ACTIONS.includes(op)) { moveModel = hierarchyViewModel(op, contactType); From b4496f6b4c0cd49a62f1395bb61edcd683601f4d Mon Sep 17 00:00:00 2001 From: jonathanbataire Date: Tue, 14 Jan 2025 11:04:22 +0300 Subject: [PATCH 03/11] fix tests --- src/config/config-factory.ts | 4 +-- src/routes/app.ts | 2 +- test/config.spec.ts | 43 ++++++++++++---------------- test/lib/manage-hierarchy.spec.ts | 12 ++++---- test/mocks.ts | 2 +- test/services/place-factory.spec.ts | 2 +- test/services/upload-manager.spec.ts | 2 +- test/warnings.spec.ts | 22 +++++++------- 8 files changed, 41 insertions(+), 48 deletions(-) diff --git a/src/config/config-factory.ts b/src/config/config-factory.ts index e1d1fbf4..e6e1c1ed 100644 --- a/src/config/config-factory.ts +++ b/src/config/config-factory.ts @@ -36,8 +36,8 @@ export default async function getConfigByKey(key: string = 'CHIS-KE'): Promise

({ @@ -18,25 +18,22 @@ describe('config', () => { Config.assertValid(mockConfig); }); - it('assert on unknown property type', () => { + it('assert on unknown property type', async () => { const mockConfig = mockPartnerConfig(); mockConfig.config.contact_types[0].hierarchy[0].type = 'unknown'; - const assertion = () => Config.assertValid(mockConfig); - expect(assertion).to.throw('type "unknown"'); + await expect(Config.assertValid(mockConfig)).to.be.rejectedWith('type "unknown"'); }); - it('place name is always required', () => { + it('place name is always required', async () => { const mockConfig = mockPartnerConfig(); mockConfig.config.contact_types[0].place_properties.shift(); - const assertion = () => Config.assertValid(mockConfig); - expect(assertion).to.throw('"name"'); + await expect(Config.assertValid(mockConfig)).to.be.rejectedWith('"name"'); }); - it('contact name is always required', () => { + it('contact name is always required', async () => { const mockConfig = mockPartnerConfig(); mockConfig.config.contact_types[0].contact_properties.shift(); - const assertion = () => Config.assertValid(mockConfig); - expect(assertion).to.throw('"name"'); + await expect(Config.assertValid(mockConfig)).to.be.rejectedWith('"name"'); }); it('contact_properties can have unique attributes', () => { @@ -45,38 +42,34 @@ describe('config', () => { Config.assertValid(mockConfig); }); - it('hierarchy properties cannot have unique attributes', () => { + it('hierarchy properties cannot have unique attributes', async () => { const mockConfig = mockPartnerConfig(); mockConfig.config.contact_types[0].hierarchy[0].unique = 'parent'; - const assertion = () => Config.assertValid(mockConfig); - expect(assertion).to.throw('with "unique" values'); + await expect(Config.assertValid(mockConfig)).to.be.rejectedWith('with "unique" values'); }); - it('parent hierarchy level is required', () => { + it('parent hierarchy level is required',async () => { const mockConfig = mockPartnerConfig(); mockConfig.config.contact_types[0].hierarchy[0].level = 2; - const assertion = () => Config.assertValid(mockConfig); - expect(assertion).to.throw('with parent level'); + await expect(Config.assertValid(mockConfig)).to.be.rejectedWith('with parent level'); }); - it('#124 - cannot have generated property in hierarchy', () => { + it('#124 - cannot have generated property in hierarchy', async () => { const mockConfig = mockPartnerConfig(); mockConfig.config.contact_types[0].hierarchy[0].type = 'generated'; - const assertion = () => Config.assertValid(mockConfig); - expect(assertion).to.throw('cannot be of type "generated"'); + await expect(Config.assertValid(mockConfig)).to.be.rejectedWith('cannot be of type "generated"'); }); - it('#124 - cannot have generated property as replacement_property', () => { + it('#124 - cannot have generated property as replacement_property', async () => { const mockConfig = mockPartnerConfig(); mockConfig.config.contact_types[0].replacement_property.type = 'generated'; - const assertion = () => Config.assertValid(mockConfig); - expect(assertion).to.throw('cannot be of type "generated"'); + await expect(Config.assertValid(mockConfig)).to.be.rejectedWith('cannot be of type "generated"'); }); - const configs = Object.entries(CONFIG_MAP); + const configs = Object.entries(DEFAULT_CONFIG_MAP); for (const [configName, partnerConfig] of configs) { - it(`config ${configName} is valid`, () => { - Config.assertValid(partnerConfig); + it(`config ${configName} is valid`, async () => { + await Config.assertValid(partnerConfig); }); } }); diff --git a/test/lib/manage-hierarchy.spec.ts b/test/lib/manage-hierarchy.spec.ts index edb12c12..3b5fefee 100644 --- a/test/lib/manage-hierarchy.spec.ts +++ b/test/lib/manage-hierarchy.spec.ts @@ -44,7 +44,7 @@ describe('lib/manage-hierarchy.ts', () => { source_SUBCOUNTY: 'from sub', destination_SUBCOUNTY: 'to sub', }; - const contactType = Config.getContactType('c_community_health_unit'); + const contactType = await Config.getContactType('c_community_health_unit'); const sessionCache = new SessionCache(); const jobParams = await ManageHierarchyLib.getJobDetails(formData, contactType, sessionCache, chtApiWithDocs()); @@ -64,7 +64,7 @@ describe('lib/manage-hierarchy.ts', () => { source_replacement: 'c-h-u', destination_SUBCOUNTY: 'to sub', }; - const contactType = Config.getContactType('c_community_health_unit'); + const contactType = await Config.getContactType('c_community_health_unit'); const sessionCache = new SessionCache(); const actual = ManageHierarchyLib.getJobDetails(formData, contactType, sessionCache, mockChtApi([], chuDocs)); @@ -78,7 +78,7 @@ describe('lib/manage-hierarchy.ts', () => { source_SUBCOUNTY: 'from SUB', destination_SUBCOUNTY: 'from sub', }; - const contactType = Config.getContactType('c_community_health_unit'); + const contactType = await Config.getContactType('c_community_health_unit'); const sessionCache = new SessionCache(); const actual = ManageHierarchyLib.getJobDetails(formData, contactType, sessionCache, chtApiWithDocs()); @@ -92,7 +92,7 @@ describe('lib/manage-hierarchy.ts', () => { source_SUBCOUNTY: 'from SUB', destination_SUBCOUNTY: 'invalid sub', }; - const contactType = Config.getContactType('c_community_health_unit'); + const contactType = await Config.getContactType('c_community_health_unit'); const sessionCache = new SessionCache(); const actual = ManageHierarchyLib.getJobDetails(formData, contactType, sessionCache, chtApiWithDocs()); @@ -109,7 +109,7 @@ describe('lib/manage-hierarchy.ts', () => { destination_SUBCOUNTY: 'to sub', destination_replacement: 'destination', }; - const contactType = Config.getContactType('c_community_health_unit'); + const contactType = await Config.getContactType('c_community_health_unit'); const sessionCache = new SessionCache(); const jobParams = await ManageHierarchyLib.getJobDetails(formData, contactType, sessionCache, chtApiWithDocs()); @@ -131,7 +131,7 @@ describe('lib/manage-hierarchy.ts', () => { source_replacement: 'c-h-u', source_SUBCOUNTY: 'from sub' }; - const contactType = Config.getContactType('c_community_health_unit'); + const contactType = await Config.getContactType('c_community_health_unit'); const sessionCache = new SessionCache(); const jobParams = await ManageHierarchyLib.getJobDetails(formData, contactType, sessionCache, chtApiWithDocs()); diff --git a/test/mocks.ts b/test/mocks.ts index aaca2eba..e1852bf5 100644 --- a/test/mocks.ts +++ b/test/mocks.ts @@ -86,7 +86,7 @@ export const mockSimpleContactType = ( }; export async function createChu(subcounty: ChtDoc, chu_name: string, sessionCache: any, chtApi: ChtApi, dataOverrides?: any): Promise { - const chuType = Config.getContactType('c_community_health_unit'); + const chuType = await Config.getContactType('c_community_health_unit'); const chuData = Object.assign({ hierarchy_SUBCOUNTY: subcounty.name, place_name: chu_name, diff --git a/test/services/place-factory.spec.ts b/test/services/place-factory.spec.ts index 48e0eb60..8eccc916 100644 --- a/test/services/place-factory.spec.ts +++ b/test/services/place-factory.spec.ts @@ -122,7 +122,7 @@ describe('services/place-factory.ts', () => { .onThirdCall().resolves([toReplace]); const singleCsvBuffer = fs.readFileSync('./test/single-replace.csv'); - const chpType = Config.getContactType('d_community_health_volunteer_area'); + const chpType = await Config.getContactType('d_community_health_volunteer_area'); const places: Place[] = await PlaceFactory.createFromCsv(singleCsvBuffer, chpType, sessionCache, chtApi); expect(places).to.have.property('length', 1); diff --git a/test/services/upload-manager.spec.ts b/test/services/upload-manager.spec.ts index b0833829..defbd3d9 100644 --- a/test/services/upload-manager.spec.ts +++ b/test/services/upload-manager.spec.ts @@ -186,7 +186,7 @@ describe('services/upload-manager.ts', () => { .onSecondCall().resolves([]); const chu_name = 'new chu'; - const chpType = Config.getContactType('d_community_health_volunteer_area'); + const chpType = await Config.getContactType('d_community_health_volunteer_area'); const chpData = { hierarchy_CHU: chu_name, place_name: 'new chp', diff --git a/test/warnings.spec.ts b/test/warnings.spec.ts index 659bc1bb..17311e80 100644 --- a/test/warnings.spec.ts +++ b/test/warnings.spec.ts @@ -76,7 +76,7 @@ describe('warnings', () => { const sessionCache = new SessionCache(); const chtApi = mockChtApi([subcounty], [chuDoc], [chpDoc]); - const chuType = Config.getContactType('d_community_health_volunteer_area'); + const chuType = await Config.getContactType('d_community_health_volunteer_area'); const chpData = { hierarchy_SUBCOUNTY: subcounty.name, hierarchy_CHU: chuDoc.name, @@ -94,7 +94,7 @@ describe('warnings', () => { const sessionCache = new SessionCache(); const chtApi = mockChtApi([subcounty], [chuDoc], [chpDoc]); - const chuType = Config.getContactType('d_community_health_volunteer_area'); + const chuType = await Config.getContactType('d_community_health_volunteer_area'); const chpData: any = { hierarchy_SUBCOUNTY: subcounty.name, hierarchy_CHU: chuDoc.name, @@ -120,7 +120,7 @@ describe('warnings', () => { const sessionCache = new SessionCache(); const chtApi = mockChtApi([subcounty], [chuDoc], [chpDoc]); - const chuType = Config.getContactType('d_community_health_volunteer_area'); + const chuType = await Config.getContactType('d_community_health_volunteer_area'); const chpData: any = { hierarchy_SUBCOUNTY: subcounty.name, hierarchy_CHU: chuDoc.name, @@ -145,7 +145,7 @@ describe('warnings', () => { const sessionCache = new SessionCache(); const chtApi = mockChtApi([subcounty], [chuDoc], [chpDoc]); - const chuType = Config.getContactType('d_community_health_volunteer_area'); + const chuType = await Config.getContactType('d_community_health_volunteer_area'); const chpData: any = { hierarchy_SUBCOUNTY: subcounty.name, hierarchy_CHU: chuDoc.name, @@ -193,7 +193,7 @@ describe('warnings', () => { const sessionCache = new SessionCache(); const chtApi = mockChtApi([subcounty], [chuDoc], [chpDoc]); - const chuType = Config.getContactType('d_community_health_volunteer_area'); + const chuType = await Config.getContactType('d_community_health_volunteer_area'); const chuData = { hierarchy_SUBCOUNTY: subcounty.name, hierarchy_CHU: chuDoc.name, @@ -209,7 +209,7 @@ describe('warnings', () => { const sessionCache = new SessionCache(); const chtApi = mockChtApi([subcounty], [chuDoc], [chpDoc]); - const chuType = Config.getContactType('d_community_health_volunteer_area'); + const chuType = await Config.getContactType('d_community_health_volunteer_area'); const chpData: any = { hierarchy_SUBCOUNTY: subcounty.name, hierarchy_CHU: 'dne1', @@ -235,7 +235,7 @@ describe('warnings', () => { const chtApi = mockChtApi([subcounty], [chuDoc], []); const singleCsvBuffer = fs.readFileSync('./test/multiple.csv'); - const chpType = Config.getContactType('d_community_health_volunteer_area'); + const chpType = await Config.getContactType('d_community_health_volunteer_area'); const places: Place[] = await PlaceFactory.createFromCsv(singleCsvBuffer, chpType, sessionCache, chtApi); expect(places).to.have.property('length', 2); @@ -250,7 +250,7 @@ describe('warnings', () => { const sessionCache = new SessionCache(); const chtApi = mockChtApi([subcounty], [chuDoc], [chpDoc]); - const chuType = Config.getContactType('d_community_health_volunteer_area'); + const chuType = await Config.getContactType('d_community_health_volunteer_area'); const chpData = { hierarchy_SUBCOUNTY: subcounty.name, hierarchy_CHU: chuDoc.name, @@ -275,7 +275,7 @@ describe('warnings', () => { const sessionCache = new SessionCache(); const chtApi = mockChtApi([subcounty], [chuDoc], [chpDoc]); - const chuType = Config.getContactType('d_community_health_volunteer_area'); + const chuType = await Config.getContactType('d_community_health_volunteer_area'); const chpData = { hierarchy_SUBCOUNTY: subcounty.name, hierarchy_CHU: chuDoc.name, @@ -297,7 +297,7 @@ describe('warnings', () => { it('warn if a created place has same phone number as staged place', async () => { const sessionCache = new SessionCache(); const chtApi = mockChtApi([subcounty], [chuDoc], []); - const chuType = Config.getContactType('d_community_health_volunteer_area'); + const chuType = await Config.getContactType('d_community_health_volunteer_area'); const chpData = { hierarchy_SUBCOUNTY: subcounty.name, hierarchy_CHU: chuDoc.name, @@ -330,7 +330,7 @@ describe('warnings', () => { }; const chtApi = mockChtApi([subcounty], [chuDoc, secondChu]); - const chuType = Config.getContactType('c_community_health_unit'); + const chuType = await Config.getContactType('c_community_health_unit'); const chuData = { hierarchy_SUBCOUNTY: subcounty.name, hierarchy_replacement: chuDoc.name, From 049792ac3ff94e4e65847bc831a8482bdb73e6ec Mon Sep 17 00:00:00 2001 From: jonathanbataire Date: Tue, 14 Jan 2025 11:05:52 +0300 Subject: [PATCH 04/11] lint fix --- test/config.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/config.spec.ts b/test/config.spec.ts index a2811af0..096b5f65 100644 --- a/test/config.spec.ts +++ b/test/config.spec.ts @@ -48,7 +48,7 @@ describe('config', () => { await expect(Config.assertValid(mockConfig)).to.be.rejectedWith('with "unique" values'); }); - it('parent hierarchy level is required',async () => { + it('parent hierarchy level is required', async () => { const mockConfig = mockPartnerConfig(); mockConfig.config.contact_types[0].hierarchy[0].level = 2; await expect(Config.assertValid(mockConfig)).to.be.rejectedWith('with parent level'); From 7816ae271d9095db402d9c3c20cbc34f626faf50 Mon Sep 17 00:00:00 2001 From: jonathanbataire Date: Tue, 14 Jan 2025 11:24:21 +0300 Subject: [PATCH 05/11] clean up html --- src/liquid/app/config_upload.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/liquid/app/config_upload.html b/src/liquid/app/config_upload.html index 7d61e8ea..b94b8218 100644 --- a/src/liquid/app/config_upload.html +++ b/src/liquid/app/config_upload.html @@ -5,8 +5,8 @@ hx-encoding='multipart/form-data' autocomplete="off" hx-post="/app/config" - hx-disabled-elt="button#place_create_submit, a#cancel" - hx-indicator="#place_create_submit_progress" + hx-disabled-elt="button#config_upload_submit, a#cancel" + hx-indicator="#config_upload_submit_progress" hx-target="this" hx-swap="outerHTML" > @@ -35,14 +35,14 @@


- +
Cancel
- +
From 25dea7386ea0dd638b9504afc061fdbd55c5ddd4 Mon Sep 17 00:00:00 2001 From: jonathanbataire Date: Tue, 14 Jan 2025 11:47:56 +0300 Subject: [PATCH 06/11] clean up --- src/server.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server.ts b/src/server.ts index f16025f2..c19ad36f 100644 --- a/src/server.ts +++ b/src/server.ts @@ -73,7 +73,8 @@ const build = (opts: FastifyServerOptions): FastifyInstance => { const chtSession = Auth.createCookieSession(cookieToken); if (!chtSession?.isAdmin && req.routeOptions.url === '/app/config') { reply.status(401).send({ error: 'unauthorized' }); - throw new Error('Unauthorized access to config. User must be admin'); + console.error('Unauthorized access to config. User must be admin'); + return; } req.chtSession = chtSession; req.sessionCache = SessionCache.getForSession(chtSession); From abbd43f6ca22e9fda8e1e36b5b290acbd8e0fb52 Mon Sep 17 00:00:00 2001 From: jonathanbataire Date: Thu, 20 Feb 2025 16:37:18 +0300 Subject: [PATCH 07/11] /config api --- src/config/index.ts | 4 +- src/lib/authentication.ts | 13 ++++++ src/liquid/app/config_upload.html | 67 ------------------------------- src/liquid/app/form_switch.html | 3 -- src/liquid/app/nav.html | 6 --- src/routes/api.ts | 37 +++++++++++++++++ src/routes/app.ts | 45 +-------------------- src/server.ts | 44 +++++++++++++++----- 8 files changed, 88 insertions(+), 131 deletions(-) delete mode 100644 src/liquid/app/config_upload.html create mode 100644 src/routes/api.ts diff --git a/src/config/index.ts b/src/config/index.ts index e17fb556..e8009a52 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -83,7 +83,7 @@ export class Config { public static async getContactType(name: string) : Promise { const {config} = await init(); - const contactMatch = config.contact_types.find(c => c?.name === name); + const contactMatch = config.contact_types.find(c => c.name === name); if (!contactMatch) { throw new Error(`unrecognized contact type: "${name}"`); } @@ -93,7 +93,7 @@ export class Config { public static getParentProperty(contactType: ContactType): HierarchyConstraint { const parentMatch = contactType.hierarchy.find(c => c.level === 1); if (!parentMatch) { - throw new Error(`hierarchy at level 1 is required: "${contactType?.name}"`); + throw new Error(`hierarchy at level 1 is required: "${contactType.name}"`); } return parentMatch; diff --git a/src/lib/authentication.ts b/src/lib/authentication.ts index c32c770a..aab5cbdc 100644 --- a/src/lib/authentication.ts +++ b/src/lib/authentication.ts @@ -1,6 +1,7 @@ import process from 'process'; import jwt from 'jsonwebtoken'; import ChtSession from './cht-session'; +import { Config } from '../config'; const LOGIN_EXPIRES_AFTER_MS = 4 * 24 * 60 * 60 * 1000; const QUEUE_SESSION_EXPIRATION = '96h'; @@ -57,4 +58,16 @@ export default class Auth { const { data } = jwt.verify(token, signingKey) as any; return ChtSession.createFromDataString(data); } + + public static async apiAuth (username: string, password: string, domain: string) { + const authInfo = await Config.getAuthenticationInfo(domain); + try { + const chtSession = await ChtSession.create(authInfo, username, password); + return chtSession; + } catch (e: any) { + console.error(`Login error: ${e}`); + return {}; + } + } + } diff --git a/src/liquid/app/config_upload.html b/src/liquid/app/config_upload.html deleted file mode 100644 index b94b8218..00000000 --- a/src/liquid/app/config_upload.html +++ /dev/null @@ -1,67 +0,0 @@ -
-
-
- - {% if errors %} -
- {{errors.message}} -
- {% endif %} - -
- -

-
-
- -
-
- Cancel -
-
-
- -
- -
-
- This action will override the current configuration. - For more infomation on how to create a configuration file see - documentation -
-
- - -
-
-
\ No newline at end of file diff --git a/src/liquid/app/form_switch.html b/src/liquid/app/form_switch.html index e2f13094..bb7d5a0c 100644 --- a/src/liquid/app/form_switch.html +++ b/src/liquid/app/form_switch.html @@ -6,7 +6,6 @@ {% elsif op == "merge" %} Merge Two {% elsif op == "delete" %} Delete a {% elsif op == "edit" %} Edit - {% elsif op == "config" %} Upload Configuration file {% else %} New {% endif %} {% endcapture %} @@ -41,8 +40,6 @@ {% include "place/bulk_create_form.html" %} {% elsif op == "move" or op == "merge" or op == "delete" %} {% include "place/manage_hierarchy_form.html" %} - {% elsif op == "config" %} - {% include "app/config_upload.html" %} {% else %} {% include "place/create_form.html" %} {% endif %} diff --git a/src/liquid/app/nav.html b/src/liquid/app/nav.html index 64771de6..56fb73ac 100644 --- a/src/liquid/app/nav.html +++ b/src/liquid/app/nav.html @@ -78,12 +78,6 @@
{% include "components/button_upload.html" className="navbar-item" %} {% include "components/button_save_credentials.html" className="navbar-item" %} -
- {% if session.isAdmin %} - - settings Upload Configuration - - {% endif %} logout Logout diff --git a/src/routes/api.ts b/src/routes/api.ts new file mode 100644 index 00000000..27e40aef --- /dev/null +++ b/src/routes/api.ts @@ -0,0 +1,37 @@ +import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify'; +import { readConfig, writeConfig } from '../config/config-factory'; +import { Config, ConfigSystem } from '../config'; + +export default async function api(fastify: FastifyInstance) { + fastify.get('/api', (req: FastifyRequest, reply: FastifyReply) => { + reply.status(200).send({ + name: 'UMT API', + version: '1.0', + status: 'healthy' + }); + }); + + fastify.get('/api/config', async (req: FastifyRequest, reply: FastifyReply) => { + try { + const { config } = await readConfig(); + reply.status(200); + return config; + } catch (error) { + reply.status(404).send({ message: 'No configuration found' }); + } + + }); + + fastify.post('/api/config', async (req: FastifyRequest, reply: FastifyReply) => { + try { + const config = await req.body as ConfigSystem; + await Config.assertValid({ config }); + await writeConfig(config); + reply.send({ message: 'configuration updated' }); + return; + } catch (error) { + console.error('Route api/config: ', error); + reply.send(error); + } + }); +} diff --git a/src/routes/app.ts b/src/routes/app.ts index cdbb37f0..6dc3092a 100644 --- a/src/routes/app.ts +++ b/src/routes/app.ts @@ -1,4 +1,4 @@ -import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify'; +import { FastifyInstance } from 'fastify'; import Auth from '../lib/authentication'; import { ChtApi } from '../lib/cht-api'; @@ -117,47 +117,4 @@ export default async function sessionCache(fastify: FastifyInstance) { resp.header('HX-Redirect', '/'); }); - - fastify.get('/app/config', async (req: FastifyRequest, resp: FastifyReply) => { - const contactTypes = await Config.contactTypes(); - const tmplData = { - view: 'add', - logo: Config.getLogoBase64(), - session: req.chtSession, - op: 'config', - contactTypes, - }; - - return resp.view('src/liquid/app/view.html', tmplData); - }); - - fastify.post('/app/config', async (req: FastifyRequest, res: FastifyReply) => { - try { - const data = await req.file(); - if (!data) { - res.status(400).send('No file uploaded'); - throw new Error('No file uploaded'); - } - - if (data.mimetype !== 'application/json') { - res.status(400).send('Invalid file type'); - throw new Error('Invalid file type'); - } - - const fileBuffer = await data.toBuffer(); - const config = JSON.parse(fileBuffer.toString('utf-8')) as ConfigSystem; - - await Config.assertValid({ config }); - await writeConfig(config); - - res.header('HX-Redirect', '/'); - } catch (error) { - console.error('Route app/config: ', error); - return fastify.view('src/liquid/app/config_upload.html', { - errors: { - message: error, - }, - }); - } - }); } diff --git a/src/server.ts b/src/server.ts index c19ad36f..70c0f18c 100644 --- a/src/server.ts +++ b/src/server.ts @@ -24,12 +24,12 @@ const build = (opts: FastifyServerOptions): FastifyInstance => { fastify.register(fastifyCompress); fastify.register(view, { engine: { - liquid: new Liquid({ - extname: '.html', - root: 'src/liquid', - cache: process.env.NODE_ENV === 'production', - jekyllInclude: true, - dynamicPartials: true + liquid: new Liquid({ + extname: '.html', + root: 'src/liquid', + cache: process.env.NODE_ENV === 'production', + jekyllInclude: true, + dynamicPartials: true }), }, }); @@ -44,7 +44,7 @@ const build = (opts: FastifyServerOptions): FastifyInstance => { prefix: '/public/', serve: true, }); - + fastify.register(metricsPlugin, { endpoint: '/metrics', routeMetrics: { @@ -63,6 +63,33 @@ const build = (opts: FastifyServerOptions): FastifyInstance => { return; } + const authHeader = req.headers.authorization as string; + const { domain } = req.query as { [key: string]: string }; + + if (authHeader && authHeader.startsWith('Basic ')) { + if (!req.routeOptions.url?.startsWith('/api')) { + reply.send({error: 'not found'}).status(404); + return; + } + + if (!domain) { + reply.send({ error: 'no authentication domain found' }); + return; + } + + const credentialsBase64 = authHeader.split(' ')[1]; + const credentials = Buffer.from(credentialsBase64, 'base64').toString('utf-8'); + const [username, password] = credentials.split(':'); + + const { isAdmin }: any = await Auth.apiAuth(username, password, domain); + + if (isAdmin) { + return; + } + reply.status(401).send({ error: 'unauthorized' }); + return; + } + const cookieToken = req.cookies[Auth.AUTH_COOKIE_NAME] as string; if (!cookieToken) { reply.redirect('/login'); @@ -71,9 +98,8 @@ const build = (opts: FastifyServerOptions): FastifyInstance => { try { const chtSession = Auth.createCookieSession(cookieToken); - if (!chtSession?.isAdmin && req.routeOptions.url === '/app/config') { + if (req.routeOptions.url === '/api/config' && !chtSession?.isAdmin) { reply.status(401).send({ error: 'unauthorized' }); - console.error('Unauthorized access to config. User must be admin'); return; } req.chtSession = chtSession; From 03a913e31fa81b2022c42ae2e05c27365c57e094 Mon Sep 17 00:00:00 2001 From: jonathanbataire Date: Thu, 20 Feb 2025 16:43:55 +0300 Subject: [PATCH 08/11] clean up --- src/lib/authentication.ts | 18 +++++++++--------- src/routes/app.ts | 3 +-- src/server.ts | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/lib/authentication.ts b/src/lib/authentication.ts index aab5cbdc..7c2438d3 100644 --- a/src/lib/authentication.ts +++ b/src/lib/authentication.ts @@ -44,7 +44,7 @@ export default class Auth { return new Date(new Date().getTime() + LOGIN_EXPIRES_AFTER_MS); } - + private static encodeToken(session: ChtSession, signingKey: string, expiresIn: string) { const data = JSON.stringify(session); return jwt.sign({ data }, signingKey, { expiresIn }); @@ -59,15 +59,15 @@ export default class Auth { return ChtSession.createFromDataString(data); } - public static async apiAuth (username: string, password: string, domain: string) { + public static async apiAuth(username: string, password: string, domain: string) { const authInfo = await Config.getAuthenticationInfo(domain); - try { - const chtSession = await ChtSession.create(authInfo, username, password); - return chtSession; - } catch (e: any) { - console.error(`Login error: ${e}`); - return {}; - } + try { + const chtSession = await ChtSession.create(authInfo, username, password); + return chtSession; + } catch (error: any) { + console.error(`Login error: ${error}`); + return {}; + } } } diff --git a/src/routes/app.ts b/src/routes/app.ts index 6dc3092a..e37cbd5d 100644 --- a/src/routes/app.ts +++ b/src/routes/app.ts @@ -2,14 +2,13 @@ import { FastifyInstance } from 'fastify'; import Auth from '../lib/authentication'; import { ChtApi } from '../lib/cht-api'; -import { Config, ConfigSystem } from '../config'; +import { Config } from '../config'; import DirectiveModel from '../services/directive-model'; import RemotePlaceCache from '../lib/remote-place-cache'; import RemotePlaceResolver from '../lib/remote-place-resolver'; import SessionCache from '../services/session-cache'; import { UploadManager } from '../services/upload-manager'; import WarningSystem from '../warnings'; -import { writeConfig } from '../config/config-factory'; export default async function sessionCache(fastify: FastifyInstance) { fastify.get('/', async (req, resp) => { diff --git a/src/server.ts b/src/server.ts index 70c0f18c..2874f524 100644 --- a/src/server.ts +++ b/src/server.ts @@ -83,7 +83,7 @@ const build = (opts: FastifyServerOptions): FastifyInstance => { const { isAdmin }: any = await Auth.apiAuth(username, password, domain); - if (isAdmin) { + if (isAdmin === true) { return; } reply.status(401).send({ error: 'unauthorized' }); From cdfa31ae93c73c2b698b22f6985a4c5e2ef71970 Mon Sep 17 00:00:00 2001 From: jonathanbataire Date: Thu, 20 Feb 2025 18:12:32 +0300 Subject: [PATCH 09/11] clean up --- src/server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server.ts b/src/server.ts index 2874f524..48dcdcea 100644 --- a/src/server.ts +++ b/src/server.ts @@ -68,7 +68,7 @@ const build = (opts: FastifyServerOptions): FastifyInstance => { if (authHeader && authHeader.startsWith('Basic ')) { if (!req.routeOptions.url?.startsWith('/api')) { - reply.send({error: 'not found'}).status(404); + reply.status(404).send({error: 'not found'}); return; } From 1cb19439d8677dbb1100fc9e6cd5e8e098013a75 Mon Sep 17 00:00:00 2001 From: jonathanbataire Date: Fri, 21 Feb 2025 10:15:34 +0300 Subject: [PATCH 10/11] clean up - serverjs --- src/server.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/server.ts b/src/server.ts index 48dcdcea..044203c6 100644 --- a/src/server.ts +++ b/src/server.ts @@ -64,14 +64,13 @@ const build = (opts: FastifyServerOptions): FastifyInstance => { } const authHeader = req.headers.authorization as string; - const { domain } = req.query as { [key: string]: string }; - if (authHeader && authHeader.startsWith('Basic ')) { if (!req.routeOptions.url?.startsWith('/api')) { reply.status(404).send({error: 'not found'}); return; } + const { domain } = req.query as { [key: string]: string }; if (!domain) { reply.send({ error: 'no authentication domain found' }); return; From 25359bc0bafd273a963edebc4776504532219835 Mon Sep 17 00:00:00 2001 From: jonathanbataire Date: Mon, 24 Feb 2025 17:41:16 +0300 Subject: [PATCH 11/11] await get template --- src/routes/files.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/files.ts b/src/routes/files.ts index d00636df..9b66908c 100644 --- a/src/routes/files.ts +++ b/src/routes/files.ts @@ -12,7 +12,7 @@ export default async function files(fastify: FastifyInstance) { fastify.get('/files/template/:placeType', async (req) => { const params: any = req.params; const placeType = params.placeType; - const columns = getCsvTemplateColumns(placeType); + const columns = await getCsvTemplateColumns(placeType); return stringify([columns]); });