moved oauth controller endpoints to auth

backend/src/controllers/v1/authController.ts

@@ -267,3 +267,7 @@ export const getNewToken = async (req: Request, res: Response) => {
     });
   }
 };
+
+export const handleAuthProviderCallback = (req: Request, res: Response) => {
+  res.redirect(`/login/provider/success?token=${encodeURIComponent(req.providerAuthToken)}`);
+}

backend/src/controllers/v1/index.ts

@@ -5,7 +5,6 @@ import * as integrationController from './integrationController';
 import * as keyController from './keyController';
 import * as membershipController from './membershipController';
 import * as membershipOrgController from './membershipOrgController';
-import * as oauthController from './oauthController';
 import * as organizationController from './organizationController';
 import * as passwordController from './passwordController';
 import * as secretController from './secretController';
@@ -24,7 +23,6 @@ export {
 	keyController,
 	membershipController,
 	membershipOrgController,
-	oauthController,
 	organizationController,
 	passwordController,
 	secretController,

backend/src/controllers/v1/oauthController.ts

@@ -1,5 +0,0 @@
-import { Request, Response } from 'express';
-
-export const handleAuthProviderCallback = (req: Request, res: Response) => {
-    res.redirect(`/login/provider/success?token=${encodeURIComponent(req.providerAuthToken)}`);
-}

backend/src/index.ts

@@ -39,7 +39,6 @@ import {
   membership as v1MembershipRouter,
   key as v1KeyRouter,
   inviteOrg as v1InviteOrgRouter,
-  oauth as v1OAuth,
   user as v1UserRouter,
   userAction as v1UserActionRouter,
   secret as v1SecretRouter,
@@ -135,7 +134,6 @@ const main = async () => {
   // v1 routes (default)
   app.use("/api/v1/signup", v1SignupRouter);
   app.use("/api/v1/auth", v1AuthRouter);
-  app.use("/api/v1/oauth", v1OAuth);
   app.use("/api/v1/bot", v1BotRouter);
   app.use("/api/v1/user", v1UserRouter);
   app.use("/api/v1/user-action", v1UserActionRouter);

backend/src/routes/v1/auth.ts

@@ -1,6 +1,7 @@
 import express from 'express';
 const router = express.Router();
 import { body } from 'express-validator';
+import passport from 'passport';
 import { requireAuth, validateRequest } from '../../middleware';
 import { authController } from '../../controllers/v1';
 import { authLimiter } from '../../helpers/rateLimiter';
@@ -44,4 +45,20 @@ router.post(
 );
 
 
+
+router.get(
+  '/redirect/google',
+  authLimiter,
+  passport.authenticate('google', {
+    scope: ['profile', 'email'],
+    session: false,
+  }),
+)
+
+router.get(
+  '/callback/google',
+  passport.authenticate('google', { failureRedirect: '/login/provider/error', session: false }),
+  authController.handleAuthProviderCallback,
+)
+
 export default router;

backend/src/routes/v1/index.ts

@@ -16,7 +16,6 @@ import stripe from './stripe';
 import integration from './integration';
 import integrationAuth from './integrationAuth';
 import secretsFolder from './secretsFolder';
-import oauth from './oauth';
 
 export {
 	signup,
@@ -30,7 +29,6 @@ export {
 	membership,
 	key,
 	inviteOrg,
-	oauth,
 	secret,
 	serviceToken,
 	password,

backend/src/routes/v1/oauth.ts

@@ -1,22 +0,0 @@
-import express from 'express';
-const router = express.Router();
-import passport from 'passport';
-import { oauthController } from '../../controllers/v1';
-import { authLimiter } from '../../helpers/rateLimiter';
-
-router.get(
-  '/redirect/google',
-  authLimiter,
-  passport.authenticate('google', {
-    scope: ['profile', 'email'],
-    session: false,
-  }),
-)
-
-router.get(
-  '/callback/google',
-  passport.authenticate('google', { failureRedirect: '/login/provider/error', session: false }),
-  oauthController.handleAuthProviderCallback,
-)
-
-export default router;

backend/src/utils/auth.ts

@@ -68,7 +68,7 @@ const initializePassport = async () => {
     passReqToCallback: true,
     clientID: googleClientId,
     clientSecret: googleClientSecret,
-    callbackURL: '/api/v1/oauth/callback/google',
+    callbackURL: '/api/v1/auth/callback/google',
     scope: ['profile', ' email'],
   }, async (
     req: express.Request,