Finished user managment

.github/workflows/release.yml

@@ -76,6 +76,8 @@ jobs:
     - uses: actions/checkout@v4
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@v5
+      env:
+        JWT_KEY: ${{secrets.JWT_KEY}}
       with:
           name: arquisoft/wiq_en1b/authservice
           username: ${{ github.actor }}

gatewayservice/gateway-service.js

@@ -6,7 +6,7 @@ const promBundle = require('express-prom-bundle');
 const swaggerUi = require('swagger-ui-express'); 
 const fs = require("fs")
 const YAML = require('yaml')
-
+const jwt = require('jsonwebtoken');
 const app = express();
 const port = 8000;
 
@@ -47,7 +47,7 @@ app.post('/adduser', async (req, res) => {
   }
 });
 
-app.get('/questions', async (req, res) => {
+app.get('/questions', verifyToken, async (req, res) => {
   try {
 
     // Forward the question request to the quetion service
@@ -58,11 +58,11 @@ app.get('/questions', async (req, res) => {
   }
 });
 
-app.get('/questions/:lang', async (req, res) => {
+app.get('/questions/:lang', verifyToken, async (req, res) => {
   try {
     const lang = req.params.lang;
     // Forward the question request to the quetion service
-    const questionResponse = await axios.get(questionServiceUrl+'/questions/' + lang);
+    const questionResponse = await axios.get(questionServiceUrl+'/questions/' + lang.toString());
 
     res.json(questionResponse.data);
   } catch (error) {
@@ -71,7 +71,8 @@ app.get('/questions/:lang', async (req, res) => {
   }
 });
 
-app.post('/record', async(req, res) => {
+app.post('/record', verifyToken, async(req, res) => {
+  console.log("in")
   try {
     // Forward the record request to the record service
     const recordResponse = await axios.post(recordServiceUrl+'/record', req.body);
@@ -81,7 +82,7 @@ app.post('/record', async(req, res) => {
   }
 });
 
-app.get('/record/:user', async(req, res)=>{
+app.get('/record/:user', verifyToken,  async(req, res)=>{
   try {
     const user = req.params.user;
     // Forward the record request to the record service
@@ -108,4 +109,23 @@ const server = app.listen(port, () => {
   console.log(`Gateway Service listening at http://localhost:${port}`);
 });
 
+function verifyToken(req, res, next) {
+  // Get the token from the request headers
+  const token = req.headers['token'] || req.body.token || req.query.token;
+
+  // Verify if the token is valid
+  jwt.verify(token, (process.env.JWT_KEY??'my-key'), (err, decoded) => {
+    if (err) {
+      // Token is not valid
+      res.status(403).json({authorized: false,
+        error: 'Invalid token or outdated'});
+    } else {
+      // Token is valid
+      req.decodedToken = decoded;
+      // Call next() to proceed to the next middleware or route handler
+      next();
+    }
+  });
+}
+
 module.exports = server

gatewayservice/gateway-service.test.js

@@ -1,14 +1,21 @@
 const request = require('supertest');
 const axios = require('axios');
+const jwt = require('jsonwebtoken');
 const app = require('./gateway-service'); 
 
 afterAll(async () => {
     app.close();
   });
 
+
+jest.mock('jsonwebtoken');
+
 jest.mock('axios');
 
-describe('Gateway Service', () => {
+
+
+describe('Gateway Service with token mock', () => {
+
   // Mock responses from external services
   axios.post.mockImplementation((url, data) => {
     if (url.endsWith('/login')) {
@@ -33,6 +40,14 @@ describe('Gateway Service', () => {
     }
   });
 
+
+
+  // Mock the `verify` function of JWT
+  jwt.verify.mockImplementation((token, secretOrPublicKey, callback) => {
+    // Assume the token is valid and return the payload
+    callback(null, "decoded");
+  });
+
   // Test /login endpoint
   it('should forward login request to auth service', async () => {
     const response = await request(app)
@@ -57,7 +72,7 @@ describe('Gateway Service', () => {
   // Test /questions endpoint
   it('should forward questions request to question service', async () => {
     const response = await request(app)
-      .get('/questions');
+      .get('/questions').set('token', 'valorDelToken');
 
     expect(response.statusCode).toBe(200);
     expect(response.body[0]).toHaveProperty('question', "¿Cuál es la población de Oviedo?");
@@ -66,7 +81,7 @@ describe('Gateway Service', () => {
   // Test /questions/:lang endpoint
   it('should forward questions request to question service', async () => {
     const response = await request(app)
-      .get('/questions/es');
+      .get('/questions/es').set('token', 'valorDelToken');
 
     expect(response.statusCode).toBe(200);
     expect(response.body[0]).toHaveProperty('question', "¿Cuál es la población de Oviedo?");
@@ -75,7 +90,7 @@ describe('Gateway Service', () => {
   // Test /record endpoint
   it('should forward record request to record service', async () => {
     const response = await request(app)
-      .post('/record');
+      .post('/record').set('token', 'valorDelToken');
 
     expect(response.statusCode).toBe(200);
     expect(response.body.user).toBe('testuser');
@@ -84,9 +99,22 @@ describe('Gateway Service', () => {
   // Test /record/:user endpoint
   it('should forward record request to record service', async () => {
     const response = await request(app)
-      .get('/record/testuser');
+      .get('/record/testuser').set('token', 'valorDelToken');
+    console.log(response)
+    expect(response.statusCode).toBe(200);
+    expect(response.body).toHaveProperty('record', "undefined");
+  });
+
 
+});
+
+describe('Gateway Service without token mock', () => {
+  // Test /record/:user endpoint
+  it('should not verify the token', async () => {
+    const response = await request(app)
+      .get('/record/testuser');
+    console.log(response)
     expect(response.statusCode).toBe(200);
     expect(response.body).toHaveProperty('record', "undefined");
   });
-});
+})

gatewayservice/package.json

@@ -22,6 +22,7 @@
         "cors": "^2.8.5",
         "express": "^4.18.2",
         "express-openapi": "^12.1.3",
+        "jsonwebtoken": "^9.0.2",
         "express-prom-bundle": "^7.0.0",
         "swagger-ui-express": "^5.0.0",
         "yaml": "^2.4.1"

questionservice/question-service.js

@@ -35,7 +35,7 @@ app.get('/questions/:lang',  async (req, res) => {
       const lang = req.params.lang;
 
       const questions = await Question.aggregate([
-        {$match: {language : lang}}, //Condition
+        {$match: {language : lang.toString()}}, //Condition
         {$sample: {size:5}} //5 random from the ones that fullfil the condition
       ]);
 

users/authservice/auth-model.js

@@ -1,6 +1,7 @@
 const mongoose = require('mongoose');
 
 const userSchema = new mongoose.Schema({
+    email: String,
     username: String,
     password: String,
     createdAt: Date,

users/authservice/auth-service.js

@@ -28,24 +28,28 @@
   try {
     // Check if required fields are present in the request body
     try{
-      validateRequiredFields(req, ['username', 'password']);
+      validateRequiredFields(req, ['email', 'username', 'password']);
     }
     catch(error){
       res.status(400).json({ error : error.message });
       return
     }
 
-    const { username, password } = req.body;
+    const { email, username, password } = req.body;
 
-    // Find the user by username in the database
-    const user = await User.findOne({ username });
+    let user;
+    if(username) //Can log in with both
+      // Find the user by username in the database
+      user = await User.findOne({ username })
+    else
+      user = await User.findOne({ email })
 
     // Check if the user exists and verify the password
     if (user && await bcrypt.compare(password, user.password)) {
       // Generate a JWT token
-      const token = jwt.sign({ userId: user._id }, 'your-secret-key', { expiresIn: '1h' });
+      const token = jwt.sign({ userId: user._id }, (process.env.JWT_KEY??'my-key'), { expiresIn: '1h' });
       // Respond with the token and user information
-      res.json({ token: token, username: username});
+      res.json({ token: token, username: username, email: email});
     } else {
       res.status(400).json({ error: 'Invalid credentials' });
     }