fix: incorrect creds on ui (#115)

revertinc · Jun 30, 2023 · 539ff55 · 539ff55 · vercel · Jun 30, 2023
1 parent 8206432
commit 539ff55
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 17 deletions.
diff --git a/packages/backend/routes/index.ts b/packages/backend/routes/index.ts
@@ -67,8 +67,18 @@ router.post('/clerk/webhook', async (req, res) => {
 });
 
 router.post('/internal/account', async (req, res) => {
-    const userId = req.body.userId;
-    res.send(await AuthService.getAccountForUser(userId));
+    try {
+        const userId = req.body.userId;
+        const result = await AuthService.getAccountForUser(userId);
+        if (result?.error) {
+            res.status(400).send(result);
+        } else {
+            res.send(result);
+        }
+    } catch (error) {
+        console.error('Could not get account for user', error);
+        res.status(500).send({ error: 'Internal server error' });
+    }
 });
 
 router.use('/crm', cors(), revertAuthMiddleware(), crmRouter);

diff --git a/packages/backend/services/auth.ts b/packages/backend/services/auth.ts
@@ -20,10 +20,8 @@ class AuthService {
                         const url = 'https://api.hubapi.com/oauth/v1/token';
                         const formData = {
                             grant_type: 'refresh_token',
-                            client_id:
-                                connection.app.app_client_id || config.HUBSPOT_CLIENT_ID,
-                            client_secret:
-                                connection.app.app_client_secret || config.HUBSPOT_CLIENT_SECRET,
+                            client_id: connection.app.app_client_id || config.HUBSPOT_CLIENT_ID,
+                            client_secret: connection.app.app_client_secret || config.HUBSPOT_CLIENT_SECRET,
                             redirect_uri: `${config.OAUTH_REDIRECT_BASE}/hubspot`,
                             refresh_token: connection.tp_refresh_token,
                         };
@@ -53,10 +51,8 @@ class AuthService {
                         const url = `${connection.tp_account_url}/oauth/v2/token`;
                         const formData = {
                             grant_type: 'refresh_token',
-                            client_id:
-                                connection.app.app_client_id || config.ZOHOCRM_CLIENT_ID,
-                            client_secret:
-                                connection.app.app_client_secret || config.ZOHOCRM_CLIENT_SECRET,
+                            client_id: connection.app.app_client_id || config.ZOHOCRM_CLIENT_ID,
+                            client_secret: connection.app.app_client_secret || config.ZOHOCRM_CLIENT_SECRET,
                             redirect_uri: `${config.OAUTH_REDIRECT_BASE}/zohocrm`,
                             refresh_token: connection.tp_refresh_token,
                         };
@@ -89,10 +85,8 @@ class AuthService {
                         const url = `https://login.salesforce.com/services/oauth2/token`;
                         const formData = {
                             grant_type: 'refresh_token',
-                            client_id:
-                                connection.app.app_client_id || config.SFDC_CLIENT_ID,
-                            client_secret:
-                                connection.app.app_client_secret || config.SFDC_CLIENT_SECRET,
+                            client_id: connection.app.app_client_id || config.SFDC_CLIENT_ID,
+                            client_secret: connection.app.app_client_secret || config.SFDC_CLIENT_SECRET,
                             redirect_uri: `${config.OAUTH_REDIRECT_BASE}/sfdc`,
                             refresh_token: connection.tp_refresh_token,
                         };
@@ -183,8 +177,11 @@ class AuthService {
         }
         return response;
     }
-    async getAccountForUser(userId: string) {
-        return await prisma.users.findFirst({
+    async getAccountForUser(userId: string): Promise<any> {
+        if (!userId) {
+            return { error: 'Bad request' };
+        }
+        const account = await prisma.users.findFirst({
             where: {
                 id: userId,
                 account: {
@@ -193,6 +190,11 @@ class AuthService {
             },
             select: { account: true },
         });
+        if (!account) {
+            return { error: 'Account does not exist' };
+        }
+
+        return account;
     }
 }
 

diff --git a/packages/client/src/home/index.tsx b/packages/client/src/home/index.tsx
@@ -11,13 +11,16 @@ const Home = () => {
     const [isLoading, setLoading] = useState<boolean>(false);
 
     useEffect(() => {
+        const headers = new Headers();
+        headers.append('Content-Type', 'application/json');
+
         const data = JSON.stringify({
             userId: user.user?.id,
         });
-
         const requestOptions = {
             method: 'POST',
             body: data,
+            headers: headers,
         };
         setLoading(true);
         fetch(`${REVERT_BASE_API_URL}/internal/account`, requestOptions)