Skip to content

Commit

Permalink
Apply formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
gf-rog authored and github-actions[bot] committed May 16, 2024
1 parent e99a597 commit 4428e05
Show file tree
Hide file tree
Showing 68 changed files with 250 additions and 209 deletions.
10 changes: 5 additions & 5 deletions backend/src/httpServer.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import express from "express";
import cors from "cors";
import cookieParser from "cookie-parser";

import { createServer } from "node:http";

import usersRouter from "./routes/usersRoute.js";
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 usersRouter from "./routes/usersRoute.js";

const app = express();
const port: number = 5000;
Expand Down
3 changes: 1 addition & 2 deletions backend/src/importDb.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import driver from "./driver.js";

import userData from "./userData.js";
import { registerUser, registerUserSchema } from "./users.js";
import { addFriend } from "./userFriends.js";
import { registerUser, registerUserSchema } from "./users.js";

export async function isDatabaseEmpty() {
const session = driver.session();
Expand Down
4 changes: 2 additions & 2 deletions backend/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import "dotenv/config";

import "./httpServer.js";
import "./socketServer.js";
import "./kcAdminClient.js";

import { cleanUpData, importInitialData } from "./importDb.js";
import { connect } from "mongoose";

import { cleanUpData, importInitialData } from "./importDb.js";

cleanUpData();
importInitialData().then((res) => console.log(res));

Expand Down
1 change: 1 addition & 0 deletions backend/src/meetings.ts
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions backend/src/misc/fetchData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export const fetchData = async (
if (token) {
options.headers = {
...options.headers,
"Authorization": `Bearer ${token}`
}
"Authorization": `Bearer ${token}`,
};
}

try {
Expand Down
1 change: 1 addition & 0 deletions backend/src/misc/formatError.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ZodError } from "zod";

import { Errors } from "../models/Response.js";

export function formatError<T>(error: ZodError<T>): Errors {
Expand Down
11 changes: 6 additions & 5 deletions backend/src/misc/jwt.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { Request, Response, NextFunction } from "express";
import { NextFunction, Request, Response } from "express";
import jwt from "jsonwebtoken";
import { AuthResponse, CustomResponse } from "../models/Response.js";
import DecodedData from "../models/DecodedData.js";
import Issuer from "../models/Issuer.js";
import TokenPayload from "../models/TokenPayload.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";

export interface JWTRequest extends Request {
token?: TokenPayload;
Expand Down
1 change: 1 addition & 0 deletions backend/src/models/ChangePasswordReq.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { z } from "zod";

import { userPasswordSchema } from "./User.js";

type ChangePasswordReq =
Expand Down
2 changes: 1 addition & 1 deletion backend/src/models/NativeUser.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ZodType, z } from "zod";
import { z, ZodType } from "zod";

type NativeUser = {
password: string;
Expand Down
4 changes: 2 additions & 2 deletions backend/src/models/Response.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Response } from "express";

import Message from "./Message.js";
import User from "./User.js";

import { Response } from "express";

type Send<J, T = Response> = (body?: J) => T;

export interface CustomResponse<J> extends Response {
Expand Down
2 changes: 1 addition & 1 deletion backend/src/models/User.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ZodType, z } from "zod";
import { z, ZodType } from "zod";

export default interface User {
id: string;
Expand Down
2 changes: 1 addition & 1 deletion backend/src/models/routes/Page.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ZodType, z } from "zod";
import { z, ZodType } from "zod";

interface Page {
page: string | number;
Expand Down
5 changes: 3 additions & 2 deletions backend/src/models/routes/Search.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions backend/src/mongoDB/MessageModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { model, Schema } from "mongoose";

import Message from "../models/Message.js";

const chatSchema = new Schema<Message>({
Expand Down
12 changes: 5 additions & 7 deletions backend/src/routes/authRoute.ts
Original file line number Diff line number Diff line change
@@ -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.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();

Expand Down
7 changes: 4 additions & 3 deletions backend/src/routes/chatRoute.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { Router } from "express";

import driver from "../driver.js";
import { authenticateToken, JWTRequest } from "../misc/jwt.js";
import Message from "../models/Message.js";
import { Errors } from "../models/Response.js";
import MessageModel from "../mongoDB/MessageModel.js";
import { JWTRequest, authenticateToken } from "../misc/jwt.js";
import { AuthMessagesErrorResponse } from "../types/userResponse.js";
import { Errors } from "../models/Response.js";
import { getTokenDbUser } from "../users.js";
import driver from "../driver.js";
import { userNotFoundRes } from "./usersRoute.js";

const chatRouter = Router();
Expand Down
41 changes: 22 additions & 19 deletions backend/src/routes/userFriendsRoute.ts
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
import { Router, Request, Response } from "express";
import { Request, Response, Router } from "express";
import { Session } from "neo4j-driver";

import driver from "../driver.js";
import { formatError } from "../misc/formatError.js";
import { authenticateToken, JWTRequest } from "../misc/jwt.js";
import { Errors } from "../models/Response.js";
import Page, { pageSchema } from "../models/routes/Page.js";
import User from "../models/User.js";
import {
OkErrorResponse,
FriendsPageErrorResponse,
AuthOkErrorResponse,
FriendRequestsPageErrorResponse,
FriendsPageErrorResponse,
FriendSuggestionsPageErrorResponse,
AuthOkErrorResponse,
OkErrorResponse,
} from "../types/userResponse.js";
import { deleteFriend } from "../userFriends.js";
import { declineFriendRequest } from "../userFriends.js";
import { acceptFriendRequest } from "../userFriends.js";
import { sendFriendRequest } from "../userFriends.js";
import { getFriendSuggestionsCount } from "../userFriends.js";
import { getFriendSuggestions } from "../userFriends.js";
import { getFriendRequestsCount } from "../userFriends.js";
import { getFriendRequests } from "../userFriends.js";
import { getFriendsCount } from "../userFriends.js";
import { getFriends } from "../userFriends.js";
import { userNotFoundRes } from "./usersRoute.js";
import { Errors } from "../models/Response.js";
import Page, { pageSchema } from "../models/routes/Page.js";
import { formatError } from "../misc/formatError.js";
import { JWTRequest, authenticateToken } from "../misc/jwt.js";
import {
acceptFriendRequest,
declineFriendRequest,
deleteFriend,
getFriendRequests,
getFriendRequestsCount,
getFriends,
getFriendsCount,
getFriendSuggestions,
getFriendSuggestionsCount,
sendFriendRequest,
} from "../userFriends.js";
import { getDbUser, getTokenDbUser } from "../users.js";
import { userNotFoundRes } from "./usersRoute.js";

const friendsRouter = Router();

Expand Down
37 changes: 19 additions & 18 deletions backend/src/routes/usersRoute.ts
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
import { Router, Request, Response } from "express";
import { Request, Response, Router } from "express";

import driver from "../driver.js";
import { JWTRequest, authenticateToken, getToken } from "../misc/jwt.js";
import { formatError } from "../misc/formatError.js";
import { authenticateToken, getToken, JWTRequest } from "../misc/jwt.js";
import { changePasswordReqSchema } from "../models/ChangePasswordReq.js";
import DbUser from "../models/DbUser.js";
import { Errors } from "../models/Response.js";
import { searchSchema } from "../models/routes/Search.js";
import {
AuthOkErrorResponse,
OkErrorResponse,
UserErrorResponse,
UsersErrorResponse,
UsersSearchErrorResponse,
} from "../types/userResponse.js";
import usersFriendsRoute from "./userFriendsRoute.js";
import {
getAllUsers,
searchUser as searchUsers,
getUser as getUser,
changePassword,
createUser,
updateUser,
deleteUser,
UserCreateResult,
registerUser,
getAllUsers,
getDbUser,
changePassword,
getTokenDbUser,
getUser,
getUsersCount,
registerUserSchema,
registerUser,
RegisterUser,
updateUserSchema,
registerUserSchema,
searchUser as searchUsers,
updateUser,
UpdateUser,
getTokenDbUser,
updateUserSchema,
UserCreateResult,
} from "../users.js";
import DbUser from "../models/DbUser.js";
import { changePasswordReqSchema } from "../models/ChangePasswordReq.js";
import { formatError } from "../misc/formatError.js";
import { Errors } from "../models/Response.js";
import { searchSchema } from "../models/routes/Search.js";
import usersFriendsRoute from "./userFriendsRoute.js";

const usersRouter = Router();

Expand Down
26 changes: 13 additions & 13 deletions backend/src/socketServer.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
import { Socket, Server as SocketServer } from "socket.io";

import driver from "./driver.js";
import { Socket } from "socket.io";
import {
connectToSocket,
disconnectFromSocket,
getAllSockets,
} from "./sockets.js";
import { isFriend } from "./userFriends.js";
import Meeting from "./models/Meeting.js";
import ClientToServerEvents from "./events/ClientToServerEvents.js";
import ServerToClientEvents from "./events/ServerToClientEvents.js";
import { expressServer } from "./httpServer.js";
import {
createMeeting,
leaveMeeting,
isInMeeting,
joinMeeting,
leaveMeeting,
} from "./meetings.js";
import { addMessageToDb } from "./messages.js";
import { Server as SocketServer } from "socket.io";
import ClientToServerEvents from "./events/ClientToServerEvents.js";
import ServerToClientEvents from "./events/ServerToClientEvents.js";
import { expressServer } from "./httpServer.js";
import Meeting from "./models/Meeting.js";
import {
connectToSocket,
disconnectFromSocket,
getAllSockets,
} from "./sockets.js";
import { isFriend } from "./userFriends.js";

const io = new SocketServer<ClientToServerEvents, ServerToClientEvents>(
expressServer,
Expand Down
4 changes: 2 additions & 2 deletions backend/src/types/authResponse.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
CustomResponse,
JWTResponse,
AuthResponse,
CustomResponse,
ErrorResponse,
JWTResponse,
} from "../models/Response.js";

export type TokenErrorResponse = CustomResponse<
Expand Down
12 changes: 6 additions & 6 deletions backend/src/types/userResponse.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import {
AuthResponse,
CustomResponse,
ErrorResponse,
FriendRequestsPageResponse,
FriendsPageResponse,
FriendsResponse,
FriendSuggestionsPageResponse,
MessagesResponse,
OkResponse,
UserResponse,
UsersResponse,
FriendsResponse,
UsersSearchResponse,
AuthResponse,
FriendsPageResponse,
FriendRequestsPageResponse,
FriendSuggestionsPageResponse,
MessagesResponse,
} from "../models/Response.js";

export type UsersErrorResponse = CustomResponse<UsersResponse | ErrorResponse>;
Expand Down
1 change: 1 addition & 0 deletions backend/src/userFriends.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import neo4j, { Session } from "neo4j-driver";

import User from "./models/User.js";
import { filterUser, getUser } from "./users.js";

Expand Down
Loading

0 comments on commit 4428e05

Please sign in to comment.