Battlesnake/microservices
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into feature/deployment-yoshi

Browse source
This commit is contained in:
yoshi 2025-05-07 13:52:27 -07:00
commit 89dcf39692
29 changed files with 2249 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

14
assignment-db-service/.env.development Normal file
View file

@ -0,0 +1,14 @@
NODE_ENV=development
# Environment variables declared in this file are automatically made available to Prisma.
# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
#use this when testing local, remmber to run the proxy command
DATABASE_URL="postgresql://postgres:wly9H8gjjmxYfg1@localhost:15432/postgres?schema=public"
# DATABASE_URL="postgres://postgres:wly9H8gjjmxYfg1@bytecamp-db.flycast:5432?sslmode=disable"
# DATABASE_URL=postgres://snakebyte:zVB7lgOiKr89dq6@localhost:5432/snakebyte?sslmode=disable
NODE_PORT=3200

2
assignment-db-service/dev.env → assignment-db-service/.env.test
View file

@ -1,3 +1,5 @@
NODE_ENV=development
# Environment variables declared in this file are automatically made available to Prisma. # Environment variables declared in this file are automatically made available to Prisma.
# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema # See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema

163
assignment-db-service/app.js
View file

@ -10,33 +10,71 @@ const port = process.env.NODE_PORT || 3000;
app.use(express.json()); app.use(express.json());
app.use(express.urlencoded({ extended: true })); app.use(express.urlencoded({ extended: true }));
async function encryptPassword(password) {
if (!password) {
return null;
}
return new Promise((resolve, reject) => {
bcrypt.hash(password, 10, (err, hash) => {
if (err) {
reject(err);
} else {
resolve(hash);
}
});
});
}
//function to conver req.body to assignment //function to conver req.body to assignment
function convertToAssignment(req) { async function convertToAssignment(req) {
console.log("Converting request body to assignment object...");
const { const {
campid, campid,
programid, programid,
studentname, studentname,
snakegameid, snakegameid,
originalfile, appname,
editablefile, qrcodenumber,
description,
assignmenturl, assignmenturl,
password, password,
instructorid instructorid
} = req.body; } = req.body;
// const hashedPassword = await bcrypt.hash(Password, 10); console.log("Request body fields:", {
return { campid,
campid: campid, programid,
programid: programid, studentname,
studentname: studentname, snakegameid,
snakegameid: snakegameid, appname,
originalfile: originalfile, qrcodenumber,
editablefile: editablefile, description,
assignmenturl: assignmenturl, assignmenturl,
// passwordhash: hashedpassword, password,
passwordhash: password, instructorid
instructorid: instructorid, });
const hashPassword = await encryptPassword(req.body.password);
console.log("Password hash generated:", hashPassword);
const assignment = {
campid: campid ? parseInt(campid) : null,
programid: programid ? parseInt(programid) : null,
studentname: studentname || null,
snakegameid: snakegameid || null,
appname: appname || null,
qrcodenumber: qrcodenumber ? parseInt(qrcodenumber) : null,
description: description || null,
assignmenturl: assignmenturl || null,
passwordhash: hashPassword || null,
instructorid: instructorid ? parseInt(instructorid) : null,
}; };
console.log("Converted assignment object:", assignment);
return assignment;
} }
// Create Assignment // Create Assignment
@ -44,23 +82,9 @@ app.post("/assignments", async (req, res) => {
try { try {
console.log("Request body:", req.body); console.log("Request body:", req.body);
// const { const assignment = await convertToAssignment(req);
// campid,
// programid,
// studentname,
// snakegameid,
// originalfile,
// editablefile,
// assignmenturl,
// password,
// instructorid
// } = req.body;
// const hashedPassword = await bcrypt.hash(Password, 10);
const newAssignment = await prisma.assignments.create({ const newAssignment = await prisma.assignments.create({
data: { data: assignment,
...convertToAssignment(req)
},
}); });
console.log("Assignment created successfully:", newAssignment); console.log("Assignment created successfully:", newAssignment);
@ -82,6 +106,7 @@ app.get("/assignments/instructor/:instructorId", async (req, res) => {
console.log("InstructorID:", instructorId); console.log("InstructorID:", instructorId);
const assignments = await prisma.assignments.findMany({ const assignments = await prisma.assignments.findMany({
where: { instructorid: parseInt(instructorId) }, where: { instructorid: parseInt(instructorId) },
orderBy: { assignmentid: 'asc' },
}); });
if (assignments.length === 0) { if (assignments.length === 0) {
@ -97,17 +122,65 @@ app.get("/assignments/instructor/:instructorId", async (req, res) => {
} }
}); });
// Read Assignment //Get assignment by assignmentid
app.get("/assignments/:id", async (req, res) => { app.get("/assignments/:id", async (req, res) => {
try { try {
const { id } = req.params;
console.log("Fetching assignment with ID:", id);
const assignment = await prisma.assignments.findUnique({ const assignment = await prisma.assignments.findUnique({
where: { assignmentid: parseInt(req.params.id) }, where: { assignmentid: parseInt(id) },
}); });
if (!assignment) { if (!assignment) {
console.log("No assignment found for ID:", id);
return res.status(404).json({ message: "Assignment not found" }); return res.status(404).json({ message: "Assignment not found" });
} }
console.log("Assignment found:", assignment);
res.json(assignment);
} catch (err) {
console.error("Error fetching assignment:", err.message);
res.status(500).json({ error: err.message });
}
});
// Get Assignment by QR Code Number
app.get("/assignments/qr/:qrNumber", async (req, res) => {
try {
console.log("Fetching assignment with QR Code Number:", req.params.qrNumber);
const assignment = await prisma.assignments.findUnique({
where: { qrcodenumber: parseInt(req.params.qrNumber) },
});
if (!assignment) {
console.log("No assignment found for QR Code Number:", req.params.qrNumber);
return res.status(404).json({ message: "Assignment not found" });
}
console.log("Assignment found:", assignment);
res.json(assignment);
} catch (err) {
console.error("Error fetching assignment:", err.message);
res.status(500).json({ error: err.message });
}
});
//get assignment by appname
app.get("/assignments/appname/:appName", async (req, res) => {
try {
const { appName } = req.params;
const assignment = await prisma.assignments.findUnique({
where: { appname: appName },
});
if (!assignment) {
console.log("No assignment found for app name:", req.params.qrNumber);
return res.status(404).json({ message: "Assignment not found" });
}
console.log("Assignment found:", assignment);
res.json(assignment); res.json(assignment);
} catch (err) { } catch (err) {
console.error("Error fetching assignment:", err.message); console.error("Error fetching assignment:", err.message);
@ -119,17 +192,28 @@ app.get("/assignments/:id", async (req, res) => {
app.put("/assignments/:id", async (req, res) => { app.put("/assignments/:id", async (req, res) => {
try { try {
const { id } = req.params; const { id } = req.params;
const data = req.body; const assignment = await convertToAssignment(req);
if (data.password) { const existingAssignment = await prisma.assignments.findUnique({
// data.passwordhash = await bcrypt.hash(data.Password, 10); where: { assignmentid: parseInt(id) },
data.passwordhash = data.password; });
delete data.password;
if (!existingAssignment) {
return res.status(404).json({ message: "Assignment not found" });
} }
// Update only the fields that are provided in the request body
Object.keys(assignment).forEach((key) => {
if (assignment[key]) {
existingAssignment[key] = assignment[key];
}
});
console.log("Existing Assignment before update:", existingAssignment);
const updatedAssignment = await prisma.assignments.update({ const updatedAssignment = await prisma.assignments.update({
where: { assignmentid: parseInt(id) }, where: { assignmentid: parseInt(id) },
data, data: existingAssignment,
}); });
res.json({ res.json({
@ -161,3 +245,4 @@ app.delete("/assignments/:id", async (req, res) => {
app.listen(port, () => { app.listen(port, () => {
console.log(`Server running at http://localhost:${port}`); console.log(`Server running at http://localhost:${port}`);
}); });

35
assignment-db-service/fly.toml
View file

@ -7,26 +7,39 @@ app = 'db-assignment-service'
primary_region = 'sea' primary_region = 'sea'
[build] [build]
# Only needed if you're using a Dockerfile — can be empty if using buildpacks or Node preset
[http_service] # Removed the [http_service] section to disable public HTTP/HTTPS access
internal_port = 3000 # [http_service]
force_https = true # internal_port = 3000
auto_stop_machines = 'stop' # force_https = true
auto_start_machines = true # auto_stop_machines = true
min_machines_running = 0 # auto_start_machines = true
processes = ['app'] # min_machines_running = 0
# processes = ["app"]
[[services]] [[services]]
protocol = 'tcp' protocol = "tcp"
internal_port = 3000 internal_port = 3000
ports = [] internal_only = true # Makes this service only accessible internally
auto_start_machines = true
auto_stop_machines = true
# Removed public port exposure
# [[services.ports]]
# port = 80
# handlers = ["http"]
# [[services.ports]]
# port = 443
# handlers = ["tls", "http"]
[services.concurrency] [services.concurrency]
type = 'requests' type = "requests"
hard_limit = 1000 hard_limit = 1000
soft_limit = 500 soft_limit = 500
[[vm]] [[vm]]
memory = '1gb' memory = '1gb'
cpu_kind = 'shared' cpu_kind = "shared"
cpus = 1 cpus = 1

650
assignment-db-service/package-lock.json generated
View file

@ -9,7 +9,410 @@
"bcrypt": "^5.1.1", "bcrypt": "^5.1.1",
"express": "^5.1.0", "express": "^5.1.0",
"nodemon": "^3.1.9", "nodemon": "^3.1.9",
"prisma": "^6.1.0" "prisma": "^6.7.0"
},
"devDependencies": {
"dotenv-cli": "^8.0.0"
}
},
"node_modules/@esbuild/aix-ppc64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.3.tgz",
"integrity": "sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==",
"cpu": [
"ppc64"
],
"license": "MIT",
"optional": true,
"os": [
"aix"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/android-arm": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.3.tgz",
"integrity": "sha512-PuwVXbnP87Tcff5I9ngV0lmiSu40xw1At6i3GsU77U7cjDDB4s0X2cyFuBiDa1SBk9DnvWwnGvVaGBqoFWPb7A==",
"cpu": [
"arm"
],
"license": "MIT",
"optional": true,
"os": [
"android"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/android-arm64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.3.tgz",
"integrity": "sha512-XelR6MzjlZuBM4f5z2IQHK6LkK34Cvv6Rj2EntER3lwCBFdg6h2lKbtRjpTTsdEjD/WSe1q8UyPBXP1x3i/wYQ==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"android"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/android-x64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.3.tgz",
"integrity": "sha512-ogtTpYHT/g1GWS/zKM0cc/tIebFjm1F9Aw1boQ2Y0eUQ+J89d0jFY//s9ei9jVIlkYi8AfOjiixcLJSGNSOAdQ==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"android"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/darwin-arm64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.3.tgz",
"integrity": "sha512-eESK5yfPNTqpAmDfFWNsOhmIOaQA59tAcF/EfYvo5/QWQCzXn5iUSOnqt3ra3UdzBv073ykTtmeLJZGt3HhA+w==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/darwin-x64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.3.tgz",
"integrity": "sha512-Kd8glo7sIZtwOLcPbW0yLpKmBNWMANZhrC1r6K++uDR2zyzb6AeOYtI6udbtabmQpFaxJ8uduXMAo1gs5ozz8A==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/freebsd-arm64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.3.tgz",
"integrity": "sha512-EJiyS70BYybOBpJth3M0KLOus0n+RRMKTYzhYhFeMwp7e/RaajXvP+BWlmEXNk6uk+KAu46j/kaQzr6au+JcIw==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"freebsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/freebsd-x64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.3.tgz",
"integrity": "sha512-Q+wSjaLpGxYf7zC0kL0nDlhsfuFkoN+EXrx2KSB33RhinWzejOd6AvgmP5JbkgXKmjhmpfgKZq24pneodYqE8Q==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"freebsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-arm": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.3.tgz",
"integrity": "sha512-dUOVmAUzuHy2ZOKIHIKHCm58HKzFqd+puLaS424h6I85GlSDRZIA5ycBixb3mFgM0Jdh+ZOSB6KptX30DD8YOQ==",
"cpu": [
"arm"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-arm64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.3.tgz",
"integrity": "sha512-xCUgnNYhRD5bb1C1nqrDV1PfkwgbswTTBRbAd8aH5PhYzikdf/ddtsYyMXFfGSsb/6t6QaPSzxtbfAZr9uox4A==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-ia32": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.3.tgz",
"integrity": "sha512-yplPOpczHOO4jTYKmuYuANI3WhvIPSVANGcNUeMlxH4twz/TeXuzEP41tGKNGWJjuMhotpGabeFYGAOU2ummBw==",
"cpu": [
"ia32"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-loong64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.3.tgz",
"integrity": "sha512-P4BLP5/fjyihmXCELRGrLd793q/lBtKMQl8ARGpDxgzgIKJDRJ/u4r1A/HgpBpKpKZelGct2PGI4T+axcedf6g==",
"cpu": [
"loong64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-mips64el": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.3.tgz",
"integrity": "sha512-eRAOV2ODpu6P5divMEMa26RRqb2yUoYsuQQOuFUexUoQndm4MdpXXDBbUoKIc0iPa4aCO7gIhtnYomkn2x+bag==",
"cpu": [
"mips64el"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-ppc64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.3.tgz",
"integrity": "sha512-ZC4jV2p7VbzTlnl8nZKLcBkfzIf4Yad1SJM4ZMKYnJqZFD4rTI+pBG65u8ev4jk3/MPwY9DvGn50wi3uhdaghg==",
"cpu": [
"ppc64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-riscv64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.3.tgz",
"integrity": "sha512-LDDODcFzNtECTrUUbVCs6j9/bDVqy7DDRsuIXJg6so+mFksgwG7ZVnTruYi5V+z3eE5y+BJZw7VvUadkbfg7QA==",
"cpu": [
"riscv64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-s390x": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.3.tgz",
"integrity": "sha512-s+w/NOY2k0yC2p9SLen+ymflgcpRkvwwa02fqmAwhBRI3SC12uiS10edHHXlVWwfAagYSY5UpmT/zISXPMW3tQ==",
"cpu": [
"s390x"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/linux-x64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.3.tgz",
"integrity": "sha512-nQHDz4pXjSDC6UfOE1Fw9Q8d6GCAd9KdvMZpfVGWSJztYCarRgSDfOVBY5xwhQXseiyxapkiSJi/5/ja8mRFFA==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/netbsd-arm64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.3.tgz",
"integrity": "sha512-1QaLtOWq0mzK6tzzp0jRN3eccmN3hezey7mhLnzC6oNlJoUJz4nym5ZD7mDnS/LZQgkrhEbEiTn515lPeLpgWA==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"netbsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/netbsd-x64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.3.tgz",
"integrity": "sha512-i5Hm68HXHdgv8wkrt+10Bc50zM0/eonPb/a/OFVfB6Qvpiirco5gBA5bz7S2SHuU+Y4LWn/zehzNX14Sp4r27g==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"netbsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/openbsd-arm64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.3.tgz",
"integrity": "sha512-zGAVApJEYTbOC6H/3QBr2mq3upG/LBEXr85/pTtKiv2IXcgKV0RT0QA/hSXZqSvLEpXeIxah7LczB4lkiYhTAQ==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"openbsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/openbsd-x64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.3.tgz",
"integrity": "sha512-fpqctI45NnCIDKBH5AXQBsD0NDPbEFczK98hk/aa6HJxbl+UtLkJV2+Bvy5hLSLk3LHmqt0NTkKNso1A9y1a4w==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"openbsd"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/sunos-x64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.3.tgz",
"integrity": "sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"sunos"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/win32-arm64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.3.tgz",
"integrity": "sha512-YWcow8peiHpNBiIXHwaswPnAXLsLVygFwCB3A7Bh5jRkIBFWHGmNQ48AlX4xDvQNoMZlPYzjVOQDYEzWCqufMQ==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/win32-ia32": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.3.tgz",
"integrity": "sha512-qspTZOIGoXVS4DpNqUYUs9UxVb04khS1Degaw/MnfMe7goQ3lTfQ13Vw4qY/Nj0979BGvMRpAYbs/BAxEvU8ew==",
"cpu": [
"ia32"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">=18"
}
},
"node_modules/@esbuild/win32-x64": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.3.tgz",
"integrity": "sha512-ICgUR+kPimx0vvRzf+N/7L7tVSQeE3BYY+NhHRHXS1kBuPO7z2+7ea2HbhDyZdTephgvNvKrlDDKUexuCVBVvg==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">=18"
} }
}, },
"node_modules/@mapbox/node-pre-gyp": { "node_modules/@mapbox/node-pre-gyp": {
@ -54,49 +457,59 @@
} }
} }
}, },
"node_modules/@prisma/config": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/@prisma/config/-/config-6.7.0.tgz",
"integrity": "sha512-di8QDdvSz7DLUi3OOcCHSwxRNeW7jtGRUD2+Z3SdNE3A+pPiNT8WgUJoUyOwJmUr5t+JA2W15P78C/N+8RXrOA==",
"license": "Apache-2.0",
"dependencies": {
"esbuild": ">=0.12 <1",
"esbuild-register": "3.6.0"
}
},
"node_modules/@prisma/debug": { "node_modules/@prisma/debug": {
"version": "6.1.0", "version": "6.7.0",
"resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-6.1.0.tgz", "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-6.7.0.tgz",
"integrity": "sha512-0himsvcM4DGBTtvXkd2Tggv6sl2JyUYLzEGXXleFY+7Kp6rZeSS3hiTW9mwtUlXrwYbJP6pwlVNB7jYElrjWUg==", "integrity": "sha512-RabHn9emKoYFsv99RLxvfG2GHzWk2ZI1BuVzqYtmMSIcuGboHY5uFt3Q3boOREM9de6z5s3bQoyKeWnq8Fz22w==",
"license": "Apache-2.0" "license": "Apache-2.0"
}, },
"node_modules/@prisma/engines": { "node_modules/@prisma/engines": {
"version": "6.1.0", "version": "6.7.0",
"resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-6.1.0.tgz", "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-6.7.0.tgz",
"integrity": "sha512-GnYJbCiep3Vyr1P/415ReYrgJUjP79fBNc1wCo7NP6Eia0CzL2Ot9vK7Infczv3oK7JLrCcawOSAxFxNFsAERQ==", "integrity": "sha512-3wDMesnOxPrOsq++e5oKV9LmIiEazFTRFZrlULDQ8fxdub5w4NgRBoxtWbvXmj2nJVCnzuz6eFix3OhIqsZ1jw==",
"hasInstallScript": true, "hasInstallScript": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@prisma/debug": "6.1.0", "@prisma/debug": "6.7.0",
"@prisma/engines-version": "6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959", "@prisma/engines-version": "6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed",
"@prisma/fetch-engine": "6.1.0", "@prisma/fetch-engine": "6.7.0",
"@prisma/get-platform": "6.1.0" "@prisma/get-platform": "6.7.0"
} }
}, },
"node_modules/@prisma/engines-version": { "node_modules/@prisma/engines-version": {
"version": "6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959", "version": "6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed",
"resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959.tgz", "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed.tgz",
"integrity": "sha512-PdJqmYM2Fd8K0weOOtQThWylwjsDlTig+8Pcg47/jszMuLL9iLIaygC3cjWJLda69siRW4STlCTMSgOjZzvKPQ==", "integrity": "sha512-EvpOFEWf1KkJpDsBCrih0kg3HdHuaCnXmMn7XFPObpFTzagK1N0Q0FMnYPsEhvARfANP5Ok11QyoTIRA2hgJTA==",
"license": "Apache-2.0" "license": "Apache-2.0"
}, },
"node_modules/@prisma/fetch-engine": { "node_modules/@prisma/fetch-engine": {
"version": "6.1.0", "version": "6.7.0",
"resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-6.1.0.tgz", "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-6.7.0.tgz",
"integrity": "sha512-asdFi7TvPlEZ8CzSZ/+Du5wZ27q6OJbRSXh+S8ISZguu+S9KtS/gP7NeXceZyb1Jv1SM1S5YfiCv+STDsG6rrg==", "integrity": "sha512-zLlAGnrkmioPKJR4Yf7NfW3hftcvqeNNEHleMZK9yX7RZSkhmxacAYyfGsCcqRt47jiZ7RKdgE0Wh2fWnm7WsQ==",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@prisma/debug": "6.1.0", "@prisma/debug": "6.7.0",
"@prisma/engines-version": "6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959", "@prisma/engines-version": "6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed",
"@prisma/get-platform": "6.1.0" "@prisma/get-platform": "6.7.0"
} }
}, },
"node_modules/@prisma/get-platform": { "node_modules/@prisma/get-platform": {
"version": "6.1.0", "version": "6.7.0",
"resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-6.1.0.tgz", "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-6.7.0.tgz",
"integrity": "sha512-ia8bNjboBoHkmKGGaWtqtlgQOhCi7+f85aOkPJKgNwWvYrT6l78KgojLekE8zMhVk0R9lWcifV0Pf8l3/15V0Q==", "integrity": "sha512-i9IH5lO4fQwnMLvQLYNdgVh9TK3PuWBfQd7QLk/YurnAIg+VeADcZDbmhAi4XBBDD+hDif9hrKyASu0hbjwabw==",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@prisma/debug": "6.1.0" "@prisma/debug": "6.7.0"
} }
}, },
"node_modules/abbrev": { "node_modules/abbrev": {
@ -377,6 +790,21 @@
"node": ">=6.6.0" "node": ">=6.6.0"
} }
}, },
"node_modules/cross-spawn": {
"version": "7.0.6",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
"dev": true,
"license": "MIT",
"dependencies": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
"which": "^2.0.1"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/debug": { "node_modules/debug": {
"version": "4.4.0", "version": "4.4.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@ -418,6 +846,45 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/dotenv": {
"version": "16.5.0",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
"integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
"dev": true,
"license": "BSD-2-Clause",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://dotenvx.com"
}
},
"node_modules/dotenv-cli": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-8.0.0.tgz",
"integrity": "sha512-aLqYbK7xKOiTMIRf1lDPbI+Y+Ip/wo5k3eyp6ePysVaSqbyxjyK3dK35BTxG+rmd7djf5q2UPs4noPNH+cj0Qw==",
"dev": true,
"license": "MIT",
"dependencies": {
"cross-spawn": "^7.0.6",
"dotenv": "^16.3.0",
"dotenv-expand": "^10.0.0",
"minimist": "^1.2.6"
},
"bin": {
"dotenv": "cli.js"
}
},
"node_modules/dotenv-expand": {
"version": "10.0.0",
"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
"integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
"dev": true,
"license": "BSD-2-Clause",
"engines": {
"node": ">=12"
}
},
"node_modules/dunder-proto": { "node_modules/dunder-proto": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@ -483,6 +950,58 @@
"node": ">= 0.4" "node": ">= 0.4"
} }
}, },
"node_modules/esbuild": {
"version": "0.25.3",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.3.tgz",
"integrity": "sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==",
"hasInstallScript": true,
"license": "MIT",
"bin": {
"esbuild": "bin/esbuild"
},
"engines": {
"node": ">=18"
},
"optionalDependencies": {
"@esbuild/aix-ppc64": "0.25.3",
"@esbuild/android-arm": "0.25.3",
"@esbuild/android-arm64": "0.25.3",
"@esbuild/android-x64": "0.25.3",
"@esbuild/darwin-arm64": "0.25.3",
"@esbuild/darwin-x64": "0.25.3",
"@esbuild/freebsd-arm64": "0.25.3",
"@esbuild/freebsd-x64": "0.25.3",
"@esbuild/linux-arm": "0.25.3",
"@esbuild/linux-arm64": "0.25.3",
"@esbuild/linux-ia32": "0.25.3",
"@esbuild/linux-loong64": "0.25.3",
"@esbuild/linux-mips64el": "0.25.3",
"@esbuild/linux-ppc64": "0.25.3",
"@esbuild/linux-riscv64": "0.25.3",
"@esbuild/linux-s390x": "0.25.3",
"@esbuild/linux-x64": "0.25.3",
"@esbuild/netbsd-arm64": "0.25.3",
"@esbuild/netbsd-x64": "0.25.3",
"@esbuild/openbsd-arm64": "0.25.3",
"@esbuild/openbsd-x64": "0.25.3",
"@esbuild/sunos-x64": "0.25.3",
"@esbuild/win32-arm64": "0.25.3",
"@esbuild/win32-ia32": "0.25.3",
"@esbuild/win32-x64": "0.25.3"
}
},
"node_modules/esbuild-register": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.6.0.tgz",
"integrity": "sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==",
"license": "MIT",
"dependencies": {
"debug": "^4.3.4"
},
"peerDependencies": {
"esbuild": ">=0.12 <1"
}
},
"node_modules/escape-html": { "node_modules/escape-html": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@ -912,6 +1431,13 @@
"integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
"dev": true,
"license": "ISC"
},
"node_modules/make-dir": { "node_modules/make-dir": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
@ -999,6 +1525,16 @@
"node": "*" "node": "*"
} }
}, },
"node_modules/minimist": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
"dev": true,
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/minipass": { "node_modules/minipass": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
@ -1211,6 +1747,16 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=8"
}
},
"node_modules/path-to-regexp": { "node_modules/path-to-regexp": {
"version": "8.2.0", "version": "8.2.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
@ -1233,13 +1779,14 @@
} }
}, },
"node_modules/prisma": { "node_modules/prisma": {
"version": "6.1.0", "version": "6.7.0",
"resolved": "https://registry.npmjs.org/prisma/-/prisma-6.1.0.tgz", "resolved": "https://registry.npmjs.org/prisma/-/prisma-6.7.0.tgz",
"integrity": "sha512-aFI3Yi+ApUxkwCJJwyQSwpyzUX7YX3ihzuHNHOyv4GJg3X5tQsmRaJEnZ+ZyfHpMtnyahhmXVfbTZ+lS8ZtfKw==", "integrity": "sha512-vArg+4UqnQ13CVhc2WUosemwh6hr6cr6FY2uzDvCIFwH8pu8BXVv38PktoMLVjtX7sbYThxbnZF5YiR8sN2clw==",
"hasInstallScript": true, "hasInstallScript": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@prisma/engines": "6.1.0" "@prisma/config": "6.7.0",
"@prisma/engines": "6.7.0"
}, },
"bin": { "bin": {
"prisma": "build/index.js" "prisma": "build/index.js"
@ -1249,6 +1796,14 @@
}, },
"optionalDependencies": { "optionalDependencies": {
"fsevents": "2.3.3" "fsevents": "2.3.3"
},
"peerDependencies": {
"typescript": ">=5.1.0"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
} }
}, },
"node_modules/proxy-addr": { "node_modules/proxy-addr": {
@ -1454,6 +2009,29 @@
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
"license": "ISC" "license": "ISC"
}, },
"node_modules/shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"dev": true,
"license": "MIT",
"dependencies": {
"shebang-regex": "^3.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/shebang-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=8"
}
},
"node_modules/side-channel": { "node_modules/side-channel": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
@ -1713,6 +2291,22 @@
"webidl-conversions": "^3.0.0" "webidl-conversions": "^3.0.0"
} }
}, },
"node_modules/which": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"license": "ISC",
"dependencies": {
"isexe": "^2.0.0"
},
"bin": {
"node-which": "bin/node-which"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/wide-align": { "node_modules/wide-align": {
"version": "1.1.5", "version": "1.1.5",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",

7
assignment-db-service/package.json
View file

@ -4,10 +4,13 @@
"bcrypt": "^5.1.1", "bcrypt": "^5.1.1",
"express": "^5.1.0", "express": "^5.1.0",
"nodemon": "^3.1.9", "nodemon": "^3.1.9",
"prisma": "^6.1.0" "prisma": "^6.7.0"
}, },
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
"dev": "nodemon app.js" "dev": "dotenv -e .env.development nodemon app.js"
},
"devDependencies": {
"dotenv-cli": "^8.0.0"
} }
} }

7
assignment-db-service/prisma/schema.prisma
View file

@ -14,9 +14,10 @@ model assignments {
programid Int? programid Int?
studentname String? studentname String?
snakegameid String? snakegameid String?
originalfile String? qrcodenumber Int? @unique
editablefile String? appname String? @unique
assignmenturl String? description String?
passwordhash String? // store bcrypt hash passwordhash String? // store bcrypt hash
assignmenturl String?
instructorid Int? instructorid Int?
} }

3
assignment-service/.env
View file

@ -1,2 +1,3 @@
#DB_ASSIGNMENT_SERVICE_URL = "http://localhost:3000"
DB_ASSIGNMENT_SERVICE_URL = "http://db-assignment-service.internal:3000" DB_ASSIGNMENT_SERVICE_URL = "http://db-assignment-service.internal:3000"
DEPLOY_API_URL="http://localhost:3006"
NODE_PORT = 8080

11
assignment-service/.env.development Normal file
View file

@ -0,0 +1,11 @@
NODE_ENV=development
DB_ASSIGNMENT_SERVICE_URL="http://localhost:3200"
DEPLOY_API_URL="http://127.0.0.1:3006"
AWS_ACCESS_KEY_ID='tid__NSmOVaGknqitaCySppZjqVTgJSdDFnFbWcQllkC_juHwkbQZO'
AWS_ENDPOINT_URL_S3='https://fly.storage.tigris.dev'
AWS_REGION='auto'
AWS_SECRET_ACCESS_KEY='tsec_6Bz1aMbfYQftuq5WfIVEDZkHwskU4MMjVywdtxSP6uxetEBvkSC2VHI9HfTeDgHr4D6kiz'
COMMON_BUCKET='snakeapi-deployment-test-bucket'
NODE_PORT=8082

4
assignment-service/.env.test Normal file
View file

@ -0,0 +1,4 @@
NODE_ENV=test
DB_ASSIGNMENT_SERVICE_URL="http://js-assignment-db-service:3200"
DEPLOY_API_URL="http://localhost:3006/deploy"
NODE_PORT=8082

5
assignment-service/dev.env
View file

@ -1,5 +0,0 @@
#DB_ASSIGNMENT_SERVICE_URL="http://localhost:3000"
DB_ASSIGNMENT_SERVICE_URL="http://js-assignment-db-service:3200"
AUTH_SESSION_KEY="f3f4d8e6b17a4b3abdc8e9a2c0457aaf91c0d5f6e3b7a9c8df624bd71ea35f42"
ACCEPTED_ORIGINS=http://localhost:3000,http://localhost:8081,http://localhost:3001,http://localhost:5173
PORT=8082

830
assignment-service/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

7
assignment-service/package.json
View file

@ -3,7 +3,7 @@
"version": "1.0.0", "version": "1.0.0",
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
"dev": "nodemon server.js" "dev": "dotenv -e .env.development nodemon server.js"
}, },
"keywords": [], "keywords": [],
"author": "", "author": "",
@ -12,11 +12,16 @@
"dependencies": { "dependencies": {
"aws-sdk": "^2.1692.0", "aws-sdk": "^2.1692.0",
"axios": "^1.9.0", "axios": "^1.9.0",
"bcrypt": "^5.1.1",
"cors": "^2.8.5", "cors": "^2.8.5",
"dotenv": "^16.5.0", "dotenv": "^16.5.0",
"express": "^5.1.0", "express": "^5.1.0",
"express-session": "^1.18.1", "express-session": "^1.18.1",
"multer": "^1.4.5-lts.2",
"nodemon": "^3.1.9", "nodemon": "^3.1.9",
"passport": "^0.7.0" "passport": "^0.7.0"
},
"devDependencies": {
"dotenv-cli": "^8.0.0"
} }
} }

166
assignment-service/routes/InstructorRouter.js
View file

@ -1,31 +1,75 @@
const intructorRouter = require("express").Router(); const intructorRouter = require("express").Router();
const passport = require("passport"); const passport = require("passport");
const axios = require("axios"); const axios = require("axios");
const multer = require("multer");
const FormData = require("form-data");
const DB_ASSIGNMENT_SERVICE_URL =
process.env.DB_ASSIGNMENT_SERVICE_URL || "http://localhost:3000";
const DEPLOY_API_URL = process.env.DEPLOY_API_URL || "http://localhost:3600";
const DB_ASSIGNMENT_SERVICE_URL = process.env.DB_ASSIGNMENT_SERVICE_URL || "http://localhost:3000";
console.log("DB_ASSIGNMENT_SERVICE_URL:", DB_ASSIGNMENT_SERVICE_URL); console.log("DB_ASSIGNMENT_SERVICE_URL:", DB_ASSIGNMENT_SERVICE_URL);
console.log("DEPLOY_API_URL:", DEPLOY_API_URL);
// Use memory storage to keep file in RAM
const upload = multer({ storage: multer.memoryStorage() });
// This endpoint is for instructors to create a new assignment // This endpoint is for instructors to create a new assignment
intructorRouter.post("/create", intructorRouter.post(
"/create",
upload.single("file"),
// passport.authenticate("jwt", { session: false }), // passport.authenticate("jwt", { session: false }),
async (req, res) => { async (req, res) => {
try { try {
const file = req.file;
const assignmentData = req.body;
if (!file) {
return res.status(400).send("No file uploaded.");
}
console.log("Creating a new assignment with data:", req.body); console.log("Creating a new assignment with data:", req.body);
const response = await axios.post(`${DB_ASSIGNMENT_SERVICE_URL}/assignments`, req.body); const response = await axios.post(
`${DB_ASSIGNMENT_SERVICE_URL}/assignments`,
req.body
);
console.log("Response from DB_ASSIGNMENT_SERVICE_URL:", response.data); console.log("Response from DB_ASSIGNMENT_SERVICE_URL:", response.data);
// call upload api to upload the file to S3
console.log("Uploading file to:", `${DEPLOY_API_URL}/${assignmentData.appname}/upload`);
const uploadResponse = await axios.post(`${DEPLOY_API_URL}/${assignmentData.appname}/upload`, {
"appName": assignmentData.appname,
"notebookName": file.originalname,
"fileContentBase64": file.buffer.toString('base64'),
});
console.log('Response from DEPLOY_API_URL:', uploadResponse.data);
// Deploy a new Battlesnake API
console.log('Deploying a new Battlesnake API');
console.log("DEPLOY_API_URL:", DEPLOY_API_URL, assignmentData.appname);
const deployResponse = await axios.post(`${DEPLOY_API_URL}/deploy`, {
"appName": assignmentData.appname
});
console.log('Response from DEPLOY_API_URL:', deployResponse.data);
res.status(response.status).json(response.data); res.status(response.status).json(response.data);
} catch (error) { } catch (error) {
console.error("Error creating assignment:", error.message); console.error("Error creating assignment:", error.message);
res.status(error.response?.status || 500).json({ error: error.message }); res.status(error.response?.status || 500).json({ error: error.message });
} }
}); }
);
// This endpoint is for instructors to get details of a specific assignment // This endpoint is for instructors to get details of a specific assignment
intructorRouter.get("/details/:id", async (req, res) => { intructorRouter.get("/details/:id", async (req, res) => {
try { try {
const assignmentId = req.params.id; const assignmentId = req.params.id;
console.log("Fetching details for assignmentId:", assignmentId); console.log("Fetching details for assignmentId:", assignmentId);
const response = await axios.get(`${DB_ASSIGNMENT_SERVICE_URL}/assignments/${assignmentId}`); const response = await axios.get(
`${DB_ASSIGNMENT_SERVICE_URL}/assignments/${assignmentId}`
);
console.log("Response from DB_ASSIGNMENT_SERVICE_URL:", response.data); console.log("Response from DB_ASSIGNMENT_SERVICE_URL:", response.data);
res.status(response.status).json(response.data); res.status(response.status).json(response.data);
} catch (error) { } catch (error) {
@ -35,14 +79,18 @@ intructorRouter.get("/details/:id", async (req, res) => {
}); });
// This endpoint is for instructors to get a list of assignments they have created // This endpoint is for instructors to get a list of assignments they have created
intructorRouter.get("/list/:id", async (req, res) => { intructorRouter.get(
"/list/:id",
// passport.authenticate("jwt", { session: false }),
async (req, res) => {
// if (req.isAuthenticated()) { // if (req.isAuthenticated()) {
try { try {
const instructorId = req.params.id; const instructorId = req.params.id;
console.log("Fetching assignments for instructorId:", instructorId); // console.log("Fetching assignments for instructorId:", instructorId);
// const instructorId = req.user.userid; // Assuming req.user contains the authenticated user const response = await axios.get(
const response = await axios.get(`${DB_ASSIGNMENT_SERVICE_URL}/assignments/instructor/${instructorId}`); `${DB_ASSIGNMENT_SERVICE_URL}/assignments/instructor/${instructorId}`
console.log("Response from DB_ASSIGNMENT_SERVICE_URL:", response.data); );
// console.log("Response from DB_ASSIGNMENT_SERVICE_URL:", response.data);
res.status(response.status).json(response.data); res.status(response.status).json(response.data);
} catch (error) { } catch (error) {
res.status(error.response?.status || 500).json({ error: error.message }); res.status(error.response?.status || 500).json({ error: error.message });
@ -50,33 +98,115 @@ intructorRouter.get("/list/:id", async (req, res) => {
// } else { // } else {
// return res.status(401).json({ error: "Not authenticated" }); // return res.status(401).json({ error: "Not authenticated" });
// } // }
}
}); );
// This endpoint is for instructors to update an assignment // This endpoint is for instructors to update an assignment
intructorRouter.put("/update/:id", intructorRouter.put(
"/update/:id",
upload.none(), // No file upload for this endpoint
// passport.authenticate("jwt", { session: false }), // passport.authenticate("jwt", { session: false }),
async (req, res) => { async (req, res) => {
try { try {
const assignmentId = req.params.id; const assignmentId = req.params.id;
const response = await axios.put(`${DB_ASSIGNMENT_SERVICE_URL}/assignments/${assignmentId}`, req.body); console.log("Updating assignment with ID:", assignmentId);
console.log("Request body:", req.body);
const response = await axios.put(
`${DB_ASSIGNMENT_SERVICE_URL}/assignments/${assignmentId}`,
req.body
);
console.log("Response from DB_ASSIGNMENT_SERVICE_URL:", response.data);
res.status(response.status).json(response.data); res.status(response.status).json(response.data);
} catch (error) { } catch (error) {
console.error("Error updating assignment:", error.message);
res.status(error.response?.status || 500).json({ error: error.message }); res.status(error.response?.status || 500).json({ error: error.message });
} }
}); }
);
// This endpoint is for instructors to delete an assignment // This endpoint is for instructors to delete an assignment
intructorRouter.delete("/delete/:id", intructorRouter.delete(
"/delete/:id",
// passport.authenticate("jwt", { session: false }), // passport.authenticate("jwt", { session: false }),
async (req, res) => { async (req, res) => {
try { try {
const assignmentId = req.params.id; const assignmentId = req.params.id;
const response = await axios.delete(`${DB_ASSIGNMENT_SERVICE_URL}/assignments/${assignmentId}`);
//get the assignment data from the database
console.log("Fetching assignment data for ID:", assignmentId);
const assignmentResponse = await axios.get(
`${DB_ASSIGNMENT_SERVICE_URL}/assignments/${assignmentId}`
);
const assignmentData = assignmentResponse.data;
console.log("Assignment data:", assignmentData);
if (!assignmentData) {
return res.status(404).json({ error: "Assignment not found" });
}
// Delete the Battlesnake API
console.log('Deploying a new Battlesnake API');
console.log("DEPLOY_API_URL:", DEPLOY_API_URL, assignmentData.appname);
const deployResponse = await axios.post(`${DEPLOY_API_URL}/${assignmentData.appname}/delete`, {
"appName": assignmentData.appname
});
//throw error if the response is not 200
if (deployResponse.status !== 200) {
throw new Error(`Failed to delete Battlesnake API: ${deployResponse.statusText}`);
}
console.log('Response from DEPLOY_API_URL:', deployResponse.data);
const response = await axios.delete(
`${DB_ASSIGNMENT_SERVICE_URL}/assignments/${assignmentId}`
);
res.status(response.status).json(response.data); res.status(response.status).json(response.data);
} catch (error) { } catch (error) {
res.status(error.response?.status || 500).json({ error: error.message }); res.status(error.response?.status || 500).json({ error: error.message });
} }
}); }
);
//get assignment by appname
intructorRouter.get(
"/checkAssignmentByAppName/:appName",
// passport.authenticate("jwt", { session: false }),
async (req, res) => {
try {
const appName = req.params.appName;
console.log("Fetching assignment for appName:", appName);
const response = await axios.get(
`${DB_ASSIGNMENT_SERVICE_URL}/assignments/appname/${appName}`
);
console.log("Response data:", response.data);
res.status(response.status).json({"exists": (response.data !== null && response.data !== undefined)});
} catch (error) {
console.error("Error fetching assignment by app name:", error.message);
res.status(error.response?.status || 500).json({ error: error.message });
}
}
);
//get assignment by qrcode number
intructorRouter.get(
"/checkAssignmentByQRCode/:qrcode",
// passport.authenticate("jwt", { session: false }),
async (req, res) => {
try {
const qrcode = req.params.qrcode;
console.log("Fetching assignment for qrcode:", qrcode);
const response = await axios.get(
`${DB_ASSIGNMENT_SERVICE_URL}/assignments/${qrcode}`
);
console.log("Response data:", response.data);
res.status(response.status).json({"exists": (response.data !== null && response.data !== undefined)});
} catch (error) {
console.error("Error fetching assignment by QR code:", error.message);
res.status(error.response?.status || 500).json({ error: error.message });
}
}
);
module.exports = intructorRouter; module.exports = intructorRouter;

62
assignment-service/routes/StudentRouter.js
View file

@ -1,13 +1,71 @@
const studentRouter = require("express").Router(); const studentRouter = require("express").Router();
const passport = require("passport"); const passport = require("passport");
const axios = require("axios"); const axios = require("axios");
const bcrypt = require("bcrypt");
require("dotenv").config();
const DB_ASSIGNMENT_SERVICE_URL = process.env.DB_ASSIGNMENT_SERVICE_URL;
studentRouter.post("/save", (req, res) => {
studentRouter.post("/save", (req, res) => {});
studentRouter.post("/deploy", (req, res) => {});
studentRouter.get("/assignment/:qrnum", (req, res) => {
const qrnum = req.params.qrnum;
console.log("Fetching details for qr number:", qrnum);
axios
.get(`${DB_ASSIGNMENT_SERVICE_URL}/assignments/qr/${qrnum}`)
.then((response) => {
console.log("Response from DB_ASSIGNMENT_SERVICE_URL:", response.data);
res.status(response.status).json(response.data);
})
.catch((error) => {
console.error("Error fetching assignment details:", error.message);
res.status(error.response?.status || 500).json({ error: error.message });
});
}); });
studentRouter.post("/deploy", (req, res) => { studentRouter.post("/verify", async (req, res) => {
try {
const qrNumber = req.body.qrNumber;
const password = req.body.password;
console.log("Received request to verify assignment.");
console.log("Request body:", req.body);
console.log(
"Accessing assignment with QR Number:",
qrNumber,
"and password:",
password
);
console.log(`Fetching from URL: ${DB_ASSIGNMENT_SERVICE_URL}/assignments/${qrNumber}`);
const response = await axios.get(
`${DB_ASSIGNMENT_SERVICE_URL}/assignments/qr/${qrNumber}`
);
console.log("Response from DB_ASSIGNMENT_SERVICE_URL:", response.data);
console.log("Password provided:", password);
console.log("Password hash from database:", response.data.passwordhash);
const isPasswordValid = await bcrypt.compare(
password,
response.data.passwordhash
);
console.log("Password validation result:", isPasswordValid);
if (!isPasswordValid || !response.data) {
console.log("Invalid id or password.");
return res.status(401).json({ error: "Invalid id and password" });
}
console.log("Verification successful. Sending response.");
res.status(response.status).json(response.data);
} catch (error) {
console.error("Error fetching assignment details:", error.message);
console.error("Error details:", error);
res.status(error.response?.status || 500).json({ error: error.message });
}
}); });
module.exports = studentRouter; module.exports = studentRouter;

4
assignment-service/server.js
View file

@ -70,5 +70,5 @@ app.get("/notebook/:appName", async (req, res) => {
} }
}); });
const port = process.env.PORT || 8080; const port = process.env.NODE_PORT || 8080;
app.listen(port, "0.0.0.0", () => console.log(`Listening on 0.0.0.0:${port}...`)); app.listen({ port: port, host: '::', ipv6Only: false }, () => console.log(`Listening on ${port}...`));

3
auth-service/.env
View file

@ -2,10 +2,11 @@ GOOGLE_CLIENT_ID = "485880105639-1in8tvb6ondnn198rasuj2d8ank06ntp.apps.googleuse
GOOGLE_CLIENT_SECRET = "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" GOOGLE_CLIENT_SECRET = "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"
GOOGLE_CALLBACK_URL = "https://byte-camp-auth-service.fly.dev/auth/google/callback" GOOGLE_CALLBACK_URL = "https://byte-camp-auth-service.fly.dev/auth/google/callback"
LOGIN_REDIRECT_URL = "https://bytecamp-web.fly.dev/" LOGIN_REDIRECT_URL = "https://bytecamp-web.fly.dev/"
ACCEPTED_ORIGINS ="https://bytecamp-web.fly.dev,https://byte-camp-auth-service.fly.dev" ACCEPTED_ORIGINS ="https://bytecamp-web.fly.dev,https://byte-camp-auth-service.fly.dev,http://localhost:5173"
#DB_USER_SERVICE_URL = "http://localhost:3000/" #DB_USER_SERVICE_URL = "http://localhost:3000/"
DB_USER_SERVICE_URL = "http://db-user-service.internal:3000/" DB_USER_SERVICE_URL = "http://db-user-service.internal:3000/"
AUTH_SESSION_KEY = "f3f4d8e6b17a4b3abdc8e9a2c0457aaf91c0d5f6e3b7a9c8df624bd71ea35f42" AUTH_SESSION_KEY = "f3f4d8e6b17a4b3abdc8e9a2c0457aaf91c0d5f6e3b7a9c8df624bd71ea35f42"
ASSIGNMENT_SERVICE_URL="http://assignment-service.internal:8080"
# fly secrets set GOOGLE_CALLBACK_URL=https://byte-camp-auth-service.fly.dev/auth/google/callback # fly secrets set GOOGLE_CALLBACK_URL=https://byte-camp-auth-service.fly.dev/auth/google/callback
#fly secrets set GOOGLE_CLIENT_ID=485880105639-1in8tvb6ondnn198rasuj2d8ank06ntp.apps.googleusercontent.com GOOGLE_CLIENT_SECRET=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 LOGIN_REDIRECT_URL=https://bytecamp-web.fly.dev/ DB_USER_SERVICE_URL=https://db-user-service.fly.dev:3000/ AUTH_SESSION_KEY=f3f4d8e6b17a4b3abdc8e9a2c0457aaf91c0d5f6e3b7a9c8df624bd71ea35f42 #fly secrets set GOOGLE_CLIENT_ID=485880105639-1in8tvb6ondnn198rasuj2d8ank06ntp.apps.googleusercontent.com GOOGLE_CLIENT_SECRET=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 LOGIN_REDIRECT_URL=https://bytecamp-web.fly.dev/ DB_USER_SERVICE_URL=https://db-user-service.fly.dev:3000/ AUTH_SESSION_KEY=f3f4d8e6b17a4b3abdc8e9a2c0457aaf91c0d5f6e3b7a9c8df624bd71ea35f42

5
auth-service/dev.env → auth-service/.env.development
View file

@ -1,8 +1,11 @@
NODE_ENV=development
GOOGLE_CLIENT_ID="485880105639-1in8tvb6ondnn198rasuj2d8ank06ntp.apps.googleusercontent.com" GOOGLE_CLIENT_ID="485880105639-1in8tvb6ondnn198rasuj2d8ank06ntp.apps.googleusercontent.com"
GOOGLE_CLIENT_SECRET="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" GOOGLE_CLIENT_SECRET="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"
GOOGLE_CALLBACK_URL="http://localhost:8080/auth/google/callback" GOOGLE_CALLBACK_URL="http://localhost:8080/auth/google/callback"
LOGIN_REDIRECT_URL="http://localhost:5173/" LOGIN_REDIRECT_URL="http://localhost:5173/"
ACCEPTED_ORIGINS=http://localhost:3000,http://localhost:8081,http://localhost:3001,http://localhost:5173 ACCEPTED_ORIGINS=http://localhost:3000,http://localhost:8081,http://localhost:3001,http://localhost:5173
DB_USER_SERVICE_URL="http://js-user-db-service:3100/" ASSIGNMENT_SERVICE_URL="http://localhost:8082"
DB_USER_SERVICE_URL="http://localhost:3100/"
AUTH_SESSION_KEY="f3f4d8e6b17a4b3abdc8e9a2c0457aaf91c0d5f6e3b7a9c8df624bd71ea35f42" AUTH_SESSION_KEY="f3f4d8e6b17a4b3abdc8e9a2c0457aaf91c0d5f6e3b7a9c8df624bd71ea35f42"
PORT=8080 PORT=8080

123
auth-service/package-lock.json generated
View file

@ -16,7 +16,11 @@
"express-session": "^1.18.1", "express-session": "^1.18.1",
"nodemon": "^3.1.9", "nodemon": "^3.1.9",
"passport": "^0.7.0", "passport": "^0.7.0",
"passport-custom": "^1.1.1",
"passport-google-oauth20": "^2.0.0" "passport-google-oauth20": "^2.0.0"
},
"devDependencies": {
"dotenv-cli": "^8.0.0"
} }
}, },
"node_modules/accepts": { "node_modules/accepts": {
@ -280,6 +284,21 @@
"node": ">= 0.10" "node": ">= 0.10"
} }
}, },
"node_modules/cross-spawn": {
"version": "7.0.6",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
"dev": true,
"license": "MIT",
"dependencies": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
"which": "^2.0.1"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/debug": { "node_modules/debug": {
"version": "2.6.9", "version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@ -325,6 +344,32 @@
"url": "https://dotenvx.com" "url": "https://dotenvx.com"
} }
}, },
"node_modules/dotenv-cli": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-8.0.0.tgz",
"integrity": "sha512-aLqYbK7xKOiTMIRf1lDPbI+Y+Ip/wo5k3eyp6ePysVaSqbyxjyK3dK35BTxG+rmd7djf5q2UPs4noPNH+cj0Qw==",
"dev": true,
"license": "MIT",
"dependencies": {
"cross-spawn": "^7.0.6",
"dotenv": "^16.3.0",
"dotenv-expand": "^10.0.0",
"minimist": "^1.2.6"
},
"bin": {
"dotenv": "cli.js"
}
},
"node_modules/dotenv-expand": {
"version": "10.0.0",
"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
"integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
"dev": true,
"license": "BSD-2-Clause",
"engines": {
"node": ">=12"
}
},
"node_modules/dunder-proto": { "node_modules/dunder-proto": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@ -847,6 +892,13 @@
"integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
"dev": true,
"license": "ISC"
},
"node_modules/math-intrinsics": { "node_modules/math-intrinsics": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@ -910,6 +962,16 @@
"node": "*" "node": "*"
} }
}, },
"node_modules/minimist": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
"dev": true,
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/ms": { "node_modules/ms": {
"version": "2.1.3", "version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@ -1063,6 +1125,18 @@
"url": "https://github.com/sponsors/jaredhanson" "url": "https://github.com/sponsors/jaredhanson"
} }
}, },
"node_modules/passport-custom": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/passport-custom/-/passport-custom-1.1.1.tgz",
"integrity": "sha512-/2m7jUGxmCYvoqenLB9UrmkCgPt64h8ZtV+UtuQklZ/Tn1NpKBeOorCYkB/8lMRoiZ5hUrCoMmDtxCS/d38mlg==",
"license": "MIT",
"dependencies": {
"passport-strategy": "1.x.x"
},
"engines": {
"node": ">= 0.10.0"
}
},
"node_modules/passport-google-oauth20": { "node_modules/passport-google-oauth20": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz", "resolved": "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz",
@ -1103,6 +1177,16 @@
"node": ">= 0.4.0" "node": ">= 0.4.0"
} }
}, },
"node_modules/path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=8"
}
},
"node_modules/path-to-regexp": { "node_modules/path-to-regexp": {
"version": "8.2.0", "version": "8.2.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
@ -1345,6 +1429,29 @@
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
"license": "ISC" "license": "ISC"
}, },
"node_modules/shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"dev": true,
"license": "MIT",
"dependencies": {
"shebang-regex": "^3.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/shebang-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=8"
}
},
"node_modules/side-channel": { "node_modules/side-channel": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
@ -1545,6 +1652,22 @@
"node": ">= 0.8" "node": ">= 0.8"
} }
}, },
"node_modules/which": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"license": "ISC",
"dependencies": {
"isexe": "^2.0.0"
},
"bin": {
"node-which": "bin/node-which"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/wrappy": { "node_modules/wrappy": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",

6
auth-service/package.json
View file

@ -3,7 +3,7 @@
"version": "1.0.0", "version": "1.0.0",
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
"dev": "nodemon server.js" "dev": "dotenv -e .env.development nodemon server.js"
}, },
"keywords": [], "keywords": [],
"author": "", "author": "",
@ -17,6 +17,10 @@
"express-session": "^1.18.1", "express-session": "^1.18.1",
"nodemon": "^3.1.9", "nodemon": "^3.1.9",
"passport": "^0.7.0", "passport": "^0.7.0",
"passport-custom": "^1.1.1",
"passport-google-oauth20": "^2.0.0" "passport-google-oauth20": "^2.0.0"
},
"devDependencies": {
"dotenv-cli": "^8.0.0"
} }
} }

70
auth-service/passport.js
View file

@ -1,7 +1,9 @@
require('dotenv').config(); require("dotenv").config();
const GoogleStrategy = require("passport-google-oauth20").Strategy; const GoogleStrategy = require("passport-google-oauth20").Strategy;
const passport = require("passport"); const passport = require("passport");
const CustomStrategy = require("passport-custom").Strategy;
const axios = require("axios");
passport.use( passport.use(
new GoogleStrategy( new GoogleStrategy(
@ -12,25 +14,65 @@ passport.use(
scope: ["profile", "email"], scope: ["profile", "email"],
}, },
function (accessToken, refreshToken, profile, callback) { function (accessToken, refreshToken, profile, callback) {
callback(null, {...profile, role: "instructor"});
// Save the user info to your DB here if still not yet saved
// Example of what profile might contain:
// {
// "id": "112233445566778899",
// "displayName": "John Doe",
// "emails": [{ "value": "john.doe@gmail.com" }],
// "photos": [{ "value": "https://.../photo.jpg" }]
// }
callback(null, profile);
} }
) )
); );
passport.use(
"student-auth",
new CustomStrategy(async (req, done) => {
const { qrNumber, password } = req.body;
console.log("Custom strategy invoked");
console.log("Received qrNumber:", qrNumber);
console.log("Received password:", password);
try {
console.log("Sending request to external auth service...");
const response = await axios.post(
`${process.env.ASSIGNMENT_SERVICE_URL}/student/verify`,
{
qrNumber,
password,
}
);
if (response.status === 200 && response.data) {
user = {
...response.data,
role: "student",
};
console.log("Authentication successful, user:", user);
return done(null, user); // success
} else {
console.log("Authentication failed: Invalid credentials");
return done(null, false, { message: "Invalid credentials" });
}
} catch (err) {
console.error("Error during authentication:", err);
return done(err);
}
})
);
passport.serializeUser((user, done) => { passport.serializeUser((user, done) => {
done(null, user); // done(null, user);
console.log("Serializing user:", user);
done(null, {
userId: user.qrcodenumber || user.id,
displayName: user.studentname || user.displayName,
role: user.role,
emails: user.emails || "none",
});
}); });
passport.deserializeUser((user, done) => { passport.deserializeUser(async (user, done) => {
try {
console.log("Deserializing user:", user);
done(null, user); done(null, user);
} catch (err) {
console.error("Error during deserialization:", err);
done(err);
}
}); });

42
auth-service/routes/auth.js
View file

@ -11,6 +11,8 @@ router.get(
); );
router.get("/current_user", (req, res) => { router.get("/current_user", (req, res) => {
console.log("Current user endpoint hit");
console.log("Request user:", req.user);
if (req.isAuthenticated()) { if (req.isAuthenticated()) {
console.log("Authenticated user:", req.user); console.log("Authenticated user:", req.user);
res.json(req.user); res.json(req.user);
@ -52,9 +54,47 @@ router.get("/login/failed", (req, res) => {
router.get("/google", passport.authenticate("google", ["profile", "email"])); router.get("/google", passport.authenticate("google", ["profile", "email"]));
router.post(
"/student/login",
passport.authenticate("student-auth"),
(req, res) => {
console.log("Student login endpoint hit");
if (req.user) {
console.log("Authenticated user:", req.user);
console.log("Processing student login...");
// Optional: augment user object (doesn't affect session unless you reserialize)
req.user.userId = req.user.assignmentid;
req.user.role = "student";
req.logIn(req.user, function(err) {
if (err) return next(err);
console.log('is authenticated?: ' + req.isAuthenticated());
return res.status(200).json({
success: true,
message: 'Successful Login',
user: req.user
});
});
} else {
console.log("Authentication failed");
res.status(401).json({ error: true, message: "Authentication failed" });
}
}
);
router.get("/logout", (req, res) => { router.get("/logout", (req, res) => {
req.logOut();
req.logout((err) => {
if (err) {
return next(err);
}
res.redirect(process.env.LOGIN_REDIRECT_URL); res.redirect(process.env.LOGIN_REDIRECT_URL);
}); });
});
module.exports = router; module.exports = router;

6
auth-service/server.js
View file

@ -6,10 +6,14 @@ const passport = require("passport");
const passportSetup = require("./passport"); const passportSetup = require("./passport");
const authRoute = require("./routes/auth"); const authRoute = require("./routes/auth");
const session = require("express-session"); const session = require("express-session");
const bodyParser = require("body-parser");
const app = express(); const app = express();
app.use(bodyParser.json()); // or express.json()
app.use(bodyParser.urlencoded({ extended: true }));
app.use( app.use(
session({ session({
secret: process.env.AUTH_SESSION_KEY, secret: process.env.AUTH_SESSION_KEY,
resave: false, resave: false,
@ -31,6 +35,8 @@ app.use(
}) })
) )
app.use(express.json());
app.use("/auth", authRoute); app.use("/auth", authRoute);
const port = process.env.PORT || 8080; const port = process.env.PORT || 8080;

8
compose.yaml
View file

@ -11,7 +11,7 @@ services:
ports: ports:
- "3200:3200" # Expose port to the same host - "3200:3200" # Expose port to the same host
env_file: env_file:
- ./assignment-db-service/dev.env - ./assignment-db-service/.env.development
networks: networks:
- backend - backend
@ -25,7 +25,7 @@ services:
ports: ports:
- "8082:8082" # Expose port to the same host - "8082:8082" # Expose port to the same host
env_file: env_file:
- ./assignment-service/dev.env - ./assignment-service/.env.development
depends_on: depends_on:
- js-assignment-db-service - js-assignment-db-service
networks: networks:
@ -41,7 +41,7 @@ services:
ports: ports:
- "8080:8080" # Expose port to the same host - "8080:8080" # Expose port to the same host
env_file: env_file:
- ./auth-service/dev.env - ./auth-service/.env.development
networks: networks:
- backend - backend
@ -55,7 +55,7 @@ services:
ports: ports:
- "3100:3100" # Expose port to the same host - "3100:3100" # Expose port to the same host
env_file: env_file:
- ./user-db-service/dev.env - ./user-db-service/.env.development
networks: networks:
- backend - backend

199
deployment-service/src/index.js
View file

@ -1,8 +1,9 @@
const express = require('express'); const express = require("express");
const fs = require('fs'); const fs = require("fs");
const path = require('path'); const path = require("path");
const AWS = require('aws-sdk'); const AWS = require("aws-sdk");
const axios = require('axios'); const axios = require("axios");
require("dotenv").config();
const { const {
FLY_ORG, FLY_ORG,
@ -12,47 +13,56 @@ const {
AWS_ENDPOINT_URL_S3, AWS_ENDPOINT_URL_S3,
AWS_REGION, AWS_REGION,
FLY_ACCESS_TOKEN, FLY_ACCESS_TOKEN,
IMAGE_REF IMAGE_REF,
} = process.env; } = process.env;
// Log environment variables for debugging // Log environment variables for debugging
console.log('--- ENV START ---'); console.log("--- ENV START ---");
console.log('FLY_ORG: ', FLY_ORG); console.log("FLY_ORG: ", FLY_ORG);
console.log('COMMON_BUCKET: ', COMMON_BUCKET); console.log("COMMON_BUCKET: ", COMMON_BUCKET);
console.log('AWS_ACCESS_KEY_ID: ', AWS_ACCESS_KEY_ID ? '(found)' : '(NOT SET)'); console.log(
console.log('AWS_SECRET_ACCESS_KEY:', AWS_SECRET_ACCESS_KEY ? '(found)' : '(NOT SET)'); "AWS_ACCESS_KEY_ID: ",
console.log('AWS_ENDPOINT_URL_S3: ', AWS_ENDPOINT_URL_S3); AWS_ACCESS_KEY_ID ? "(found)" : "(NOT SET)"
console.log('AWS_REGION: ', AWS_REGION); );
console.log('FLY_ACCESS_TOKEN: ', FLY_ACCESS_TOKEN ? '(found)' : '(NOT SET)'); console.log(
console.log('IMAGE_REF: ', IMAGE_REF); "AWS_SECRET_ACCESS_KEY:",
console.log('--- ENV END ---'); AWS_SECRET_ACCESS_KEY ? "(found)" : "(NOT SET)"
);
console.log("AWS_ENDPOINT_URL_S3: ", AWS_ENDPOINT_URL_S3);
console.log("AWS_REGION: ", AWS_REGION);
console.log(
"FLY_ACCESS_TOKEN: ",
FLY_ACCESS_TOKEN ? "(found)" : "(NOT SET)"
);
console.log("IMAGE_REF: ", IMAGE_REF);
console.log("--- ENV END ---");
// Initialize S3 client // Initialize S3 client
const s3 = new AWS.S3({ const s3 = new AWS.S3({
endpoint: AWS_ENDPOINT_URL_S3, endpoint: AWS_ENDPOINT_URL_S3,
region: AWS_REGION, region: AWS_REGION,
credentials: new AWS.Credentials(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY), credentials: new AWS.Credentials(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY),
s3ForcePathStyle: true s3ForcePathStyle: true,
}); });
// Create Fly Machines API client // Create Fly Machines API client
function createFlyClient() { function createFlyClient() {
return axios.create({ return axios.create({
baseURL: 'https://api.machines.dev/v1', baseURL: "https://api.machines.dev/v1",
headers: { headers: {
Authorization: `Bearer ${FLY_ACCESS_TOKEN}`, Authorization: `Bearer ${FLY_ACCESS_TOKEN}`,
'Content-Type': 'application/json' "Content-Type": "application/json",
} },
}); });
} }
// Create Fly GraphQL client (for IP allocation) // Create Fly GraphQL client (for IP allocation)
const gqlClient = axios.create({ const gqlClient = axios.create({
baseURL: 'https://api.fly.io/graphql', baseURL: "https://api.fly.io/graphql",
headers: { headers: {
Authorization: `Bearer ${FLY_ACCESS_TOKEN}`, Authorization: `Bearer ${FLY_ACCESS_TOKEN}`,
'Content-Type': 'application/json' "Content-Type": "application/json",
} },
}); });
// Define GraphQL mutation for IP allocation // Define GraphQL mutation for IP allocation
@ -68,164 +78,175 @@ mutation AllocateIp($input: AllocateIPAddressInput!) {
`; `;
const app = express(); const app = express();
app.use(express.json({ limit: '10mb' })); app.use(express.json({ limit: "10mb" }));
app.post('/deploy', async (req, res) => { app.post("/deploy", async (req, res) => {
console.log('Received /deploy:', req.body); console.log("Received /deploy:", req.body);
const { appName, region, notebookName } = req.body; const {
if (!appName || !notebookName) { appName,
return res.status(400).json({ error: 'appName and notebookName required' }); // , region
// , notebookName
} = req.body;
if (!appName) {
return res.status(400).json({ error: "appName required" });
} }
const notebookPath = path.join(__dirname, '../snakeapi_service/notebooks', notebookName); // const notebookPath = path.join(__dirname, '../snakeapi_service/notebooks', notebookName);
console.log('Resolved notebookPath:', notebookPath); // console.log('Resolved notebookPath:', notebookPath);
if (!fs.existsSync(notebookPath)) { // if (!fs.existsSync(notebookPath)) {
console.error('Notebook not found at:', notebookPath); // console.error('Notebook not found at:', notebookPath);
return res.status(500).json({ error: `Notebook not found: ${notebookPath}` }); // return res.status(500).json({ error: `Notebook not found: ${notebookPath}` });
} // }
try { try {
const fly = createFlyClient(); const fly = createFlyClient();
console.log('Creating Fly app:', appName); console.log("Creating Fly app:", appName);
await fly.post('/apps', { await fly.post("/apps", {
app_name: appName, app_name: appName,
org_slug: FLY_ORG, org_slug: FLY_ORG,
primary_region: region primary_region: "sea",
}); });
console.log('Uploading notebook to S3'); // console.log('Uploading notebook to S3');
const data = fs.readFileSync(notebookPath); // const data = fs.readFileSync(notebookPath);
const key = `${appName}/notebooks/${Date.now()}-notebook.ipynb`; // const key = `${appName}/notebooks/${Date.now()}-notebook.ipynb`;
console.log('S3 key:', key); // console.log('S3 key:', key);
await s3.putObject({ // await s3.putObject({
Bucket: COMMON_BUCKET, // Bucket: COMMON_BUCKET,
Key: key, // Key: key,
Body: data, // Body: data,
ContentType: 'application/json' // ContentType: 'application/json'
}).promise(); // }).promise();
console.log('Creating machine'); console.log("Creating machine");
const machineConfig = { const machineConfig = {
name: `${appName}-machine`, name: `${appName}-machine`,
region: 'sea', region: "sea",
count: 1, count: 1,
vm_size: 'shared-cpu-1x', vm_size: "shared-cpu-1x",
autostart: true, autostart: true,
config: { config: {
image: IMAGE_REF, image: IMAGE_REF,
env: { env: {
INSTANCE_PREFIX: appName, INSTANCE_PREFIX: appName,
NOTEBOOK_KEY: key, // NOTEBOOK_KEY: key,
COMMON_BUCKET: COMMON_BUCKET, COMMON_BUCKET: COMMON_BUCKET,
AWS_ACCESS_KEY_ID, AWS_ACCESS_KEY_ID,
AWS_SECRET_ACCESS_KEY, AWS_SECRET_ACCESS_KEY,
AWS_ENDPOINT_URL_S3, AWS_ENDPOINT_URL_S3,
AWS_REGION AWS_REGION,
}, },
http_service: { http_service: {
internal_port: 8000, internal_port: 8000,
force_https: true, force_https: true,
auto_stop_machines: 'stop', auto_stop_machines: "stop",
auto_start_machines: true, auto_start_machines: true,
min_machines_running: 0, min_machines_running: 0,
processes: ['app'] processes: ["app"],
}, },
services: [ services: [
{ {
protocol: 'tcp', protocol: "tcp",
internal_port: 8000, internal_port: 8000,
ports: [ ports: [
{ port: 443, handlers: ['tls', 'http'] }, { port: 443, handlers: ["tls", "http"] },
{ port: 80, handlers: ['http'] } { port: 80, handlers: ["http"] },
] ],
} },
], ],
guest: { guest: {
memory_mb: 512, memory_mb: 512,
cpu_kind: 'shared', cpu_kind: "shared",
cpus: 1 cpus: 1,
} },
} },
}; };
console.log('Machine config:', JSON.stringify(machineConfig, null, 2)); console.log("Machine config:", JSON.stringify(machineConfig, null, 2));
await fly.post(`/apps/${appName}/machines`, machineConfig); await fly.post(`/apps/${appName}/machines`, machineConfig);
console.log('Allocating IPv4 via GraphQL API'); console.log("Allocating IPv4 via GraphQL API");
const v4resp = await gqlClient.post('', { const v4resp = await gqlClient.post("", {
query: ALLOCATE_IP_MUTATION, query: ALLOCATE_IP_MUTATION,
variables: { input: { appId: appName, type: 'v4' } } variables: { input: { appId: appName, type: "v4" } },
}); });
const ipv4 = v4resp.data.data.allocateIpAddress.ipAddress.address; const ipv4 = v4resp.data.data.allocateIpAddress.ipAddress.address;
console.log('Allocated IPv4:', ipv4); console.log("Allocated IPv4:", ipv4);
console.log('Allocating IPv6 via GraphQL API'); console.log("Allocating IPv6 via GraphQL API");
const v6resp = await gqlClient.post('', { const v6resp = await gqlClient.post("", {
query: ALLOCATE_IP_MUTATION, query: ALLOCATE_IP_MUTATION,
variables: { input: { appId: appName, type: 'v6' } } variables: { input: { appId: appName, type: "v6" } },
}); });
const ipv6 = v6resp.data.data.allocateIpAddress.ipAddress.address; const ipv6 = v6resp.data.data.allocateIpAddress.ipAddress.address;
console.log('Allocated IPv6:', ipv6); console.log("Allocated IPv6:", ipv6);
return res.json({ return res.json({
status: 'created', status: "created",
app: appName, app: appName,
ipv4, ipv4,
ipv6, ipv6,
url_v4: `http://${ipv4}`, url_v4: `http://${ipv4}`,
url_v6: `http://[${ipv6}]` url_v6: `http://[${ipv6}]`,
}); });
} catch (err) { } catch (err) {
console.error('Deployment error:', err.response?.data || err.stack || err.message); console.error(
"Deployment error:",
err.response?.data || err.stack || err.message
);
return res.status(500).json({ error: err.response?.data || err.message }); return res.status(500).json({ error: err.response?.data || err.message });
} }
}); });
// Upload notebook to S3 for an existing app // Upload notebook to S3 for an existing app
app.post('/:appName/upload', async (req, res) => { app.post("/:appName/upload", async (req, res) => {
const { appName } = req.params; const { appName } = req.params;
const { notebookName, fileContentBase64 } = req.body; const { notebookName, fileContentBase64 } = req.body;
if (!notebookName || !fileContentBase64) { if (!notebookName || !fileContentBase64) {
return res.status(400).json({ error: 'notebookName and fileContentBase64 are required' }); return res
.status(400)
.json({ error: "notebookName and fileContentBase64 are required" });
} }
try { try {
const buffer = Buffer.from(fileContentBase64, 'base64'); const buffer = Buffer.from(fileContentBase64, "base64");
const key = `${appName}/notebooks/${notebookName}`; const key = `${appName}/notebooks/${notebookName}`;
console.log(`Uploading notebook to: s3://${COMMON_BUCKET}/${key}`); console.log(`Uploading notebook to: s3://${COMMON_BUCKET}/${key}`);
await s3.putObject({ await s3
.putObject({
Bucket: COMMON_BUCKET, Bucket: COMMON_BUCKET,
Key: key, Key: key,
Body: buffer, Body: buffer,
ContentType: 'application/json' ContentType: "application/json",
}).promise(); })
.promise();
return res.json({ status: 'uploaded', app: appName, key }); return res.json({ status: "uploaded", app: appName, key });
} catch (err) { } catch (err) {
console.error('Notebook upload error:', err); console.error("Notebook upload error:", err);
return res.status(500).json({ error: err.message }); return res.status(500).json({ error: err.message });
} }
}); });
// Delete a Fly app // Delete a Fly app
app.post('/:appName/delete', async (req, res) => { app.post("/:appName/delete", async (req, res) => {
const { appName } = req.params; const { appName } = req.params;
try { try {
const fly = createFlyClient(); const fly = createFlyClient();
console.log('Destroying Fly app:', appName); console.log("Destroying Fly app:", appName);
await fly.delete(`/apps/${appName}`); await fly.delete(`/apps/${appName}`);
return res.json({ status: 'deleted', app: appName }); return res.json({ status: "deleted", app: appName });
} catch (err) { } catch (err) {
console.error('App deletion error:', err.response?.data || err.message); console.error("App deletion error:", err.response?.data || err.message);
return res.status(500).json({ error: err.response?.data || err.message }); return res.status(500).json({ error: err.response?.data || err.message });
} }
}); });
const LISTEN_PORT = process.env.PORT || 3006; const LISTEN_PORT = process.env.PORT || 3006;
app.listen(LISTEN_PORT, '0.0.0.0', () => { app.listen(LISTEN_PORT, "0.0.0.0", () => {
console.log(`Deployment service listening on port ${LISTEN_PORT}`); console.log(`Deployment service listening on port ${LISTEN_PORT}`);
}); });

6
user-db-service/.env
View file

@ -5,8 +5,8 @@
# See the documentation for all the connection string options: https://pris.ly/d/connection-strings # See the documentation for all the connection string options: https://pris.ly/d/connection-strings
#use this when testing local, remmber to run the proxy command #use this when testing local, remmber to run the proxy command
# DATABASE_URL="postgresql://postgres:wly9H8gjjmxYfg1@localhost:15432/postgres?schema=public" DATABASE_URL="postgresql://postgres:wly9H8gjjmxYfg1@localhost:15432/postgres?schema=public"
DATABASE_URL="postgres://postgres:wly9H8gjjmxYfg1@bytecamp-db.flycast:5432?sslmode=disable" # DATABASE_URL="postgres://postgres:wly9H8gjjmxYfg1@bytecamp-db.flycast:5432?sslmode=disable"
# DATABASE_URL=postgres://snakebyte:zVB7lgOiKr89dq6@localhost:5432/snakebyte?sslmode=disable # DATABASE_URL=postgres://snakebyte:zVB7lgOiKr89dq6@localhost:5432/snakebyte?sslmode=disable
NODE_PORT=3000 NODE_PORT=3100

0
user-db-service/dev.env → user-db-service/.env.development
View file

7
user-db-service/fly.toml
View file

@ -6,11 +6,6 @@ primary_region = "sea"
[build] [build]
# Only needed if you're using a Dockerfile — can be empty if using buildpacks or Node preset # Only needed if you're using a Dockerfile — can be empty if using buildpacks or Node preset
#[env]
#NODE_ENV = "production"
#DATABASE_URL = "postgresql://user:password@hostname:port/dbname"
# you can also leave DATABASE_URL unset here and use secrets instead
# Removed the [http_service] section to disable public HTTP/HTTPS access # Removed the [http_service] section to disable public HTTP/HTTPS access
# [http_service] # [http_service]
# internal_port = 3000 # internal_port = 3000
@ -24,6 +19,8 @@ primary_region = "sea"
protocol = "tcp" protocol = "tcp"
internal_port = 3000 internal_port = 3000
internal_only = true # Makes this service only accessible internally internal_only = true # Makes this service only accessible internally
auto_start_machines = true
auto_stop_machines = true
# Removed public port exposure # Removed public port exposure
# [[services.ports]] # [[services.ports]]