Add Keycloak

.github/workflows/docker.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Wait for containers to start
         run: |
-          sleep 18
+          sleep 80
           docker run \
             --rm \
             --network mercury-project_default \

backend/.env

@@ -1,3 +1,3 @@
 TOKEN_SECRET=27a0967eed44a78feec1ccd9225343258894288202c0a45a8f93adce6786dbc9ae5a7fc4df716f29eefed7067d9b94fa9f7c2ab7dd7781d36cb22206bf25b886
 LINK_SECRET=ijr2iq34rfeiadsfkjq3ew
-
+CLIENT_SECRET=fOP43IDxXavjRogZMQWKW1qmJAz5zeEf

backend/package.json

@@ -2,7 +2,6 @@
   "name": "backend",
   "version": "0.0.1",
   "description": "",
-  "main": "index.js",
   "keywords": [],
   "author": "",
   "license": "ISC",
@@ -13,7 +12,10 @@
     "build": "tsc",
     "prod": "node build/index.js"
   },
+  "type": "module",
+  "exports": "src/index.ts",
   "dependencies": {
+    "@keycloak/keycloak-admin-client": "^24.0.1",
     "@types/jsonwebtoken": "^9.0.5",
     "axios": "^1.6.2",
     "bcrypt": "^5.1.1",

backend/src/db.ts

@@ -1,10 +1,7 @@
-import { v4 as uuidv4 } from "uuid";
+import driver from "./driver/driver.js";
 
-import driver from "./driver/driver";
-import bcrypt from "bcrypt";
-
-import userData from "./data/users";
-import wordToVec from "./misc/wordToVec";
+import userData from "./data/users.js";
+import { createUser, registerUser } from "./users.js";
 
 export async function isDatabaseEmpty() {
   const session = driver.session();
@@ -18,12 +15,28 @@ export async function isDatabaseEmpty() {
     console.error("Error while loading database:", error);
     return false;
   } finally {
-    session.close();
+    await session.close();
   }
 }
 
 export async function importInitialData() {
   const isEmpty = await isDatabaseEmpty();
+
+  const testUser = await registerUser({
+    first_name: "John",
+    last_name: "Smith",
+    country: "PL",
+    profile_picture: "",
+    mail: "[email protected]",
+    password: "password",
+  });
+
+  if ("errors" in testUser) {
+    console.log("Couldn't register test user: ", testUser.errors);
+  } else {
+    console.log("Test user created: ", testUser);
+  }
+
   if (!isEmpty) {
     return "Database is not empty";
   }
@@ -32,28 +45,11 @@ export async function importInitialData() {
   try {
     const userIds: string[] = [];
 
-    // Create users
-    const createUserQuery = `
-      CREATE (u:User $user)
-    `;
-
     for (const user of userData) {
-      const userId = uuidv4();
-      userIds.push(userId);
-
-      const userClean: any = Object.assign({}, user);
-      delete userClean.friend_ids;
-      delete userClean.chats;
-
-      userClean.id = userId;
-      userClean.name_embedding = wordToVec(
-        userClean.first_name + userClean.last_name,
-      );
-      const { password } = userClean;
-      const passwordHashed = await bcrypt.hash(password, 10);
-      userClean.password = passwordHashed;
-
-      await session.run(createUserQuery, { user: userClean });
+      const newUser = await createUser(session, user);
+      if (!("errors" in newUser)) {
+        userIds.push(newUser.id);
+      }
     }
 
     // Create relationships
@@ -93,13 +89,13 @@ export async function importInitialData() {
   } catch (error) {
     return "Error importing data";
   } finally {
-    session.close();
+    await session.close();
   }
 }
 
 export async function cleanUpData() {
   const session = driver.session();
   await session.run(`MATCH (m:Meeting) DETACH DELETE m`);
   await session.run(`MATCH (s:Socket) DETACH DELETE s`);
-  session.close();
+  await session.close();
 }

backend/src/httpServer.ts

@@ -1,9 +1,9 @@
 import dotenv from "dotenv";
-import servers from "./server";
-import usersRouter from "./routes/usersRoute";
-import authRouter from "./routes/authRoute";
-import chatRouter from "./routes/chatRoute";
-import { cleanUpData, importInitialData } from "./db";
+import servers from "./server.js";
+import usersRouter from "./routes/usersRoute.js";
+import authRouter from "./routes/authRoute.js";
+import chatRouter from "./routes/chatRoute.js";
+import { cleanUpData, importInitialData } from "./db.js";
 
 const { app } = servers;
 

backend/src/index.ts

@@ -1,2 +1,3 @@
-import "./httpServer";
-import "./socketServer";
+import "./httpServer.js";
+import "./socketServer.js";
+import "./kcAdminClient.js";