1 files changed, 40 insertions, 39 deletions

diff --git a/src/server/apis/google/GoogleApiServerUtils.ts b/src/server/apis/google/GoogleApiServerUtils.ts
index c899c2ef2..963c7736a 100644
--- a/src/server/apis/google/GoogleApiServerUtils.ts
+++ b/src/server/apis/google/GoogleApiServerUtils.ts
@@ -75,6 +75,42 @@ export namespace GoogleApiServerUtils {
         });
     };
 
+    const RetrieveOAuthClient = async (information: CredentialInformation) => {
+        return new Promise<OAuth2Client>((resolve, reject) => {
+            readFile(information.credentialsPath, async (err, credentials) => {
+                if (err) {
+                    reject(err);
+                    return console.log('Error loading client secret file:', err);
+                }
+                const { client_secret, client_id, redirect_uris } = parseBuffer(credentials).installed;
+                resolve(new google.auth.OAuth2(client_id, client_secret, redirect_uris[0]));
+            });
+        });
+    };
+
+    export const GenerateAuthenticationUrl = async (information: CredentialInformation) => {
+        const client = await RetrieveOAuthClient(information);
+        return client.generateAuthUrl({
+            access_type: 'offline',
+            scope: SCOPES.map(relative => prefix + relative),
+        });
+    };
+
+    export const ProcessClientSideCode = async (information: CredentialInformation, authenticationCode: string): Promise<TokenResult> => {
+        const oAuth2Client = await RetrieveOAuthClient(information);
+        return new Promise<TokenResult>((resolve, reject) => {
+            oAuth2Client.getToken(authenticationCode, async (err, token) => {
+                if (err || !token) {
+                    reject(err);
+                    return console.error('Error retrieving access token', err);
+                }
+                oAuth2Client.setCredentials(token);
+                await Database.Auxiliary.GoogleAuthenticationToken.Write(information.userId, token);
+                resolve({ token, client: oAuth2Client });
+            });
+        });
+    };
+
     export const RetrieveCredentials = (information: CredentialInformation) => {
         return new Promise<TokenResult>((resolve, reject) => {
             readFile(information.credentialsPath, async (err, credentials) => {
@@ -107,17 +143,13 @@ export namespace GoogleApiServerUtils {
         return new Promise<TokenResult>((resolve, reject) => {
             // Attempting to authorize user (${userId})
             Database.Auxiliary.GoogleAuthenticationToken.Fetch(userId).then(token => {
-                if (!token) {
-                    // No token registered, so awaiting input from user
-                    return getNewToken(oAuth2Client, userId).then(resolve, reject);
-                }
-                if (token.expiry_date! < new Date().getTime()) {
+                if (token!.expiry_date! < new Date().getTime()) {
                     // Token has expired, so submitting a request for a refreshed access token
-                    return refreshToken(token, client_id, client_secret, oAuth2Client, userId).then(resolve, reject);
+                    return refreshToken(token!, client_id, client_secret, oAuth2Client, userId).then(resolve, reject);
                 }
                 // Authentication successful!
-                oAuth2Client.setCredentials(token);
-                resolve({ token, client: oAuth2Client });
+                oAuth2Client.setCredentials(token!);
+                resolve({ token: token!, client: oAuth2Client });
             });
         });
     }
@@ -145,35 +177,4 @@ export namespace GoogleApiServerUtils {
         });
     };
 
-    /**
-     * Get and store new token after prompting for user authorization, and then
-     * execute the given callback with the authorized OAuth2 client.
-     * @param {google.auth.OAuth2} oAuth2Client The OAuth2 client to get token for.
-     * @param {getEventsCallback} callback The callback for the authorized client.
-     */
-    function getNewToken(oAuth2Client: OAuth2Client, userId: string) {
-        return new Promise<TokenResult>((resolve, reject) => {
-            const authUrl = oAuth2Client.generateAuthUrl({
-                access_type: 'offline',
-                scope: SCOPES.map(relative => prefix + relative),
-            });
-            console.log('Authorize this app by visiting this url:', authUrl);
-            const rl = createInterface({
-                input: process.stdin,
-                output: process.stdout,
-            });
-            rl.question('Enter the code from that page here: ', (code) => {
-                rl.close();
-                oAuth2Client.getToken(code, async (err, token) => {
-                    if (err || !token) {
-                        reject(err);
-                        return console.error('Error retrieving access token', err);
-                    }
-                    oAuth2Client.setCredentials(token);
-                    await Database.Auxiliary.GoogleAuthenticationToken.Write(userId, token);
-                    resolve({ token, client: oAuth2Client });
-                });
-            });
-        });
-    }
 }
\ No newline at end of file