Skip to content

Commit

Permalink
Merge branch 'development' into lcchrty/issue1646
Browse files Browse the repository at this point in the history
  • Loading branch information
Spiteless committed Jun 8, 2024
2 parents fea7039 + e77dbdd commit 2601b02
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
5 changes: 2 additions & 3 deletions backend/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

// Load in all of our node modules. Their uses are explained below as they are called.
const express = require('express');
const bodyParser = require('body-parser');
const cron = require('node-cron');
const fetch = require('node-fetch');
const morgan = require('morgan');
Expand Down Expand Up @@ -43,8 +42,8 @@ require('assert-env')([
const app = express();

// Required to view Request Body (req.body) in JSON
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: true }));
app.use(express.json());
app.use(express.urlencoded({ extended: true }));

// Used to save JWT token from MagicLink
app.use(cookieParser());
Expand Down
1 change: 0 additions & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"@slack/bolt": "^2.2.3",
"assert-env": "^0.6.0",
"async": "^3.2.2",
"body-parser": "^1.19.0",
"cookie-parser": "^1.4.5",
"cors": "^2.8.5",
"dotenv": "^8.2.0",
Expand Down
2 changes: 1 addition & 1 deletion backend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,7 @@ bluebird@3.5.1:
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==

body-parser@1.19.0, body-parser@^1.19.0:
body-parser@1.19.0:
version "1.19.0"
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
Expand Down

0 comments on commit 2601b02

Please sign in to comment.