Skip to content

Commit

Permalink
Upgrade dependencies (#422)
Browse files Browse the repository at this point in the history
  • Loading branch information
antoinejaussoin authored Nov 2, 2022
1 parent 7547942 commit 567a1c8
Show file tree
Hide file tree
Showing 19 changed files with 5,996 additions and 6,458 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Alpha Build'

on:
push:
branches: [v4162/emergency-fix]
branches: [v4163/deps]

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ install-trivy:
trivy:
docker build -f ./backend/Dockerfile -t retrospected/backend:trivy ./backend
docker build -f ./frontend/Dockerfile -t retrospected/frontend:trivy ./frontend
trivy retrospected/backend:trivy
trivy retrospected/frontend:trivy
trivy image retrospected/backend:trivy
trivy image retrospected/frontend:trivy

translate:
crowdin push sources
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ This will run a demo version, which you can turn into a fully licenced version b

## Versions History

### Version 4.16.3

- TBD

### Version 4.16.2

- Fixed a bug where sessions a user participated in did not show up on their homepage. (👏 Thanks a bunch to Frank Becker for reporting the issue and helping find the problem)
Expand Down
64 changes: 32 additions & 32 deletions backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@retrospected/backend",
"version": "4.16.2",
"version": "4.16.3",
"license": "GNU GPLv3",
"private": true,
"scripts": {
Expand All @@ -19,21 +19,21 @@
"copy-templates": "copyfiles -u 0 src/**/*.html dist/"
},
"dependencies": {
"@sendgrid/mail": "7.6.2",
"@sentry/node": "6.19.6",
"@sendgrid/mail": "7.7.0",
"@sentry/node": "7.17.3",
"@types/bcryptjs": "2.4.2",
"@types/connect-redis": "0.0.18",
"@types/connect-redis": "0.0.19",
"@types/crypto-js": "4.1.1",
"@types/express": "4.17.13",
"@types/express-mung": "0.5.2",
"@types/express-rate-limit": "6.0.0",
"@types/express-session": "1.17.4",
"@types/jest": "27.4.1",
"@types/lodash": "4.14.182",
"@types/node": "17.0.25",
"@types/node-fetch": "2.5.12",
"@types/nodemailer": "6.4.4",
"@types/passport": "1.0.7",
"@types/jest": "29.2.1",
"@types/lodash": "4.14.187",
"@types/node": "18.11.9",
"@types/node-fetch": "2.6.2",
"@types/nodemailer": "6.4.6",
"@types/passport": "1.0.11",
"@types/passport-github2": "1.2.5",
"@types/passport-google-oauth20": "2.0.11",
"@types/passport-local": "1.0.34",
Expand All @@ -42,31 +42,31 @@
"@types/shortid": "0.0.29",
"@types/socket.io-redis": "3.0.0",
"@types/uuid": "8.3.4",
"@typescript-eslint/eslint-plugin": "5.20.0",
"@typescript-eslint/parser": "5.20.0",
"@typescript-eslint/eslint-plugin": "5.42.0",
"@typescript-eslint/parser": "5.42.0",
"bcryptjs": "2.4.3",
"chalk": "4.1.2",
"connect-redis": "6.1.3",
"copyfiles": "2.4.1",
"crypto-js": "4.1.1",
"date-fns": "2.28.0",
"dotenv": "16.0.0",
"eslint": "8.14.0",
"date-fns": "2.29.3",
"dotenv": "16.0.3",
"eslint": "8.26.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-prettier": "4.0.0",
"eslint-plugin-prettier": "4.2.1",
"express": "4.17.3",
"express-mung": "0.5.1",
"express-rate-limit": "6.4.0",
"express-rate-limit": "6.6.0",
"express-session": "1.17.2",
"freemail": "1.7.0",
"handlebars": "4.7.7",
"jest": "27.5.1",
"lexorank": "1.0.4",
"jest": "29.2.2",
"lexorank": "1.0.5",
"lodash": "4.17.21",
"moment": "2.29.3",
"moment": "2.29.4",
"node-fetch": "2.6.7",
"nodemailer": "6.7.3",
"nodemon": "2.0.15",
"nodemailer": "6.8.0",
"nodemon": "2.0.20",
"passport": "0.5.0",
"passport-github2": "0.1.12",
"passport-google-oauth20": "2.0.0",
Expand All @@ -75,24 +75,24 @@
"passport-okta-oauth20": "1.1.0",
"passport-slack-oauth2": "^1.1.1",
"passport-twitter": "1.0.4",
"pg": "8.7.3",
"prettier": "2.6.2",
"rate-limiter-flexible": "2.3.6",
"pg": "8.8.0",
"prettier": "2.7.1",
"rate-limiter-flexible": "2.4.1",
"redis": "3.1.2",
"rimraf": "3.0.2",
"shortid": "2.2.16",
"socket.io": "4.5.0",
"socket.io": "4.5.3",
"socket.io-redis": "6.1.1",
"stripe": "8.219.0",
"ts-jest": "27.1.4",
"ts-node": "10.7.0",
"stripe": "10.15.0",
"ts-jest": "29.0.3",
"ts-node": "10.9.1",
"typeorm": "0.2.45",
"typeorm-naming-strategies": "3.0.0",
"typescript": "4.6.3",
"uuid": "8.3.2"
"typescript": "4.8.4",
"uuid": "9.0.0"
},
"resolutions": {
"@types/connect-redis": "0.0.18",
"@types/connect-redis": "0.0.19",
"@types/express-session": "1.17.3"
},
"nodemonConfig": {
Expand Down
2 changes: 1 addition & 1 deletion backend/src/db/actions/licences.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { LicenceMetadata } from './../../types';

export async function registerLicence(
email: string | null,
name: string | null,
name: string | null | undefined,
customerId: string,
sessionId: string
): Promise<boolean> {
Expand Down
3 changes: 2 additions & 1 deletion backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import { hasField } from './security/payload-checker';
import mung from 'express-mung';
import { QueryFailedError } from 'typeorm';
import { deleteAccount } from './db/actions/delete';
import { noop } from 'lodash';

const realIpHeader = 'X-Forwarded-For';
const sessionSecret = `${config.SESSION_SECRET!}-4.11.5`; // Increment to force re-auth
Expand Down Expand Up @@ -277,7 +278,7 @@ db().then(() => {
});

app.post('/api/logout', async (req, res, next) => {
req.logout();
req.logout({ keepSessionInfo: false }, noop);
req.session?.destroy((err: string) => {
if (err) {
return next(err);
Expand Down
2 changes: 1 addition & 1 deletion backend/src/sentry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function manualReport(message: string, request?: Request) {

export function manualMessage(message: string) {
if (useSentry) {
Sentry.captureMessage(message, Sentry.Severity.Error);
Sentry.captureMessage(message, 'error');
}
}

Expand Down
2 changes: 1 addition & 1 deletion backend/src/stripe/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
} from '../db/actions/subscriptions';

const stripe = new Stripe(config.STRIPE_SECRET, {
apiVersion: '2020-08-27',
apiVersion: '2022-08-01',
} as Stripe.StripeConfig);

function stripeRouter(): Router {
Expand Down
Loading

0 comments on commit 567a1c8

Please sign in to comment.