瀏覽代碼

Merge branch 'develop' into feature/25

pull/41/head
dusan.lazarevic 4 年之前
父節點
當前提交
4f8d668091
共有 7 個文件被更改,包括 64 次插入9 次删除
  1. 3
    1
      .gitignore
  2. 36
    0
      package-lock.json
  3. 1
    0
      package.json
  4. 3
    0
      src/config/default.json
  5. 1
    1
      src/middleware/errorHandling.js
  6. 16
    2
      src/routes/user.js
  7. 4
    5
      src/server.js

+ 3
- 1
.gitignore 查看文件

node_modules/ node_modules/
loggerFiles/
src/loggerFiles/all.log
src/loggerFiles/error.log


+ 36
- 0
package-lock.json 查看文件

"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"config": "^3.3.7",
"cors": "^2.8.5", "cors": "^2.8.5",
"express": "^4.18.1", "express": "^4.18.1",
"express-jwt": "^7.7.2", "express-jwt": "^7.7.2",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" "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": { "node_modules/configstore": {
"version": "5.0.1", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" "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": { "node_modules/jsonwebtoken": {
"version": "8.5.1", "version": "8.5.1",
"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" "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": { "configstore": {
"version": "5.0.1", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
}, },
"json5": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
},
"jsonwebtoken": { "jsonwebtoken": {
"version": "8.5.1", "version": "8.5.1",
"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",

+ 1
- 0
package.json 查看文件

"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"config": "^3.3.7",
"cors": "^2.8.5", "cors": "^2.8.5",
"express": "^4.18.1", "express": "^4.18.1",
"express-jwt": "^7.7.2", "express-jwt": "^7.7.2",

+ 3
- 0
src/config/default.json 查看文件

{
"Test": "Diligent"
}

+ 1
- 1
src/middleware/errorHandling.js 查看文件

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

+ 16
- 2
src/routes/user.js 查看文件

const router = new express.Router() const router = new express.Router()
const app = express() 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) router.get('/users', endpoints.getUsers)


/** /**
* 200: * 200:
* description: Success! * description: Success!
* 400: * 400:
* description: You sent bad request.
* description: Bad request.
* 500: * 500:
* description: Internal server error. * description: Internal server error.
*/ */
* 201: * 201:
* description: User successfully created! * description: User successfully created!
* 400: * 400:
* description: You sent bad request.
* description: Bad request.
* 500: * 500:
* description: Internal server error. * description: Internal server error.
*/ */

+ 4
- 5
src/server.js 查看文件

const express = require('express') const express = require('express')
const app = express() const app = express()
const path = require('path') const path = require('path')
const port = process.env.PORT || 3000
const port = process.env.NODE_ENV === 'production' ? 80 : 3000
require('./database/mongoose') require('./database/mongoose')
const userRouter = require('./routes/user') const userRouter = require('./routes/user')
const tokenRouter = require('./routes/token') const tokenRouter = require('./routes/token')
const swaggerUi = require("swagger-ui-express") const swaggerUi = require("swagger-ui-express")
const { errorLogger, errorResponder } = require('./middleware/errorHandling.js') const { errorLogger, errorResponder } = require('./middleware/errorHandling.js')
const requestLogging = require('./middleware/requestLogging.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 { json } = require('express')




const swaggerOptions = { const swaggerOptions = {
swaggerDefinition: { swaggerDefinition: {
info: { info: {

Loading…
取消
儲存