diff --git a/Back-end/controller/Main.js b/Back-end/controller/Main.js
index efdaf29..faf3b8d 100644
--- a/Back-end/controller/Main.js
+++ b/Back-end/controller/Main.js
@@ -76,6 +76,15 @@ server.get('/index', (req, res) => {
res.sendFile(path.resolve(__dirname + '/../../Front-end/index.html'));
});
+
+server.get('/un-authorized', (req, res) => {
+ res.sendFile(path.resolve(__dirname + '/../../Front-end/401.html'));
+});
+
+server.get('*', (req, res) => {
+ res.sendFile(path.resolve(__dirname + '/../../Front-end/404.html'));
+});
+
/**
* Function performed when there is a new socket connection.
*
diff --git a/Back-end/database/DatabaseConnection.js b/Back-end/database/DatabaseConnection.js
index 0b49a0f..ae21bcc 100644
--- a/Back-end/database/DatabaseConnection.js
+++ b/Back-end/database/DatabaseConnection.js
@@ -10,8 +10,12 @@ module.exports = class DatabaseConnection {
try {
if (!mongoose.connection.readyState) {
await mongoose.connect(process.env.MONGODB_URI, { useNewUrlParser: true, useUnifiedTopology: true });
+
+ console.log('Connected to MongoDB');
}
} catch (ex) {
+
+ console.log('Failed to connect to MongoDB');
throw ex;
}
}
diff --git a/Back-end/service/AuthenticationService.js b/Back-end/service/AuthenticationService.js
index 2eaa6ec..f0fa482 100644
--- a/Back-end/service/AuthenticationService.js
+++ b/Back-end/service/AuthenticationService.js
@@ -29,14 +29,25 @@ module.exports = class AuthenticationService {
try {
let token = req.cookies.access_token;
+ console.log(token);
+
+ if (!token || token.split('.').length !== 3) {
+ return next(new ErrorResponse(401, 'Invalid token format.', null));
+ }
+
+
if (!token) throw new ErrorResponse(401, 'No token provided.', null);
jwt.verify(token, process.env.JWT_SECRET, (err, decoded) => {
- if (err) throw new ErrorResponse(500, 'Failed to authenticate token.', null);
+ if (err) {
+ console.log(err);
+ return next( ErrorResponse(500, 'Failed to authenticate token.', null));
+ }
- req.userId = decoded.id;
+ req.userId = decoded.id;
next();
+
});
} catch (ex) {
throw ex;
diff --git a/Back-end/service/CodeService.js b/Back-end/service/CodeService.js
index 7c4b0d6..9d80a62 100644
--- a/Back-end/service/CodeService.js
+++ b/Back-end/service/CodeService.js
@@ -89,7 +89,7 @@ module.exports = class CodeService {
return files;
} else {
- throw new ErrorResponse(401, "You don't have permisson to access this code", null);
+ throw new ErrorResponse(401, "You don't have permisson to access this code", null);
}
} catch (ex) {
throw ex;
diff --git a/Front-end/401.html b/Front-end/401.html
new file mode 100644
index 0000000..bc66887
--- /dev/null
+++ b/Front-end/401.html
@@ -0,0 +1,15 @@
+
+ 401 - Un-Athorized
+
+
+
+
+
+
+
401
+
Oops! Seems that you don't have access to this page
+
Back To Home
+
+
404
+
Oops! The page you're looking for doesn't exist.
+
Go Back Home
+