fix(Auth): simplify logout call (#2258)

* remove revoke call

* cleanup

Author: lindsey-volta

gatsby/onInitialClientRender.js

@@ -83,7 +83,6 @@ export const onInitialClientRender = () => {
 
           store.dispatch({ type: "setGapi", gapi })
           store.dispatch({ type: "gapiStatus", status: "initialized" })
-          store.dispatch({ type: "setGoogle", google })
           store.dispatch({ type: "setTokenClient", tokenClient })
         })
         .catch(e => {

gatsby/wrapRootElement.tsx

@@ -18,9 +18,8 @@ import {PartialDeep} from 'type-fest';
 
 type State =
     {
-      token?: {},
+      token?: { },
       gapi?: PartialDeep<typeof gapi>,
-      google?: any,
       tokenClient?: any,
       toast?: string,
       gapiStatus?: string
@@ -29,7 +28,6 @@ type State =
 type Action =
     | { type: 'setToken', token: {} | undefined  }
     | { type: 'setGapi', gapi: PartialDeep<typeof gapi>  | undefined }
-    | { type: 'setGoogle', google: any }
     | { type: 'setTokenClient', tokenClient: any }
     | { type: 'setToast', toast: string | undefined }
     | { type: 'gapiStatus', status: string | undefined };
@@ -39,8 +37,6 @@ const reducer = (state: State = {}, action: Action) => {
       return { ...state, token: action.token }
     case "setGapi":
       return { ...state, gapi: action.gapi }
-    case "setGoogle":
-      return { ...state, google: action.google }
     case "setTokenClient":
       return { ...state, tokenClient: action.tokenClient }
     case "setToast":

src/components/Layout/useLogin.ts

@@ -25,7 +25,6 @@ const useLogin = (): Requestable<Successful, {}, InProgress, Failed> => {
   const gapi = useSelector((state: AppState) => state.gapi)
   const gapiStatus = useSelector((state: AppState) => state.gapiStatus)
   const tokenClient = useSelector((state: AppState) => state.tokenClient)
-  const google = useSelector((state: AppState) => state.google)
   const dispatch = useDispatch()
   const userStatus = token ? UserStatus.SignedIn : UserStatus.SignedOut
 
@@ -36,15 +35,10 @@ const useLogin = (): Requestable<Successful, {}, InProgress, Failed> => {
   }, [tokenClient])
 
   const logout = useCallback(() => {
-    const token = gapi?.client.getToken()
-    if (token && google) {
-      google.accounts.oauth2.revoke(token.access_token, () => {
-        gapi?.client.setToken(null)
-        dispatch({ type: "setToken", token: undefined })
-        localStorage.removeItem("google_token")
-      })
-    }
-  }, [gapi, google, dispatch])
+    gapi?.client.setToken(null)
+    dispatch({ type: "setToken", token: undefined })
+    localStorage.removeItem("google_token")
+  }, [gapi, dispatch])
 
   useEffect(() => {
     if (gapiStatus === "cannot initialize") {

src/global.d.ts

@@ -28,5 +28,4 @@ declare interface AppState {
   gapiStatus?: string
   measurementID: string
   tokenClient?: any
-  google?: typeof google
 }