Revert googleUser placeholder

Author: sumomomomomo

src/commons/controlBar/ControlBarGoogleDriveButtons.tsx

@@ -16,6 +16,7 @@ const stateToIntent: { [state in PersistenceState]: Intent } = {
 type Props = {
   isFolderModeEnabled: boolean;
   loggedInAs?: string;
+  accessToken?: string;
   currentFile?: PersistenceFile;
   isDirty?: boolean;
   onClickOpen?: () => any;
@@ -46,7 +47,7 @@ export const ControlBarGoogleDriveButtons: React.FC<Props> = props => {
       label="Open"
       icon={IconNames.DOCUMENT_OPEN}
       onClick={props.onClickOpen}
-      isDisabled={props.loggedInAs ? false : true}
+      isDisabled={props.accessToken ? false : true}
     />
   );
   const saveButton = (
@@ -63,12 +64,12 @@ export const ControlBarGoogleDriveButtons: React.FC<Props> = props => {
       label="Save as"
       icon={IconNames.SEND_TO}
       onClick={props.onClickSaveAs}
-      isDisabled={props.loggedInAs ? false : true}
+      isDisabled={props.accessToken ? false : true}
     />
   );
 
-  const loginButton = props.loggedInAs ? (
-    <Tooltip2 content={`Logged in as ${props.loggedInAs}`}>
+  const loginButton = props.accessToken ? (
+    <Tooltip2 content={`Logged in as ${props.loggedInAs}`} disabled={!props.loggedInAs}>
       <ControlButton label="Log Out" icon={IconNames.LOG_OUT} onClick={props.onClickLogOut} />
     </Tooltip2>
   ) : (

src/commons/sagas/PersistenceSaga.tsx

@@ -424,10 +424,12 @@ function* ensureInitialisedAndAuthorised() {
 }
 
 function getUserProfileDataEmail(): Promise<string | undefined> {
-  return gapi.client.request({
-    path: USER_INFO_PATH
-  }).then(r => r.result.email)
-  .catch(() => undefined);
+  return gapi.client
+    .request({
+      path: USER_INFO_PATH
+    })
+    .then(r => r.result.email)
+    .catch(() => undefined);
 }
 
 type PickFileResult =

src/pages/__tests__/createStore.test.ts

@@ -104,12 +104,8 @@ describe('createStore() function', () => {
     const octokit = received.session.githubOctokitObject.octokit;
     delete received.session.githubOctokitObject.octokit;
 
-    const googleUser = received.session.googleUser;
-    delete received.session.googleUser;
-
     expect(received).toEqual(mockChangedState);
     expect(octokit).toBeDefined();
-    expect(googleUser).toEqual('placeholder');
     localStorage.removeItem('storedState');
   });
 });

src/pages/createStore.ts

@@ -53,10 +53,7 @@ function loadStore(loadedStore: SavedState | undefined) {
         octokit: loadedStore.session.githubAccessToken
           ? generateOctokitInstance(loadedStore.session.githubAccessToken)
           : undefined
-      },
-      googleUser: loadedStore.session.googleAccessToken
-        ? 'placeholder' // updates in PersistenceSaga
-        : undefined
+      }
     },
     workspaces: {
       ...defaultState.workspaces,

src/pages/playground/Playground.tsx

@@ -270,6 +270,7 @@ const Playground: React.FC<PlaygroundProps> = props => {
     sourceChapter: courseSourceChapter,
     sourceVariant: courseSourceVariant,
     googleUser: persistenceUser,
+    googleAccessToken,
     githubOctokitObject
   } = useTypedSelector(state => state.session);
 
@@ -591,6 +592,7 @@ const Playground: React.FC<PlaygroundProps> = props => {
         currentFile={persistenceFile}
         loggedInAs={persistenceUser}
         isDirty={persistenceIsDirty}
+        accessToken={googleAccessToken}
         key="googledrive"
         onClickSaveAs={() => dispatch(persistenceSaveFileAs())}
         onClickOpen={() => dispatch(persistenceOpenPicker())}
@@ -602,7 +604,14 @@ const Playground: React.FC<PlaygroundProps> = props => {
         onPopoverOpening={() => dispatch(persistenceInitialise())}
       />
     );
-  }, [isFolderModeEnabled, persistenceFile, persistenceUser, persistenceIsDirty, dispatch]);
+  }, [
+    isFolderModeEnabled,
+    persistenceFile,
+    persistenceUser,
+    persistenceIsDirty,
+    dispatch,
+    googleAccessToken
+  ]);
 
   const githubPersistenceIsDirty =
     githubSaveInfo && (!githubSaveInfo.lastSaved || githubSaveInfo.lastSaved < lastEdit);