Merge pull request #172 from Karol-2/backend-fixes

Backend fixes

.prettierignore

@@ -1,2 +1,5 @@
 node_modules/
-coverage/
+coverage/
+frontend/.vite/
+keycloak/
+db/

.prettierrc

@@ -8,5 +8,7 @@
   "endOfLine": "lf",
   "semi": true,
   "bracketSpacing": true,
-  "quoteProps": "preserve"
+  "quoteProps": "preserve",
+  "plugins": ["@ianvs/prettier-plugin-sort-imports"],
+  "importOrder": ["<BUILTIN_MODULES>", "", "<THIRD_PARTY_MODULES>", "", "^[.]"]
 }

backend/package.json

@@ -27,6 +27,7 @@
     "neo4j-driver": "^5.13.0",
     "socket.io": "^4.7.2",
     "unidecode": "^0.1.8",
+    "uuid": "^9.0.1",
     "vite": "^5.2.6",
     "zod": "^3.22.4"
   },
@@ -42,7 +43,6 @@
     "tsc-watch": "^6.0.4",
     "tsx": "^4.7.1",
     "typescript": "^5.2.2",
-    "uuid": "^9.0.1",
     "vitest": "^0.34.6"
   }
 }

backend/src/httpServer.ts

@@ -1,17 +1,38 @@
-import dotenv from "dotenv";
-import servers from "./server.js";
-import usersRouter from "./routes/usersRoute.js";
+import { createServer } from "node:http";
+
+import cookieParser from "cookie-parser";
+import cors from "cors";
+import express from "express";
+
 import authRouter from "./routes/authRoute.js";
 import chatRouter from "./routes/chatRoute.js";
-import { cleanUpData, importInitialData } from "./db.js";
+import usersRouter from "./routes/usersRoute.js";
 
-const { app } = servers;
+const app = express();
+const port: number = 5000;
 
-dotenv.config();
+const corsOptions = {
+  origin: ["http://localhost:5000", "http://localhost:5173"],
+  optionsSuccessStatus: 200,
+};
 
-cleanUpData();
-importInitialData().then((res) => console.log(res));
+app.use(cors(corsOptions));
+app.use((_req, res, next) => {
+  res.header("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+  res.header("Access-Control-Allow-Headers", "Content-Type");
+  next();
+});
+app.use(cookieParser());
+app.use(express.json({ limit: "10mb" }));
+
+const expressServer = createServer(app);
+
+expressServer.listen(port, () => {
+  console.log(`HTTP server running on port ${port}`);
+});
 
 app.use("/users", usersRouter);
 app.use("/auth", authRouter);
 app.use("/chat", chatRouter);
+
+export { expressServer };

backend/src/db.ts → backend/src/importDb.ts

@@ -1,8 +1,7 @@
-import driver from "./driver/driver.js";
-
-import userData from "./data/users.js";
-import { registerUser, registerUserSchema } from "./users.js";
+import driver from "./driver.js";
+import userData from "./userData.js";
 import { addFriend } from "./userFriends.js";
+import { registerUser, registerUserSchema } from "./users.js";
 
 export async function isDatabaseEmpty() {
   const session = driver.session();

backend/src/index.ts

@@ -1,3 +1,19 @@
+import "dotenv/config";
 import "./httpServer.js";
 import "./socketServer.js";
 import "./kcAdminClient.js";
+
+import { connect } from "mongoose";
+
+import { cleanUpData, importInitialData } from "./importDb.js";
+
+cleanUpData();
+importInitialData().then((res) => console.log(res));
+
+try {
+  const uri = process.env.MONGODB_URI || "mongodb://localhost:27017";
+  await connect(`${uri}/chats`);
+  console.log("Chat database started");
+} catch (err) {
+  console.error(err);
+}

backend/src/kcAdminClient.ts

@@ -2,6 +2,9 @@ import KeycloakAdminClient from "@keycloak/keycloak-admin-client";
 
 export const keycloakUri = process.env.KEYCLOAK_URI || "http://localhost:3000";
 export const keycloakIssuer = process.env.KEYCLOAK_ISSUER || keycloakUri;
+export const keycloakCredentials = Buffer.from(
+  `mercury-backend:${process.env.CLIENT_SECRET}`,
+).toString("base64");
 
 const kcAdminClient = new KeycloakAdminClient({
   baseUrl: keycloakUri,

backend/src/meetings.ts

@@ -1,5 +1,6 @@
 import { Session } from "neo4j-driver";
 import { v4 as uuidv4 } from "uuid";
+
 import Meeting from "./models/Meeting.js";
 
 export async function isInMeeting(session: Session, userId: string) {

backend/src/misc/fetchData.ts

@@ -1,4 +1,16 @@
-export const fetchData = async (url: string, method: string, options = {}) => {
+export const fetchData = async (
+  url: string,
+  method: string,
+  options: RequestInit = {},
+  token?: string,
+) => {
+  if (token) {
+    options.headers = {
+      ...options.headers,
+      "Authorization": `Bearer ${token}`,
+    };
+  }
+
   try {
     const response = await fetch(url, { ...options, method });
     const data = await response.json();

backend/src/misc/formatError.ts

@@ -1,4 +1,5 @@
 import { ZodError } from "zod";
+
 import { Errors } from "../models/Response.js";
 
 export function formatError<T>(error: ZodError<T>): Errors {

backend/src/misc/jwt.ts

@@ -1,17 +1,22 @@
-import { Request, Response, NextFunction } from "express";
+import { NextFunction, Request, Response } from "express";
 import jwt from "jsonwebtoken";
-import { AuthResponse, CustomResponse } from "../models/Response.js";
+
+import {
+  keycloakCredentials,
+  keycloakIssuer,
+  keycloakUri,
+} from "../kcAdminClient.js";
 import DecodedData from "../models/DecodedData.js";
 import Issuer from "../models/Issuer.js";
+import { AuthResponse, CustomResponse } from "../models/Response.js";
 import TokenPayload from "../models/TokenPayload.js";
-import { keycloakIssuer, keycloakUri } from "../kcAdminClient.js";
 
 export interface JWTRequest extends Request {
   token?: TokenPayload;
   tokenStr?: string;
 }
 
-const issuers: Record<Issuer, string> = {
+export const issuers: Record<Issuer, string> = {
   mercury: `${keycloakIssuer}/realms/mercury`,
   rest: "http://localhost:5000",
 };
@@ -37,12 +42,14 @@ function tokenIssuerToName(issuer: string): Issuer | "unknown" {
 
 export async function verifyKeycloakToken(tokenStr: string): Promise<boolean> {
   const response = await fetch(
-    `${keycloakUri}/realms/mercury/protocol/openid-connect/userinfo`,
+    `${keycloakUri}/realms/mercury/protocol/openid-connect/token/introspect`,
     {
-      method: "GET",
+      method: "POST",
       headers: {
-        "Authorization": `Bearer ${tokenStr}`,
+        "Content-Type": "application/x-www-form-urlencoded",
+        "Authorization": `Basic ${keycloakCredentials}`,
       },
+      body: `token=${tokenStr}`,
     },
   );
 

backend/src/models/ChangePasswordReq.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+
 import { userPasswordSchema } from "./User.js";
 
 type ChangePasswordReq =

backend/src/models/NativeUser.ts

@@ -1,4 +1,4 @@
-import { ZodType, z } from "zod";
+import { z, ZodType } from "zod";
 
 type NativeUser = {
   password: string;

backend/src/models/Response.ts

@@ -1,7 +1,8 @@
-import User from "./User.js";
-
 import { Response } from "express";
 
+import Message from "./Message.js";
+import User from "./User.js";
+
 type Send<J, T = Response> = (body?: J) => T;
 
 export interface CustomResponse<J> extends Response {
@@ -60,6 +61,11 @@ export interface UsersSearchResponse {
   users: User[];
 }
 
+export interface MessagesResponse {
+  status: "ok";
+  messages: Message[];
+}
+
 export interface JWTResponse extends OkResponse {
   token: string;
 }

backend/src/models/User.ts

@@ -1,4 +1,4 @@
-import { ZodType, z } from "zod";
+import { z, ZodType } from "zod";
 
 export default interface User {
   id: string;

backend/src/models/routes/Page.ts

@@ -1,4 +1,4 @@
-import { ZodType, z } from "zod";
+import { z, ZodType } from "zod";
 
 interface Page {
   page: string | number;

backend/src/models/routes/Search.ts

@@ -1,6 +1,7 @@
-import { ZodType, z } from "zod";
-import Page, { pageSchema } from "./Page.js";
+import { z, ZodType } from "zod";
+
 import { userCountrySchema } from "../User.js";
+import Page, { pageSchema } from "./Page.js";
 
 interface Search extends Page {
   q: string;

backend/src/mongoDB/MessageModel.ts

@@ -1,4 +1,5 @@
 import { model, Schema } from "mongoose";
+
 import Message from "../models/Message.js";
 
 const chatSchema = new Schema<Message>({

backend/src/routes/authRoute.ts

@@ -1,21 +1,19 @@
-import { Router, Request } from "express";
-
 import bcrypt from "bcrypt";
+import { Request, Router } from "express";
+import jwt, { JwtPayload } from "jsonwebtoken";
 
-import driver from "../driver/driver.js";
+import driver from "../driver.js";
+import { leaveMeeting } from "../meetings.js";
 import {
-  JWTRequest,
   authenticateToken,
   generateAccessToken,
   generateRefreshToken,
+  JWTRequest,
 } from "../misc/jwt.js";
-
-import jwt, { JwtPayload } from "jsonwebtoken";
+import { Errors } from "../models/Response.js";
 import { TokenErrorResponse } from "../types/authResponse.js";
 import { OkErrorResponse } from "../types/userResponse.js";
-import { leaveMeeting } from "../meetings.js";
 import { getDbUser } from "../users.js";
-import { Errors } from "../models/Response.js";
 
 const authRouter = Router();