Fix packages + use gapi.client to fetch email

Author: sumomomomomo

package.json

@@ -40,7 +40,6 @@
     "@szhsin/react-menu": "^4.0.0",
     "@tanstack/react-table": "^8.9.3",
     "@tremor/react": "^1.8.2",
-    "@types/google.accounts": "^0.0.14",
     "ace-builds": "^1.4.14",
     "acorn": "^8.9.0",
     "ag-grid-community": "^31.0.0",
@@ -107,9 +106,9 @@
     "@testing-library/user-event": "^14.4.3",
     "@types/acorn": "^6.0.0",
     "@types/gapi": "^0.0.44",
-    "@types/gapi.auth2": "^0.0.57",
     "@types/gapi.client": "^1.0.5",
     "@types/gapi.client.drive": "^3.0.14",
+    "@types/google.accounts": "^0.0.14",
     "@types/google.picker": "^0.0.39",
     "@types/jest": "^29.0.0",
     "@types/js-yaml": "^4.0.5",

src/commons/sagas/PersistenceSaga.tsx

@@ -10,7 +10,6 @@ import {
   PERSISTENCE_SAVE_FILE_AS,
   PersistenceFile
 } from '../../features/persistence/PersistenceTypes';
-import { getUserProfileDataEmail } from '../../features/persistence/PersistenceUtils';
 import { store } from '../../pages/createStore';
 import { OverallState } from '../application/ApplicationTypes';
 import { ExternalLibraryName } from '../application/types/ExternalTypes';
@@ -31,6 +30,7 @@ const DISCOVERY_DOCS = ['https://www.googleapis.com/discovery/v1/apis/drive/v3/r
 const SCOPES =
   'profile https://www.googleapis.com/auth/drive.file https://www.googleapis.com/auth/userinfo.email';
 const UPLOAD_PATH = 'https://www.googleapis.com/upload/drive/v3/files';
+const USER_INFO_PATH = 'https://www.googleapis.com/oauth2/v3/userinfo';
 
 // Special ID value for the Google Drive API.
 const ROOT_ID = 'root';
@@ -370,7 +370,7 @@ function* handleUserChanged(accessToken: string | null) {
   if (accessToken === null) {
     yield put(actions.removeGoogleUserAndAccessToken());
   } else {
-    const email: string | undefined = yield call(getUserProfileDataEmail, accessToken);
+    const email: string | undefined = yield call(getUserProfileDataEmail);
     if (!email) {
       yield put(actions.removeGoogleUserAndAccessToken());
     } else {
@@ -415,14 +415,21 @@ function* ensureInitialisedAndAuthorised() {
     yield call(getToken);
   } else {
     // check if loaded token is still valid
-    const email: string | undefined = yield call(getUserProfileDataEmail, currToken.access_token);
+    const email: string | undefined = yield call(getUserProfileDataEmail);
     const isValid = email ? true : false;
     if (!isValid) {
       yield call(getToken);
     }
   }
 }
 
+function getUserProfileDataEmail(): Promise<string | undefined> {
+  return gapi.client.request({
+    path: USER_INFO_PATH
+  }).then(r => r.result.email)
+  .catch(() => undefined);
+}
+
 type PickFileResult =
   | { id: string; name: string; mimeType: string; parentId: string; picked: true }
   | { picked: false };

src/features/persistence/PersistenceUtils.tsx

@@ -2879,13 +2879,6 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/gapi.auth2@^0.0.57":
-  version "0.0.57"
-  resolved "https://registry.yarnpkg.com/@types/gapi.auth2/-/gapi.auth2-0.0.57.tgz#5544a696d97fc979044d48a8bf7de5e2b35899b5"
-  integrity sha512-2nYF2OZlEqWvF5rLk0nrQlAkk51Abe9zLHvA85NZqpIauYT/TluDNsPWkncI969BR/Ts5mdKrXgiWE/f4N6mMQ==
-  dependencies:
-    "@types/gapi" "*"
-
 "@types/gapi.client.discovery@*":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@types/gapi.client.discovery/-/gapi.client.discovery-1.0.9.tgz#e2472989baa01f2e32a2d5a80981da8513f875ae"
@@ -2905,7 +2898,7 @@
   resolved "https://registry.yarnpkg.com/@types/gapi.client/-/gapi.client-1.0.8.tgz#8e02c57493b014521f2fa3359166c01dc2861cd7"
   integrity sha512-qJQUmmumbYym3Amax0S8CVzuSngcXsC1fJdwRS2zeW5lM63zXkw4wJFP+bG0jzgi0R6EsJKoHnGNVTDbOyG1ng==
 
-"@types/gapi@*", "@types/gapi@^0.0.44":
+"@types/gapi@^0.0.44":
   version "0.0.44"
   resolved "https://registry.yarnpkg.com/@types/gapi/-/gapi-0.0.44.tgz#f097f7a0f59d63a59098a08a62a560ca168426fb"
   integrity sha512-hsgJMfZ/pMwI15UlAYHMNwj8DRoigo1odhbPwEXdp19ZQwQAXbcRrpzaDsfc+9XM6RtGpvl4Ja7uW8A+KPCa7w==