fixed client authentication

Author: devpaul

packages/client/src/middleware/store.ts

@@ -7,7 +7,7 @@ import { initialize as initializeAframe } from '../external/aframe';
 import { initialize as initializeConnection } from '../external/connection';
 import { initialize as initializeOmni } from '../external/omnisockets';
 import { State } from '../interfaces';
-import { authenticateProcess, loadSecretProcess } from '../processes/authenticate.process';
+import { attemptAuthenticationProcess, loadSecretProcess } from '../processes/authenticate.process';
 import { connectProcess } from '../processes/connection.process';
 
 const commandFactory = createCommandFactory<State>();
@@ -44,12 +44,7 @@ export const store = createStoreMiddleware<State>(async (store: Store<State>) =>
 	initializeConnection(store);
 	await initializeAframe(store);
 	await connectProcess(store)({})
-
-	const secret = store.get(store.path('auth', 'secret'));
-
-	if (secret) {
-		await authenticateProcess(store)({ secret });
-	}
+	await attemptAuthenticationProcess(store)({});
 
 	debug(store);
 });

packages/client/src/processes/authenticate.process.ts

@@ -44,13 +44,18 @@ const setUnauthenticatedCommand = commandFactory(({ path }) => {
 	];
 });
 
-const authenticateCommand = commandFactory<{ secret: string }>(({ get, path, payload: { secret } }) => {
-	authenticate({ role: 'presenter', secret });
-})
+const authenticateCommand = commandFactory(({ get, path }) => {
+	const secret = get(path('auth', 'secret'));
+
+	if (secret) {
+		authenticate({ role: 'presenter', secret });
+	}
+});
 
 export const loadSecretProcess = createProcess('load-secret', [ loadSecretCommand ])
 export const saveSecretProcess = createProcess('save-secret', [ saveSecretCommand ]);
 export const setSecretProcess = createProcess('set-secret', [ setSecretCommand ]);
 export const setUnauthenticatedProcess = createProcess('set-unauthenticated', [ setUnauthenticatedCommand ]);
 export const setAuthenticatedProcess = createProcess('set-authenticated', [ setAuthenticatedCommand ]);
 export const authenticateProcess = createProcess('authenticate', [ authenticateCommand ]);
+export const attemptAuthenticationProcess = createProcess('attempt-authentication', [ loadSecretCommand, authenticateCommand ])

packages/client/src/processes/connection.process.ts

@@ -10,7 +10,8 @@ const commandFactory = createCommandFactory<State>();
 
 const setDisconnectedCommand = commandFactory(async ({ path }) => {
 	return [
-		replace(path('isConnected'), false)
+		replace(path('isConnected'), false),
+		replace(path('auth', 'isAuthenticated'), false)
 	];
 });
 

packages/client/src/widgets/authentication/Authentication.tsx

@@ -17,6 +17,6 @@ export default factory(function Authentication({ middleware: { store: { get, pat
 
 	return (<div>
 		<TextInput value={secret} onChange={(value) => { setSecret({ secret: String(value) }) }} placeholder="Secret" type="password" />
-		<Control title="Authenticate" show={true} onClick={() => { authenticate({ secret }) }} />
+		<Control title="Authenticate" show={true} onClick={() => { authenticate({}) }} />
 	</div>);
 });

packages/client/src/widgets/menu/index.tsx

@@ -37,7 +37,7 @@ export default factory(function Menu({ middleware: { store: { get, path, executo
 				<div classes={css.indentedContainer}>
 					<Status value={isConnected} trueLabel="Connected" falseLabel="Disconnected" />
 					<Status value={isAuthenticated} trueLabel="Authenticated" falseLabel="Not Authenticated" />
-					{ isAuthenticated && <Status value={isPresenter} trueLabel="Presenter" falseLabel="Viewer" /> }
+					{ isAuthenticated && <Status value={isPresenter} trueLabel="Presenting" falseLabel="Not Presenting" /> }
 				</div>
 			</Card>
 			<Card title="Connection">