Merge branch 'task_nodes_aarav' of https://github.com/brown-dash/Dash-Web into task_nodes_aarav

1 files changed, 4 insertions, 5 deletions

diff --git a/src/server/ApiManagers/GeneralGoogleManager.ts b/src/server/ApiManagers/GeneralGoogleManager.ts
index 7581eec13..4f0b8c02b 100644
--- a/src/server/ApiManagers/GeneralGoogleManager.ts
+++ b/src/server/ApiManagers/GeneralGoogleManager.ts
@@ -17,10 +17,9 @@ export default class GeneralGoogleManager extends ApiManager {
             method: Method.GET,
             subscription: '/readGoogleAccessToken',
             secureHandler: async ({ user, res }) => {
-                const { credentials } = await GoogleApiServerUtils.retrieveCredentials(user);
+                const { credentials } = await GoogleApiServerUtils.retrieveCredentials(user.id);
                 if (!credentials?.access_token) {
-                    const url = GoogleApiServerUtils.generateAuthenticationUrl();
-                    return res.send(url);
+                    return res.send(GoogleApiServerUtils.generateAuthenticationUrl());
                 }
                 return res.send(credentials);
             },
@@ -49,7 +48,7 @@ export default class GeneralGoogleManager extends ApiManager {
             secureHandler: async ({ req, res, user }) => {
                 const sector: GoogleApiServerUtils.Service = req.params.sector as GoogleApiServerUtils.Service;
                 const action: GoogleApiServerUtils.Action = req.params.action as GoogleApiServerUtils.Action;
-                const endpoint = await GoogleApiServerUtils.GetEndpoint(GoogleApiServerUtils.Service[sector], user);
+                const endpoint = await GoogleApiServerUtils.GetEndpoint(GoogleApiServerUtils.Service[sector], user.id);
                 const handler = EndpointHandlerMap.get(action);
                 if (endpoint && handler) {
                     try {
@@ -71,7 +70,7 @@ export default class GeneralGoogleManager extends ApiManager {
             subscription: new RouteSubscriber('googleTasks').add('create'),
             secureHandler: async ({ req, res, user }) => {
                 try {
-                    const auth = await GoogleApiServerUtils.retrieveOAuthClient(user);
+                    const auth = await GoogleApiServerUtils.retrieveOAuthClient(user.id);
 
                     if (!auth) {
                         return res.status(401).send('Google credentials missing or invalid.');