use @formswizard/config and @formswizard/api

johannesloetzsch · johannesloetzsch · commit be031eefdb73 · 2023-09-11T20:50:16.000+02:00
diff --git a/apps/dev/.env b/apps/dev/.env
@@ -1 +1 @@
-DEVELOPER_MODE=true
+NEXT_PUBLIC_DEVELOPER_MODE=true
diff --git a/apps/dev/next.config.js b/apps/dev/next.config.js
@@ -2,7 +2,4 @@ module.exports = {
   reactStrictMode: true,
   transpilePackages: [],
   output: 'export',
-  env: {
-    developerMode: process.env.DEVELOPER_MODE
-  }
 };
diff --git a/apps/storybook/vite.config.ts b/apps/storybook/vite.config.ts
@@ -4,4 +4,7 @@ import react from '@vitejs/plugin-react'
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
+  define: {
+    'process.env': process.env
+  }
 })
diff --git a/packages/config/features/config.ts b/packages/config/features/config.ts
diff --git a/packages/config/index.ts b/packages/config/index.ts
diff --git a/packages/config/package.json b/packages/config/package.json
diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json
diff --git a/packages/example/features/app/Tabs.tsx b/packages/example/features/app/Tabs.tsx
@@ -10,7 +10,7 @@ import HubIcon from '@mui/icons-material/Hub';
 import BarChartIcon from '@mui/icons-material/BarChart';
 import LogoDevIcon from '@mui/icons-material/LogoDev';
 
-import { config } from '@formswizard/processing-config';
+import { config } from '@formswizard/config';
 
 const notYetImplemented = <p>Not Yet Implemented</p>;
 
@@ -22,5 +22,5 @@ export const tabs = [
   {icon: <ViewTimelineIcon/>, label: "Gantt", content: notYetImplemented},
   {icon: <HubIcon/>, label: "Network", content: notYetImplemented},
   {icon: <BarChartIcon/>, label: "Chart", content: notYetImplemented},
-  ...(config.developerMode ? [{icon: <LogoDevIcon/>, label: "Dev", content: <Debug/>}] : [])
+  ...(config.feature.developerMode ? [{icon: <LogoDevIcon/>, label: "Dev", content: <Debug/>}] : [])
 ].filter(t => t);
diff --git a/packages/example/package.json b/packages/example/package.json
@@ -18,7 +18,7 @@
     "edit-form": "workspace:*",
     "edit-table": "workspace:*",
     "edit-timeline": "workspace:*",
-    "@formswizard/processing-config": "workspace:*",
+    "@formswizard/config": "^0.2.1",
     "import": "workspace:*",
     "layout": "workspace:*",
     "react": "^18.2.0",
diff --git a/packages/import/features/Import.tsx b/packages/import/features/Import.tsx
@@ -3,10 +3,7 @@ import { useEffect } from 'react';
 import { useAppSelector, useAppDispatch, setRowData } from 'state';
 import { selectJsonSchema, selectCryptedData, setCryptedData, selectUiSchema, setJsonSchema, setUiSchema } from 'project-state';
 import { PGPProvider, decryptUsingContext } from 'pgp-provider';
-import { DefaultService, OpenAPI } from '@formswizard/api';
-
-OpenAPI.BASE = 'http://localhost:4000';
-const { getProjectStateCryptedData, getProjectStateSchema } = DefaultService;
+import { api } from '@formswizard/api';
 
 function useFormId() {
   const hash = typeof location != 'undefined' ? location.hash.slice(1) : '';
@@ -23,7 +20,7 @@ export function DecryptAndImportLastNewSubmission() {
   const cryptedData = useAppSelector(selectCryptedData);
   useEffect( () => {
     async function loadCryptedData() {
-      const { cryptedData } = await getProjectStateCryptedData(formId);
+      const { cryptedData } = await api.getProjectStateCryptedData(formId);
       const latestCryptedDatum = cryptedData?.length && cryptedData[cryptedData.length-1];
       latestCryptedDatum && dispatch(setCryptedData(latestCryptedDatum));
     }
@@ -53,7 +50,7 @@ export function useSchema() {
 
   useEffect(() => {
     async function loadSchema() {
-      const { schema } = await getProjectStateSchema(formId);
+      const { schema } = await api.getProjectStateSchema(formId);
       const { jsonSchema, uiSchema } = schema || {};
       jsonSchema && dispatch(setJsonSchema(jsonSchema))
       jsonSchema && dispatch(setUiSchema(uiSchema))
diff --git a/packages/import/package.json b/packages/import/package.json
@@ -17,7 +17,7 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@formswizard/api": "^0.2.0",
+    "@formswizard/api": "^0.2.1",
     "@types/react": "^18.2.21",
     "pgp-provider": "workspace:*",
     "project-state": "workspace:*",
diff --git a/packages/secured-react-redux-yjs/features/SecuredYProvider.tsx b/packages/secured-react-redux-yjs/features/SecuredYProvider.tsx
@@ -20,22 +20,7 @@ export function SecuredYProvider({children, store}: PropsWithChildren<Props>) {
                                                    {store, slice: 'editorState',
                                                     providers: {webrtc: {options: {signaling: securityState.syncServerSessionWebrtc.settings.signaling ,
                                                                                    password: securityState.syncServerSessionWebrtc.settings.password}},
-                                                                websocket: {url: securityState.syncServerSessionWebsocket.settings.url}}},
-                                                   {store, slice: 'schema', logging: true,  // TODO
-                                                    providers: {webrtc: {options: {signaling: ['wss://yjs.winzlieb.eu'],
-                                                                                   password: hashParameters.formId}},
-                                                                websocket: {url: 'wss://mqtt.afg.mission-lifeline.de',
-								            room: hashParameters.formId}}},
-                                                   {store, slice: 'keys', logging: true,
-                                                    providers: {webrtc: {options: {signaling: ['wss://yjs.winzlieb.eu'],
-                                                                                   password: hashParameters.formId}},
-                                                                websocket: {url: 'wss://mqtt.afg.mission-lifeline.de',
-								            room: hashParameters.formId}}},
-                                                   {store, slice: 'cryptedData', logging: true,
-                                                    providers: {webrtc: {options: {signaling: ['wss://yjs.winzlieb.eu'],
-                                                                                   password: hashParameters.formId}},
-                                                                websocket: {url: 'wss://mqtt.afg.mission-lifeline.de',
-								            room: hashParameters.formId}}}  ]}
+                                                                websocket: {url: securityState.syncServerSessionWebsocket.settings.url}}}]}
 
   return (
     <YProvider initialYState={initialYState}>
diff --git a/packages/security-state/features/attackVectors/syncServerWebrtc/presets.tsx b/packages/security-state/features/attackVectors/syncServerWebrtc/presets.tsx
@@ -2,6 +2,7 @@ import { SyncServerWebrtcPreset } from './presets.model';
 import { SERVER } from '../../model/environment/model';
 import { SYNC_enabled } from '../../model/config/sync/model';
 import { Computer, Cloud, CloudOff } from '@mui/icons-material';
+import { config } from '@formswizard/config';
 
 export const syncServerWebrtcPresets: SyncServerWebrtcPreset[] = [
   { env: SERVER.trusted,
@@ -20,12 +21,12 @@ export const syncServerWebrtcPresets: SyncServerWebrtcPreset[] = [
 	   body: <>You will have to start the server yourself with the following command: <i>`./node_modules/y-webrtc/bin/server.js`</i></>
          }
   },
-  { env: SERVER.trusted,
-    settings: { signaling: ['wss://yjs.winzlieb.eu'] },
+  { env: SERVER.trusted, // TODO should be configured by environment variable and only be allowed with tls
+    settings: { signaling: [config.server.signaling] },
     _ui: { title: 'Public signaling',
            subtitle: 'with tls',
            icon: Cloud,
-	   body: <>No additional effort required.</>
+	   body: <>Configured by the environment variable NEXT_PUBLIC_SIGNALING</>
          }
   }
 ];
diff --git a/packages/security-state/features/attackVectors/syncServerWebsocket/presets.tsx b/packages/security-state/features/attackVectors/syncServerWebsocket/presets.tsx
@@ -2,6 +2,7 @@ import { SyncServerWebsocketPreset } from './presets.model';
 import { SERVER } from '../../model/environment/model';
 import { SYNC_enabled } from '../../model/config/sync/model';
 import { CloudOff, Computer, Cloud } from '@mui/icons-material';
+import { config } from '@formswizard/config';
 
 export const syncServerWebsocketPresets: SyncServerWebsocketPreset[] = [
   { env: SERVER.trusted,
@@ -21,11 +22,11 @@ export const syncServerWebsocketPresets: SyncServerWebsocketPreset[] = [
          }
   },
   { env: SERVER.limited,
-    settings: { url: 'wss://mqtt.afg.mission-lifeline.de' },
+    settings: { url: config.server.ws },
     _ui: { title: 'Public Websocket',
            subtitle: 'with tls',
            icon: Cloud,
-	   body: <>No additional effort required.</>
+	   body: <>Configured by the environment variable NEXT_PUBLIC_WS</>
          }
   }
 ];
diff --git a/packages/security-state/package.json b/packages/security-state/package.json
@@ -15,6 +15,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
+    "@formswizard/config": "^0.2.1",
     "@mui/base": "5.0.0-beta.12",
     "@mui/icons-material": "^5.14.6",
     "@mui/material": "^5.14.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-DEVELOPER_MODE=true`
	`1`	`+NEXT_PUBLIC_DEVELOPER_MODE=true`