Merge branch 'develop' into feature/25

.gitignore

@@ -1,2 +1,4 @@
 node_modules/
-loggerFiles/
+src/loggerFiles/all.log
+src/loggerFiles/error.log
+

package-lock.json

@@ -10,6 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "bcryptjs": "^2.4.3",
+        "config": "^3.3.7",
         "cors": "^2.8.5",
         "express": "^4.18.1",
         "express-jwt": "^7.7.2",
@@ -756,6 +757,17 @@
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
+    "node_modules/config": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/config/-/config-3.3.7.tgz",
+      "integrity": "sha512-mX/n7GKDYZMqvvkY6e6oBY49W8wxdmQt+ho/5lhwFDXqQW9gI+Ahp8EKp8VAbISPnmf2+Bv5uZK7lKXZ6pf1aA==",
+      "dependencies": {
+        "json5": "^2.1.1"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/configstore": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
@@ -1657,6 +1669,17 @@
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
+    "node_modules/json5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/jsonwebtoken": {
       "version": "8.5.1",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
@@ -3796,6 +3819,14 @@
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
+    "config": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/config/-/config-3.3.7.tgz",
+      "integrity": "sha512-mX/n7GKDYZMqvvkY6e6oBY49W8wxdmQt+ho/5lhwFDXqQW9gI+Ahp8EKp8VAbISPnmf2+Bv5uZK7lKXZ6pf1aA==",
+      "requires": {
+        "json5": "^2.1.1"
+      }
+    },
     "configstore": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
@@ -4475,6 +4506,11 @@
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
+    "json5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
+    },
     "jsonwebtoken": {
       "version": "8.5.1",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",

package.json

@@ -14,6 +14,7 @@
   "license": "ISC",
   "dependencies": {
     "bcryptjs": "^2.4.3",
+    "config": "^3.3.7",
     "cors": "^2.8.5",
     "express": "^4.18.1",
     "express-jwt": "^7.7.2",

src/config/default.json

@@ -0,0 +1,3 @@
+{
+    "Test": "Diligent"
+}

src/middleware/errorHandling.js

@@ -1,5 +1,5 @@
 const errorLogger = (err, req, res, next) => {
-    console.error('GRESKA KOLEGAA' + err)
+    console.error(err)
     next(err)
 }
 

src/routes/user.js

@@ -4,6 +4,20 @@ const endpoints = require('../endpoints/user')
 const router = new express.Router()
 const app = express()
 
+/**
+ * @openapi
+ * /users/:
+ *   get:
+ *     description: Get all users
+ *     tags: [User]
+ *     responses:
+ *       200:
+ *         description: Success!
+ *       400:
+ *         description: Bad request.
+ *       500:
+ *         description: Internal server error.
+ */
 router.get('/users', endpoints.getUsers)
 
 /**
@@ -16,7 +30,7 @@ router.get('/users', endpoints.getUsers)
  *       200:
  *         description: Success!
  *       400:
- *         description: You sent bad request.
+ *         description: Bad request.
  *       500:
  *         description: Internal server error.
  */
@@ -32,7 +46,7 @@ router.get('/users/:id', endpoints.getUser)
  *       201:
  *         description: User successfully created!
  *       400:
- *         description: You sent bad request.
+ *         description: Bad request.
  *       500:
  *         description: Internal server error.
  */

src/server.js

@@ -1,7 +1,7 @@
 const express = require('express')
 const app = express()
 const path = require('path')
-const port = process.env.PORT || 3000
+const port = process.env.NODE_ENV === 'production' ? 80 : 3000
 require('./database/mongoose')
 const userRouter = require('./routes/user')
 const tokenRouter = require('./routes/token')
@@ -9,12 +9,11 @@ const swaggerJsDoc = require("swagger-jsdoc")
 const swaggerUi = require("swagger-ui-express")
 const { errorLogger, errorResponder } = require('./middleware/errorHandling.js')
 const requestLogging = require('./middleware/requestLogging.js')
-const cors = require('cors')
-const helmet = require('helmet')
+const cors = require('cors') //Cross-origin resource sharing
+const helmet = require('helmet') //Basic protection against attacks like XSS
+const config = require('config') //Default configuration file
 const { json } = require('express')
 
-
-
 const swaggerOptions = {
     swaggerDefinition: {
         info: {