Skip to content

Commit

Permalink
Move link_secret property into .env file
Browse files Browse the repository at this point in the history
  • Loading branch information
j.krol committed Nov 25, 2023
1 parent 45cf829 commit cd83426
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
1 change: 1 addition & 0 deletions backend/.env
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
TOKEN_SECRET=27a0967eed44a78feec1ccd9225343258894288202c0a45a8f93adce6786dbc9ae5a7fc4df716f29eefed7067d9b94fa9f7c2ab7dd7781d36cb22206bf25b886
LINK_SECRET=ijr2iq34rfeiadsfkjq3ew
11 changes: 7 additions & 4 deletions backend/src/httpServer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { sign, verify } from "jsonwebtoken";
import {v4} from "uuid";
import dotenv from "dotenv";
import servers from "./server";
import driver from "./driver/driver";
import usersRouter from "./routes/usersRoute";
Expand All @@ -8,7 +9,9 @@ import importInitialData from "./data/importData";
import CreateMeetingDto from "./dtos/createMeeting";

const {app} = servers;
const linkSecret = "ijr2iq34rfeiadsfkjq3ew";

dotenv.config();
const linkSecret = process.env.LINK_SECRET;

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

Expand All @@ -32,7 +35,7 @@ app.post("/meeting", async (req, res) => {
if (newMeetingRequest.records.length === 0) {
return res.status(404).json({ status: "error", errors: {message: "Cannot create new meeting"} });
}
const token = sign({ownerId, guestId, meetingId}, linkSecret);
const token = sign({ownerId, guestId, meetingId}, linkSecret!);
return res.json({token});
} catch (err) {
console.log("Error:", err);
Expand All @@ -42,7 +45,7 @@ app.post("/meeting", async (req, res) => {

app.post("/decode", (req, res) => {
const {token} = req.body as {token: string};
const decodedData = verify(token, linkSecret);
const decodedData = verify(token, linkSecret!);
return res.json({decodedData});
});

Expand All @@ -58,7 +61,7 @@ app.get("/guest-token/:guestId", async (req, res) => {
return res.status(404).json({ status: "error", errors: {message: "User does not exist"} });
}
const guest = guestRequest.records[0].get(0).properties;
const token = sign(guest, linkSecret);
const token = sign(guest, linkSecret!);
return res.json({token});
} catch (err) {
console.log("Error:", err);
Expand Down
7 changes: 5 additions & 2 deletions backend/src/socketServer.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import servers from "./server";
import dotenv from "dotenv";
import { Socket } from "socket.io";
import {decodeSocketData} from "./misc/jwt";
const {io, app} = servers;
const linkSecret = "ijr2iq34rfeiadsfkjq3ew";

dotenv.config();
const linkSecret = process.env.LINK_SECRET;

io.on("connection", (socket: Socket) => {
const handshakeData = socket.handshake.auth.jwt;
const decodedData = decodeSocketData(handshakeData, linkSecret);
const decodedData = decodeSocketData(handshakeData, linkSecret!);
if (!decodedData) {
socket.disconnect();
return;
Expand Down

0 comments on commit cd83426

Please sign in to comment.