Merge remote-tracking branch 'origin/main' into user-management

.env.example

@@ -12,6 +12,8 @@ GRAPH_PORT=3000
 ELK_PORT=5601
 
 GOOGLE_CALLBACK_URL=https://localhost:8443/api/v1
+# the url to which the user will be redirected when it logs with google 
+CALLBACK_REDIR=http://localhost:3000
 GOOGLE_CLIENT_SECRET=susAF
 GOOGLE_CLIENT_ID=Really
 
@@ -24,3 +26,6 @@ SMTP_FROM=<the address to send from>
 SMTP_AUTH_USERNAME=<smtp-user>
 SMTP_AUTH_PASSWORD=<smtp pass>
 EMAIL_TO=<mail to send to>
+
+USER_URL=<the url to the user api>
+AUTH_URL=<the url to the auth api>

src/api/auth/gLogCallback.js

@@ -37,7 +37,7 @@ export async function gLogCallback(request, reply, fastify) {
 			return reply.code(400).send({ error: "User does not exist" });
 		}
 
-		const token = fastify.jwt.sign(user);
+		const token = fastify.jwt.sign({ user: user.username});
 
 		return reply
 			.setCookie('token', token, {
@@ -45,9 +45,7 @@ export async function gLogCallback(request, reply, fastify) {
 				path: '/',
 				secure: env !== 'development',
 				sameSite: 'lax',
-			})
-			.code(200)
-			.send({ msg: "Login successful" });
+			}).redirect(process.env.CALLBACK_REDIR);
 	} catch (error) {
 		fastify.log.error(error);
 		reply.code(500).send({ error: 'Internal server error' });

src/api/auth/gRegisterCallback.js

@@ -1,6 +1,7 @@
 import axios from 'axios'
 
 import authDB from '../../utils/authDB.js';
+import { authUserCreate } from '../../utils/authUserCreate.js';
 
 var env = process.env.NODE_ENV || 'development';
 
@@ -46,7 +47,9 @@ export async function gRegisterCallback(request, reply, fastify) {
 
 		authDB.addUser(user.username, '');
 
-		const token = fastify.jwt.sign(user);
+		authUserCreate(user.username, fastify)
+
+		const token = fastify.jwt.sign({ user: user.username});
 
 		return reply
 			.setCookie('token', token, {
@@ -54,9 +57,7 @@ export async function gRegisterCallback(request, reply, fastify) {
 				path: '/',
 				secure: env !== 'development',
 				sameSite: 'lax',
-			})
-			.code(200)
-			.send({ msg: "Register successful" });
+			}).redirect(process.env.CALLBACK_REDIR);
 	} catch (error) {
 		fastify.log.error(error);
 		reply.code(500).send({ error: 'Internal server error' });

src/api/auth/register.js

@@ -2,6 +2,7 @@ import bcrypt from 'bcrypt';
 
 import { isValidString } from '../../utils/authUtils.js';
 import authDB from '../../utils/authDB.js';
+import { authUserCreate } from '../../utils/authUserCreate.js';
 
 var env = process.env.NODE_ENV || 'development';
 
@@ -36,6 +37,8 @@ export async function register(request, reply, saltRounds, fastify) {
 		const hash = await bcrypt.hash(password, saltRounds);
 		authDB.addUser(user, hash);
 
+		authUserCreate(user, fastify)
+
 		const token = fastify.jwt.sign({ user });
 
 		return reply

src/utils/authUserCreate.js

@@ -0,0 +1,24 @@
+import axios from 'axios';
+
+/**
+ * @param {string} username
+ * @param {import('fastify').FastifyInstance} fastify
+ */
+export async function authUserCreate(username, fastify) {
+    const payload = {
+        displayName: username,
+    };
+    const cookie = fastify.jwt.sign({ user: "admin" });
+
+	const url = process.env.USER_URL || "http://localhost:3002/"
+
+    await axios.post(
+        url + "users/" + username,
+        payload,
+        {
+            headers: {
+                'Cookie': 'token=' + cookie,
+            },
+        }
+    );
+}