complete authentication on client

Author: ShMcK

web-app/src/services/channel/index.ts

@@ -38,39 +38,17 @@ class Channel {
 		// messages from core
 		switch (action.type) {
 			case 'ENV_LOAD':
-				this.machineSend(action)
-				return
+			case 'AUTHENTICATED':
 			case 'TUTORIAL_LOADED':
-				// send action to state machine
-				this.machineSend('TUTORIAL_LOADED')
-				console.log('send action to state machine')
-				return
 			case 'NEW_TUTORIAL':
-				this.machineSend(action)
-				return
 			case 'TUTORIAL_CONFIGURED':
-				this.machineSend(action)
-				return
 			case 'CONTINUE_TUTORIAL':
-				this.machineSend(action)
-				return
 			case 'TEST_PASS':
-				// { type: 'TEST_PASS', payload: { stepId: string }}
-				this.machineSend(action)
-				return
 			case 'TEST_FAIL':
-				this.machineSend(action)
-				return
 			case 'TEST_RUNNING':
-				this.machineSend(action)
-				return
 			case 'TEST_ERROR':
-				console.log('TEST_ERROR')
 				this.machineSend(action)
 				return
-			case 'ACTIONS_LOADED':
-				// TODO: use this for verifying completion of stepActions
-				return
 			default:
 				if (action.type) {
 					console.warn(`Unknown received action ${action.type}`, action)

web-app/src/services/state/actions/api.ts

@@ -2,10 +2,10 @@ import * as CR from 'typings'
 import client from '../../apollo'
 import authenticateMutation from '../../apollo/mutations/authenticate'
 import {setAuthToken} from '../../apollo/auth'
-import {send} from 'xstate'
+import channel from '../../../services/channel'
 
 export default {
-	authenticate: (async (context: CR.MachineContext): Promise<CR.Action> => {
+	authenticate: (async (context: CR.MachineContext): Promise<void> => {
 		const result = await client.mutate({
 			mutation: authenticateMutation,
 			variables: {
@@ -20,9 +20,10 @@ export default {
 			console.log('unauthenticated')
 		}
 		const {token} = result.data.editorLogin
-		console.log(token)
+		// add token to headers
 		setAuthToken(token)
-		return send({type: 'AUTHENTICATED'})
+		// pass authenticated action back to state machine
+		channel.receive({data: {type: 'AUTHENTICATED'}})
 	}),
 	userTutorialComplete(context: CR.MachineContext) {
 		console.log('should update user tutorial as complete')