change url

Co-authored-by: Michael Costello <[email protected]>
Co-authored-by: Steven Geiger <[email protected]>
Co-authored-by: Yufa Li <[email protected]>
Co-authored-by: Alexander Tu <[email protected]>

Author: 4 people

server/routes/index.ts

@@ -1,42 +1,53 @@
 import { Express, Request, Response, NextFunction } from 'express';
 import { handleGoogleAuth } from '../controllers/auth.controller';
-import { retrieveSchema, saveSchema, userRegistration, verifyUser } from '../controllers/user.controller';
+import {
+  retrieveSchema,
+  saveSchema,
+  userRegistration,
+  verifyUser,
+} from '../controllers/user.controller';
 import { postgresRouter } from './postgres.router';
 import mysqlRouter from './mysql.router';
 import session from 'express-session';
-declare module "express-session" {
+declare module 'express-session' {
   interface SessionData {
     user: string;
   }
 }
-import connectRedis from 'connect-redis'
-import dotenv from 'dotenv'
+import connectRedis from 'connect-redis';
+import dotenv from 'dotenv';
 dotenv.config();
-import Redis from 'ioredis'
-import { getCurrentUser } from '../service/session.service'
+import Redis from 'ioredis';
+import { getCurrentUser } from '../service/session.service';
 import path from 'path';
 
-
-const client_url = process.env.NODE_ENV === 'development' ? process.env.DEV_CLIENT_ENDPOINT : process.env.CLIENT_ENDPOINT
+const client_url =
+  process.env.NODE_ENV === 'development'
+    ? process.env.DEV_CLIENT_ENDPOINT
+    : process.env.CLIENT_ENDPOINT;
 
 const routes = async (app: Express) => {
-  // setup UpStash client and Redis store 
+  // setup UpStash client and Redis store
   const RedisStore = connectRedis(session);
 
-  const client = new Redis(`rediss://:${process.env.REDIS_PASSWORD}@${process.env.REDIS_URL}:${process.env.REDIS_PORT}`)
+  const client = new Redis(
+    `rediss://:${process.env.REDIS_PASSWORD}@${process.env.REDIS_URL}:${process.env.REDIS_PORT}`
+  );
 
   // set session cookie
-  app.use(session({
-    store: new RedisStore({ client }),
-    secret: process.env.REDIS_SECRET as string,
-    resave: false,
-    saveUninitialized: true,
-    cookie: {
-      secure: process.env.ENVIRONMENT === 'production' ? true : 'auto',
-      maxAge: 24 * 60 * 60 * 1000,
-      sameSite: 'lax',
-    }
-  }))
+  app.use(
+    session({
+      store: new RedisStore({ client }),
+      secret: process.env.REDIS_SECRET as string,
+      resave: false,
+      saveUninitialized: true,
+      cookie: {
+        secure: process.env.ENVIRONMENT === 'production' ? true : 'auto',
+        maxAge: 24 * 60 * 60 * 1000,
+        sameSite: 'lax',
+      },
+    })
+  );
 
   app.get('/api/healthcheck', (req: Request, res: Response) => res.sendStatus(200));
 
@@ -58,13 +69,13 @@ const routes = async (app: Express) => {
 
   app.use('/api/logout', (req: Request, res: Response) => {
     req.session.destroy((err) => {
-      if (err) console.log('Error destroying session:', err)
+      if (err) console.log('Error destroying session:', err);
       else {
-        console.log('Succesfully destroyed session')
-        return res.redirect(`${client_url}/`)
+        console.log('Succesfully destroyed session');
+        return res.redirect(`/`);
       }
     });
-  })
+  });
 
   app.get('/*', (req, res) => {
     res.sendFile(path.join(__dirname, '../../dist/index.html'));
@@ -80,6 +91,6 @@ const routes = async (app: Express) => {
     const errorObj = Object.assign({}, defaultErr, err);
     return res.status(errorObj.status).json(errorObj.message);
   });
-}
+};
 
-export default routes;
+export default routes;

src/components/DBDisplay/Sidebar.tsx

@@ -56,7 +56,7 @@ const Sidebar = (props: any) => {
     //change between which getSchema from MySQL to postgres based on db_type
     const dbSchema = await axios
       .post(`api/sql/${values.db_type}/getSchema`, values, {
-        baseURL: 'http://localhost:3000',
+        baseURL: '/',
       })
       .then((res) => res.data)
       .catch((err) => console.log('getSchema error', err));

src/utils/getGoogleUrl.ts

@@ -1,23 +1,24 @@
 const getGoogleAuthUrl = () => {
-    const base = 'https://accounts.google.com/o/oauth2/v2/auth';
+  const base = 'https://accounts.google.com/o/oauth2/v2/auth';
 
-    const options = {
-        redirect_uri: 'http://localhost:3000/api/oauth/google',
-        client_id: '373965291205-utb8ih1hoeuf1g90okil5ju43tfdl3vs.apps.googleusercontent.com',
-        access_type: 'offline',
-        response_type: 'code',
-        prompt: 'consent',
-        scope: [
-            'https://www.googleapis.com/auth/userinfo.profile',
-            'https://www.googleapis.com/auth/userinfo.email'
-        ].join(' ')
-    }
-    const queryStr = new URLSearchParams(options)
-    return `${base}?${queryStr.toString()}`
-}
+  const options = {
+    redirect_uri: '/',
+    client_id: '373965291205-utb8ih1hoeuf1g90okil5ju43tfdl3vs.apps.googleusercontent.com',
+    access_type: 'offline',
+    response_type: 'code',
+    prompt: 'consent',
+    scope: [
+      'https://www.googleapis.com/auth/userinfo.profile',
+      'https://www.googleapis.com/auth/userinfo.email',
+    ].join(' '),
+  };
+  const queryStr = new URLSearchParams(options);
+  return `${base}?${queryStr.toString()}`;
+};
 
 export const handleOAuthLogin = () => {
   const url = getGoogleAuthUrl();
-  const strWindowFeatures = 'toolbar=no, menubar=no, width=600, height=700, top=100, left=100';
+  const strWindowFeatures =
+    'toolbar=no, menubar=no, width=600, height=700, top=100, left=100';
   window.open(url, '_self', strWindowFeatures);
-}
+};