Revert "Merge pull request #2973 from bluewave-labs/feat/v2/auth"

This reverts commit 72882fded9, reversing
changes made to bfb299cfca.
This commit is contained in:
Alex Holliday committed 2025-09-23 14:05:23 -07:00
1 parent 003d419a64
commit 990aed9f2e
25 files changed
+69 -894

No files matched your search

-6
View File
@@ -15,9 +15,6 @@ import StatusPageController from "../controllers/v1/statusPageController.js";
import NotificationController from "../controllers/v1/notificationController.js";
import DiagnosticController from "../controllers/v1/diagnosticController.js";
// V2
import AuthV2Controller from "../controllers/v2/AuthController.js";
export const initializeControllers = (services) => {
const controllers = {};
const commonDependencies = createCommonDependencies(services.db, services.errorService, services.logger, services.stringService);
@@ -65,8 +62,5 @@ export const initializeControllers = (services) => {
diagnosticService: services.diagnosticService,
});
// V2
controllers.authV2Controller = new AuthV2Controller(services.authV2Service, services.inviteV2Service);
return controllers;
};
-10
View File
@@ -13,8 +13,6 @@ import LogRoutes from "../routes/v1/logRoutes.js";
import DiagnosticRoutes from "../routes/v1//diagnosticRoute.js";
import NotificationRoutes from "../routes/v1/notificationRoute.js";
import authV2 from "../routes/v2/auth.js";
export const setupRoutes = (app, controllers) => {
const authRoutes = new AuthRoutes(controllers.authController);
const monitorRoutes = new MonitorRoutes(controllers.monitorController);
@@ -39,12 +37,4 @@ export const setupRoutes = (app, controllers) => {
app.use("/api/v1/status-page", statusPageRoutes.getRouter());
app.use("/api/v1/notifications", verifyJWT, notificationRoutes.getRouter());
app.use("/api/v1/diagnostic", verifyJWT, diagnosticRoutes.getRouter());
// *******************
// V2 Routes
// *******************
const v2AuthRoutes = new authV2(controllers.authV2Controller);
app.use("/api/v2/auth", authApiLimiter, v2AuthRoutes.getRouter());
};
+3 -12
View File
@@ -48,8 +48,8 @@ import { ParseBoolean } from "../utils/utils.js";
// Models
import Check from "../db/models/Check.js";
import Monitor from "../db/models/Monitor.js";
import { User } from "../db/models/auth/User.js";
import { Invite } from "../db/models/auth/Invite.js";
import User from "../db/models/User.js";
import InviteToken from "../db/models/InviteToken.js";
import StatusPage from "../db/models/StatusPage.js";
import Team from "../db/models/Team.js";
import MaintenanceWindow from "../db/models/MaintenanceWindow.js";
@@ -68,10 +68,6 @@ import NotificationModule from "../db/mongo/modules/notificationModule.js";
import RecoveryModule from "../db/mongo/modules/recoveryModule.js";
import SettingsModule from "../db/mongo/modules/settingsModule.js";
// v2
import AuthV2Service from "../service/v2/business/AuthService.js";
import InviteV2Service from "../service/v2/business/InviteService.js";
export const initializeServices = async ({ logger, envSettings, settingsService }) => {
const serviceRegistry = new ServiceRegistry({ logger });
ServiceRegistry.instance = serviceRegistry;
@@ -83,7 +79,7 @@ export const initializeServices = async ({ logger, envSettings, settingsService
// Create DB
const checkModule = new CheckModule({ logger, Check, Monitor, User });
const inviteModule = new InviteModule({ Invite, crypto, stringService });
const inviteModule = new InviteModule({ InviteToken, crypto, stringService });
const statusPageModule = new StatusPageModule({ StatusPage, NormalizeData, stringService });
const userModule = new UserModule({ User, Team, GenerateAvatarImage, ParseBoolean, stringService });
const maintenanceWindowModule = new MaintenanceWindowModule({ MaintenanceWindow });
@@ -212,9 +208,6 @@ export const initializeServices = async ({ logger, envSettings, settingsService
games,
});
const authV2Service = new AuthV2Service();
const inviteV2Service = new InviteV2Service();
const services = {
settingsService,
translationService,
@@ -234,8 +227,6 @@ export const initializeServices = async ({ logger, envSettings, settingsService
monitorService,
errorService,
logger,
authV2Service,
inviteV2Service,
};
Object.values(services).forEach((service) => {