hashParameters.formId

Author: johannesloetzsch

packages/react-redux-yjs/features/YProvider.tsx

@@ -106,6 +106,7 @@ export function YConfigurator() {
   useEffect(
     () => {
       if(yContext) {
+	//console.log({yContext})
         const destructors = yContext?.slices?.map( sliceState => configureSlice(sliceState) );
 	//setYContext(yContext);
         // TODO use dispatch to set updated sliceStates?

packages/secured-react-redux-yjs/features/SecuredYProvider.tsx

@@ -10,6 +10,9 @@ interface Props {
 export function SecuredYProvider({children, store}: PropsWithChildren<Props>) {
   const securityState = useSecurityStateContext();
 
+  const hash = typeof location != 'undefined' ? location.hash.slice(1) : '';
+  const hashParameters = !hash ? {} : Object.fromEntries(new URLSearchParams(hash) as any);
+
   const initialYState: Partial<YState> = {slices: [{store, slice: 'data', //logging: true,
                                                     providers: {webrtc: {options: {signaling: securityState.syncServerSessionWebrtc.settings.signaling,  // TOOD till now all need share the same
                                                                                    password: securityState.syncServerDataWebrtc.settings.password}},
@@ -20,16 +23,19 @@ export function SecuredYProvider({children, store}: PropsWithChildren<Props>) {
                                                                 websocket: {url: securityState.syncServerSessionWebsocket.settings.url}}},
                                                    {store, slice: 'schema', logging: true,  // TODO
                                                     providers: {webrtc: {options: {signaling: ['wss://yjs.winzlieb.eu'],
-                                                                                   password: 'TODO'}},
-                                                                websocket: {url: 'wss://mqtt.afg.mission-lifeline.de'}}},
+                                                                                   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: 'TODO'}},
-                                                                websocket: {url: 'wss://mqtt.afg.mission-lifeline.de'}}},
+                                                                                   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: 'TODO'}},
-                                                                websocket: {url: 'wss://mqtt.afg.mission-lifeline.de'}}} ]}
+                                                                                   password: hashParameters.formId}},
+                                                                websocket: {url: 'wss://mqtt.afg.mission-lifeline.de',
+								            room: hashParameters.formId}}}  ]}
 
   return (
     <YProvider initialYState={initialYState}>

packages/security-state/features/react/SecurityIndicator.tsx

@@ -10,11 +10,10 @@ import { useSecurityStateContext } from './SecurityStateProvider';
 type OnClick = (event: React.MouseEvent<HTMLElement>) => void
 
 export function SecurityIndicator({fakeLevel, onClick}: {fakeLevel?: SECURITY_LEVEL, onClick?: OnClick}) {
-  const securityContext = useSecurityStateContext()
+  //const securityContext = useSecurityStateContext();  console.log({securityContext})
   const { assessment } = useSecurityStateContext()?.syncServerSessionWebsocket || {};  // TODO minimum
   const level = fakeLevel || assessment;
   var icon;
-  console.log({assessment, securityContext})
   switch(level) {
     case SECURITY_LEVEL.advanced:
       icon = <EnhancedEncryptionIcon sx={{backgroundColor: SECURITY_INDICATOR.advanced, color: 'white'}}/>;