cleanup

Author: lindsey-volta

gatsby/onInitialClientRender.js

@@ -35,11 +35,15 @@ export const onInitialClientRender = () => {
         return
       }
 
+      // Google Sign-In previously helped manage user signed-in status
+      // With GIS we are responsible for managing sign-in state
       try {
         const storedTokenString = localStorage.getItem("google_token")
         if (storedTokenString) {
+          console.log("Restoring token from localStorage...")
           const storedToken = JSON.parse(storedTokenString)
           if (storedToken.expires_at > Date.now()) {
+            console.log("Token is still valid, using it...")
             gapi.client.setToken(storedToken)
             store.dispatch({ type: "setToken", token: storedToken })
           } else {
@@ -66,33 +70,18 @@ export const onInitialClientRender = () => {
             client_id: clientId,
             scope: SCOPES.join(" "),
             callback: tokenResponse => {
-              console.log(
-                "onInitialClientRender: callback invoked",
-                tokenResponse
-              )
               if (tokenResponse && tokenResponse.access_token) {
                 const tokenWithExpiry = {
                   ...tokenResponse,
                   expires_at: Date.now() + tokenResponse.expires_in * 1000,
                 }
-                localStorage.setItem(
-                  "google_token",
-                  JSON.stringify(tokenWithExpiry)
-                )
+                localStorage.setItem("google_token", JSON.stringify(tokenWithExpiry))
                 gapi.client.setToken(tokenResponse)
-                console.log("onInitialClientRender: setToken", tokenResponse)
                 store.dispatch({ type: "setToken", token: tokenResponse })
               } else {
-                console.error(
-                  "onInitialClientRender: tokenResponse did not contain access_token.",
-                  tokenResponse
-                )
                 store.dispatch({ type: "setToken", token: undefined })
               }
-            },
-            error_callback: error => {
-              console.error("GIS Error:", error)
-            },
+            }
           })
 
           store.dispatch({ type: "setGapi", gapi })

gatsby/wrapRootElement.tsx

@@ -36,7 +36,7 @@ type Action =
 const reducer = (state: State = {}, action: Action) => {
   switch (action.type) {
     case "setToken":
-      return { ...state, user: action.token }
+      return { ...state, token: action.token }
     case "setGapi":
       return { ...state, gapi: action.gapi }
     case "setGoogle":

src/components/Layout/useLogin.ts

@@ -27,15 +27,10 @@ const useLogin = (): Requestable<Successful, {}, InProgress, Failed> => {
   const tokenClient = useSelector((state: AppState) => state.tokenClient)
   const google = useSelector((state: AppState) => state.google)
   const dispatch = useDispatch()
-
-  console.log("useLogin: token", token);
-  console.log("useLogin: gapiStatus", gapiStatus);
   const userStatus = token ? UserStatus.SignedIn : UserStatus.SignedOut
 
   const login = useCallback(() => {
-    console.log("login called. tokenClient:", tokenClient)
     if (tokenClient) {
-      console.log("requesting access token")
       tokenClient.requestAccessToken()
     }
   }, [tokenClient])
@@ -45,7 +40,7 @@ const useLogin = (): Requestable<Successful, {}, InProgress, Failed> => {
     if (token && google) {
       google.accounts.oauth2.revoke(token.access_token, () => {
         gapi?.client.setToken(null)
-        dispatch({ type: "setUser", user: undefined })
+        dispatch({ type: "setToken", token: undefined })
         localStorage.removeItem("google_token")
       })
     }

src/test-utils/index.tsx

@@ -47,9 +47,9 @@ export const wrapperFor = ({
   const store = makeStore()
 
   if (isLoggedIn) {
-    store.dispatch({ type: "setUser", user: {} })
+    store.dispatch({ type: "setToken", token: {} })
   } else {
-    store.dispatch({ type: "setUser", user: undefined })
+    store.dispatch({ type: "setToken", token: undefined })
   }
 
   const gapi = testGapi(gapiMocks)
@@ -91,9 +91,9 @@ export const withProviders = (
   const store = makeStore()
 
   if (isLoggedIn) {
-    store.dispatch({ type: "setUser", user: {} })
+    store.dispatch({ type: "setToken", token: {} })
   } else {
-    store.dispatch({ type: "setUser", user: undefined })
+    store.dispatch({ type: "setToken", token: undefined })
   }
 
   const gapi = testGapi(gapiMocks)