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

improved database updates for assignment creation

Browse source
This commit is contained in:
JBB0807 2025-05-07 11:43:16 -07:00
parent fd993102a0
commit e2d728265b
8 changed files with 211 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,12 +2,43 @@ const router = require("express").Router();
const passport = require("passport");
const axios = require("axios");
const AUTH_URL = process.env.AUTH_URL || "http://localhost:8080";
router.get(
"/google/callback",
passport.authenticate("google", {
successRedirect: "/auth/google/login",
failureRedirect: "/auth/login/failed",
})
keepSessionInfo: true,
}),
async (req, res) => {
console.log("Google callback endpoint hit");
if (req.user) {
console.log(`${process.env.DB_USER_SERVICE_URL}instructor/register-user`);
axios
.post(`${process.env.DB_USER_SERVICE_URL}instructor/register-user`, {
user: req.user,
})
.then((response) => {
req.user.userId = response.data.user.userid;
console.log("User ID:", response.data.user.userid);
req.user.role = "instructor";
console.log("User registration response:", response.data);
req.login(req.user, (err) => {
if (err) {
console.error("Login error:", err);
return res.status(500).send("Login failed");
}
return res.redirect(process.env.LOGIN_REDIRECT_URL);
});
})
.catch((error) => {
console.error("Error registering user:", error.message);
res.status(500).json({ error: true, message: "User login failed" });
});
} else {
res.status(403).json({ error: true, message: "Not Authorized" });
}
}
);
router.get("/current_user", (req, res) => {
@ -22,28 +53,28 @@ router.get("/current_user", (req, res) => {
}
});
router.get("/google/login", (req, res) => {
if (req.user) {
console.log(`${process.env.DB_USER_SERVICE_URL}instructor/register-user`);
axios
.post(`${process.env.DB_USER_SERVICE_URL}instructor/register-user`, {
user: req.user,
})
.then((response) => {
req.user.userId = response.data.user.userid;
console.log("User ID:", response.data.user.userid);
req.user.role = "instructor";
console.log("User registration response:", response.data);
res.redirect(process.env.LOGIN_REDIRECT_URL);
})
.catch((error) => {
console.error("Error registering user:", error.message);
res.status(500).json({ error: true, message: "User login failed" });
});
} else {
res.status(403).json({ error: true, message: "Not Authorized" });
}
});
// router.get("/google/login", (req, res) => {
// if (req.user) {
// console.log(`${process.env.DB_USER_SERVICE_URL}instructor/register-user`);
// axios
// .post(`${process.env.DB_USER_SERVICE_URL}instructor/register-user`, {
// user: req.user,
// })
// .then((response) => {
// req.user.userId = response.data.user.userid;
// console.log("User ID:", response.data.user.userid);
// req.user.role = "instructor";
// console.log("User registration response:", response.data);
// res.redirect(process.env.LOGIN_REDIRECT_URL);
// })
// .catch((error) => {
// console.error("Error registering user:", error.message);
// res.status(500).json({ error: true, message: "User login failed" });
// });
// } else {
// res.status(403).json({ error: true, message: "Not Authorized" });
// }
// });
router.get("/login/failed", (req, res) => {
res.status(401).json({
@ -56,7 +87,7 @@ router.get("/google", passport.authenticate("google", ["profile", "email"]));
router.post(
"/student/login",
passport.authenticate("student-auth"),
passport.authenticate("student-auth", { keepSessionInfo: true }),
(req, res) => {
console.log("Student login endpoint hit");
@ -68,18 +99,17 @@ router.post(
req.user.userId = req.user.assignmentid;
req.user.role = "student";
req.logIn(req.user, function(err) {
req.logIn(req.user, function (err) {
if (err) return next(err);
console.log('is authenticated?: ' + req.isAuthenticated());
console.log("is authenticated?: " + req.isAuthenticated());
return res.status(200).json({
success: true,
message: 'Successful Login',
user: req.user
message: "Successful Login",
user: req.user,
});
});
} else {
console.log("Authentication failed");
res.status(401).json({ error: true, message: "Authentication failed" });
@ -88,7 +118,6 @@ router.post(
);
router.get("/logout", (req, res) => {
req.logout((err) => {
if (err) {
return next(err);