complete authorization

Author: ShMcK

web-app/src/components/ErrorBoundary/index.tsx

@@ -7,8 +7,8 @@ class ErrorBoundary extends React.Component {
     // Display fallback UI
     this.setState({ hasError: true })
     // You can also log the error to an error reporting service
-    console.error(error)
-    console.log(info)
+    console.error(JSON.stringify(error))
+    console.log(JSON.stringify(info))
   }
 
   public render() {

web-app/src/services/apollo/auth.ts

@@ -7,9 +7,11 @@ export const setAuthToken = (token: string | null) => {
 }
 
 export const authorizeHeaders = (operation: Operation) => {
-	operation.setContext({
-		headers: {
-			token: authToken
-		}
-	})
+	if (authToken) {
+		operation.setContext({
+			headers: {
+				'Authorization': authToken
+			}
+		})
+	}
 }

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

@@ -6,6 +6,7 @@ import channel from '../../../services/channel'
 
 export default {
 	authenticate: (async (context: CR.MachineContext): Promise<void> => {
+
 		const result = await client.mutate({
 			mutation: authenticateMutation,
 			variables: {
@@ -15,9 +16,10 @@ export default {
 			}
 		})
 
+
 		if (!result || !result.data) {
 			// TODO: handle failed authentication
-			console.log('unauthenticated')
+			console.error('ERROR: Authentication failed')
 		}
 		const {token} = result.data.editorLogin
 		// add token to headers

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

@@ -6,7 +6,10 @@ import * as selectors from '../../selectors'
 export default {
 	setEnv: assign({
 		env: (context: CR.MachineContext, event: CR.MachineEvent) => {
-			return event.payload.env
+			return {
+				...context.env,
+				...event.payload.env
+			}
 		}
 	}),
 	continueTutorial: assign({