added support for react

Author: FullStackkDev

.env.sample

@@ -0,0 +1,5 @@
+PORT=5000
+GITHUB_OAUTH_CLIENT_ID=
+GITHUB_OAUTH_CLIENT_SECRET=
+SQLITE_PATH=./database.db
+SECRET=

src/controllers/auth.controller.ts

@@ -5,21 +5,15 @@ import {
   } from '../services/session.service';
 import { createUserWithToken } from '../services/user.service';
 
-const frontend_url = process.env.FRONTEND_URL ?? '/'
-
 export const githubOauthHandler = async (
     req: Request,
     res: Response,
   ) => {
     try {
       const code = req.query.code as string;
 
-      if (req.query.error) {
-        return res.redirect(`${frontend_url}/login`);
-      }
-  
       if (!code) {
-        console.log('authorization code not provided')
+        return res.json({error: 'authorization code not provided'})
       }
 
       // Get access_token using code
@@ -29,11 +23,8 @@ export const githubOauthHandler = async (
       const userData = await getGithubUser({access_token});
 
       const returnedUser = await createUserWithToken(userData)
-      if(returnedUser) {
-        res.redirect(frontend_url);
-      }else {
-        res.json({error: 'no user returned'})
-      }
+      
+      res.json({user: returnedUser})
 
     } catch (err: any) {
       res.json({'error': err.message})

src/controllers/logout.controller.ts

@@ -0,0 +1,13 @@
+import ActiveSession from '../models/activeSession';
+import { connection } from '../server/database';
+
+export const logoutUser = (req: any, res: any) => {
+    const { token } = req.body;
+    const activeSessionRepository = connection!.getRepository(ActiveSession);
+  
+    activeSessionRepository.delete({ token })
+      .then(() => res.json({ success: true }))
+      .catch(() => {
+        res.json({ success: false, msg: 'Token revoked' });
+      });
+  }

src/routes/users.ts

@@ -12,6 +12,7 @@ import { checkToken } from '../config/safeRoutes';
 import ActiveSession from '../models/activeSession';
 import User from '../models/user';
 import { connection } from '../server/database';
+import { logoutUser } from '../controllers/logout.controller';
 
 // eslint-disable-next-line new-cap
 const router = express.Router();
@@ -115,16 +116,7 @@ router.post('/login', (req, res) => {
   });
 });
 
-router.post('/logout', checkToken, (req, res) => {
-  const { token } = req.body;
-  const activeSessionRepository = connection!.getRepository(ActiveSession);
-
-  activeSessionRepository.delete({ token })
-    .then(() => res.json({ success: true }))
-    .catch(() => {
-      res.json({ success: false, msg: 'Token revoked' });
-    });
-});
+router.post('/logout', checkToken, logoutUser);
 
 router.post('/checkSession', checkToken, (_req, res) => {
   res.json({ success: true });