BOD-2 More cleanup after fixing JWT tokens.

client/src/App/App.container.jsx

@@ -6,26 +6,17 @@ import { split } from "apollo-link";
 import { setContext } from "apollo-link-context";
 import { HttpLink } from "apollo-link-http";
 import apolloLogger from "apollo-link-logger";
+import { RetryLink } from "apollo-link-retry";
 import { WebSocketLink } from "apollo-link-ws";
 import { getMainDefinition } from "apollo-utilities";
 import React, { Component } from "react";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
-import SpinnerComponent from "../components/loading-spinner/loading-spinner.component";
+import { auth } from "../firebase/firebase.utils";
 import errorLink from "../graphql/apollo-error-handling";
 import App from "./App";
-import { RetryLink } from "apollo-link-retry";
-import { auth } from "../firebase/firebase.utils";
 export default class AppContainer extends Component {
-  // constructor() {
-  //   super();
-  // }
-
-  state = {
-    client: null,
-    loaded: false
-  };
-
-  async componentDidMount() {
+  constructor() {
+    super();
     const httpLink = new HttpLink({
       uri: process.env.REACT_APP_GRAPHQL_ENDPOINT
     });
@@ -34,36 +25,25 @@ export default class AppContainer extends Component {
       uri: process.env.REACT_APP_GRAPHQL_ENDPOINT_WS,
       options: {
         //lazy: true,
-        reconnect: true,
-        connectionParams: () => {
-          const token = localStorage.getItem("token");
-          if (token) {
-            return {
-              headers: {
-                authorization: token ? `Bearer ${token}` : ""
-              }
-            };
-          }
-        }
+        reconnect: true
+        // connectionParams: () => {
+        //   const token = localStorage.getItem("token");
+        //   if (token) {
+        //     return {
+        //       headers: {
+        //         authorization: token ? `Bearer ${token}` : ""
+        //       }
+        //     };
+        //   }
+        // }
       }
     });
-
-    // const wsLink = new WebSocketLink({
-    //   uri: websocketUrl,
-    //   options: {
-    //     reconnect: true
-    //   },
-    //   webSocketImpl: ws
-    // });
-
     const subscriptionMiddleware = {
       applyMiddleware: async (options, next) => {
         options.authToken = await auth.currentUser.getIdToken(true);
         next();
       }
     };
-
-    // add the middleware to the web socket link via the Subscription Transport client
     wsLink.subscriptionClient.use([subscriptionMiddleware]);
 
     const link = split(
@@ -87,28 +67,7 @@ export default class AppContainer extends Component {
       httpLink
     );
 
-    // const authLink = setContext((_, { headers }) => {
-    //   const token = localStorage.getItem("token");
-    //   console.log("In the auth link");
-    //   //Check to see if the token has expired. If it has, then
-    //   if (token) {
-    //     return {
-    //       headers: {
-    //         ...headers,
-    //         authorization: token ? `Bearer ${token}` : ""
-    //       }
-    //     };
-    //   } else {
-    //     return { headers };
-    //   }
-    // });
-
     const authLink = setContext((_, { headers }) => {
-      // return AsyncTokenLookup()
-      //   .then((userToken) => {
-      //     token = userToken;
-      //     return { token };
-      //   })
       return auth.currentUser.getIdToken().then(token => {
         if (token) {
           return {
@@ -123,35 +82,6 @@ export default class AppContainer extends Component {
       });
     });
 
-    // const authLink = new ApolloLink((operation, forward) => {
-    //   console.log("The new auth link");
-    //   const token = localStorage.getItem("token");
-    //   auth.currentUser.
-    //   auth.currentUser.getIdToken().then(t => {
-    //     console.log("token", token);
-    //     if (token) {
-    //       operation.setContext({
-    //         headers: {
-    //           Authorization: `Bearer ${token}`
-    //         }
-    //       });
-
-    //       operation.setContext({
-    //         headers: {
-    //           Authorization: `Bearer ${token}`
-    //         }
-    //       });
-    //       return forward(operation);
-    //     }
-    //   });
-    //   return forward(operation);
-    // });
-
-    const middlewares = [];
-    if (process.env.NODE_ENV === "development") {
-      middlewares.push(apolloLogger);
-    }
-
     const retryLink = new RetryLink({
       delay: {
         initial: 300,
@@ -164,27 +94,25 @@ export default class AppContainer extends Component {
       }
     });
 
+    const middlewares = [];
+    if (process.env.NODE_ENV === "development") {
+      middlewares.push(apolloLogger);
+    }
+
     middlewares.push(retryLink.concat(errorLink.concat(authLink.concat(link))));
 
     const cache = new InMemoryCache();
-
     const client = new ApolloClient({
       link: ApolloLink.from(middlewares),
       cache,
       connectToDevTools: true
     });
 
-    this.setState({
-      client,
-      loaded: true
-    });
+    this.state = { client };
   }
 
   render() {
-    const { client, loaded } = this.state;
-    if (!loaded) {
-      return <SpinnerComponent message='Connecting to Bodyshop.app Database' />;
-    }
+    const { client } = this.state;
 
     return (
       <ApolloProvider client={client}>