1 files changed, 5 insertions, 42 deletions

diff --git a/src/server/apis/google/GoogleApiServerUtils.ts b/src/server/apis/google/GoogleApiServerUtils.ts
index 0f75833ee..48a8da89f 100644
--- a/src/server/apis/google/GoogleApiServerUtils.ts
+++ b/src/server/apis/google/GoogleApiServerUtils.ts
@@ -149,26 +149,6 @@ export namespace GoogleApiServerUtils {
     }
 
     /**
-     * Returns the lengthy string or access token that can be passed into
-     * the headers of an API request or into the constructor of the Photos
-     * client API wrapper.
-     * @param userId the Dash user id of the user requesting his/her associated
-     * access_token
-     * @returns the current access_token associated with the requesting
-     * Dash user. The access_token is valid for only an hour, and
-     * is then refreshed.
-     */
-    export async function retrieveAccessToken(userId: string): Promise<string> {
-        return new Promise(async resolve => {
-            const { credentials } = await retrieveCredentials(userId);
-            if (!credentials) {
-                return resolve();
-            }
-            resolve(credentials.access_token!);
-        });
-    }
-
-    /**
      * Manipulates a mapping such that, in the limit, each Dash user has
      * an associated authenticated OAuth2 client at their disposal. This
      * function ensures that the client's credentials always remain up to date
@@ -217,18 +197,6 @@ export namespace GoogleApiServerUtils {
     }
 
     /**
-     * This is what we return to the server in processNewUser(), after the
-     * worker OAuth2Client has used the user-pasted authentication code
-     * to retrieve an access token and an info token. The avatar is the
-     * URL to the Google-hosted mono-color, single white letter profile 'image'.
-     */
-    export interface GoogleAuthenticationResult {
-        access_token: string;
-        avatar: string;
-        name: string;
-    }
-
-    /**
      * This method receives the authentication code that the
      * user pasted into the overlay in the client side and uses the worker
      * and the authentication code to fetch the full set of credentials that
@@ -245,7 +213,7 @@ export namespace GoogleApiServerUtils {
      * and display basic user information in the overlay on successful authentication. 
      * This can be expanded as needed by adding properties to the interface GoogleAuthenticationResult.
      */
-    export async function processNewUser(userId: string, authenticationCode: string): Promise<GoogleAuthenticationResult> {
+    export async function processNewUser(userId: string, authenticationCode: string): Promise<EnrichedCredentials> {
         const credentials = await new Promise<Credentials>((resolve, reject) => {
             worker.getToken(authenticationCode, async (err, credentials) => {
                 if (err || !credentials) {
@@ -257,12 +225,7 @@ export namespace GoogleApiServerUtils {
         });
         const enriched = injectUserInfo(credentials);
         await Database.Auxiliary.GoogleAuthenticationToken.Write(userId, enriched);
-        const { given_name, picture } = enriched.userInfo;
-        return {
-            access_token: enriched.access_token!,
-            avatar: picture,
-            name: given_name
-        };
+        return enriched;
     }
 
     /**
@@ -316,15 +279,15 @@ export namespace GoogleApiServerUtils {
      * @returns the credentials, or undefined if the user has no stored associated credentials,
      * and a flag indicating whether or not they were refreshed during retrieval
      */
-    async function retrieveCredentials(userId: string): Promise<{ credentials: Opt<Credentials>, refreshed: boolean }> {
-        let credentials: Opt<Credentials> = await Database.Auxiliary.GoogleAuthenticationToken.Fetch(userId);
+    export async function retrieveCredentials(userId: string): Promise<{ credentials: Opt<EnrichedCredentials>, refreshed: boolean }> {
+        let credentials = await Database.Auxiliary.GoogleAuthenticationToken.Fetch(userId);
         let refreshed = false;
         if (!credentials) {
             return { credentials: undefined, refreshed };
         }
         // check for token expiry
         if (credentials.expiry_date! <= new Date().getTime()) {
-            credentials = await refreshAccessToken(credentials, userId);
+            credentials = { ...credentials, ...(await refreshAccessToken(credentials, userId)) };
             refreshed = true;
         }
         return { credentials, refreshed };